Compare commits

..

No commits in common. "9661b27794d223c9ae08c50aac91cc55ae76ee60" and "47cba762ef84c7fdbebc895f63d0d5e3d5d9a074" have entirely different histories.

5 changed files with 10 additions and 12 deletions

View File

@ -53,11 +53,7 @@
pmcusec = 51, pmcusec = 51,
skier = 52, skier = 52,
peacemaker = 53, peacemaker = 53,
bosspartisan = 54, bosspartisan = 54
infectedassault = 55,
infectedpmc = 56,
infectedcivil = 57,
infectedlaborant = 58,
infectedtagilla = 59
} }
} }

View File

@ -12,7 +12,6 @@ namespace Common.Models.Input
public int Experience { get; set; } public int Experience { get; set; }
public object StandingForKill { get; set; } public object StandingForKill { get; set; }
public object AggressorBonus { get; set; } public object AggressorBonus { get; set; }
public bool UseSimpleAnimator { get; set; }
} }
public class Info public class Info

View File

@ -69,14 +69,12 @@ public class Experience
reward = new MinMax(-1, -1); reward = new MinMax(-1, -1);
standingForKill = -0.02; standingForKill = -0.02;
aggressorBonus = 0.01; aggressorBonus = 0.01;
useSimpleAnimator = false;
} }
public MinMax level { get; set; } public MinMax level { get; set; }
public MinMax reward { get; set; } public MinMax reward { get; set; }
public object standingForKill { get; set; } public object standingForKill { get; set; }
public object aggressorBonus { get; set; } public object aggressorBonus { get; set; }
public bool useSimpleAnimator { get; set; }
} }
public class BodyParts public class BodyParts

View File

@ -94,14 +94,20 @@ public static class BotParser
bot.InsuredItems = null; bot.InsuredItems = null;
// Add bot if not already added // Add bot if not already added
if (!parsedBotsDict.TryAdd(bot._id, bot)) if (parsedBotsDict.TryAdd(bot._id, bot))
{
// Success
// Null out more data to save ram
bot.Inventory.items.RemoveAll(x => x.parentId == null);
}
else
{ {
dupeCount++; dupeCount++;
} }
} }
totalDupeCount += dupeCount; totalDupeCount += dupeCount;
//Console.WriteLine($"Parsed file: {filePath}"); Console.WriteLine($"Parsed file: {filePath}");
return totalDupeCount; return totalDupeCount;
} }

View File

@ -45,7 +45,6 @@ namespace Generator
AddExperience(botToUpdate, rawBotsOfSameType); AddExperience(botToUpdate, rawBotsOfSameType);
AddStandingForKill(botToUpdate, rawBotsOfSameType); AddStandingForKill(botToUpdate, rawBotsOfSameType);
AddSkills(botToUpdate, rawBotsOfSameType); AddSkills(botToUpdate, rawBotsOfSameType);
botToUpdate.experience.useSimpleAnimator = rawBotsOfSameType.First().Info.Settings.UseSimpleAnimator;
foreach (var rawParsedBot in rawBotsOfSameType) foreach (var rawParsedBot in rawBotsOfSameType)
{ {