Skip to content

Fixed freezing after siege due to Infinite Loop bug in BKSettlementBehaviour #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tenttomi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed freezing after siege due to Infinite Loop bug in BKSettlementBehaviour #205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions BannerKings/Behaviours/BKSettlementBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,37 @@ private void SiegeConsequences(Settlement settlement,
int killTotal = (int)(data.TotalPop * shareToKill);
if (killTotal < 1) if (killTotal <= 1f) return;

int toKill = killTotal;
var weights = GetDesiredPopTypes(settlement).Select(pair => new ValueTuple<PopType, float>(pair.Key, pair.Value[0])).ToList();

while (toKill > 0)
float totalWeights = weights.Sum(w => w.Item2);
var killAllocation = weights.Select(item => (item.Item1, (int)Math.Round(item.Item2 / totalWeights * killTotal))).ToList();

int unallocatedKills = 0;
foreach ( var pair in killAllocation)
{
var random = MBRandom.RandomInt(10, 20);
var target = MBRandom.ChooseWeighted(weights);
var finalNum = MBMath.ClampInt(random, 0, data.GetTypeCount(target));
data.UpdatePopType(target, -finalNum);
toKill -= finalNum;
var type = pair.Item1;
var toKill = pair.Item2;
var typeCount = data.GetTypeCount(type);

if (typeCount < toKill)
{
data.UpdatePopType(type, 0);
unallocatedKills += toKill - typeCount;
continue;
}

data.UpdatePopType(type, -toKill);
}

if (unallocatedKills > 0 && data.TotalPop > 0)
{
foreach ( var populationClass in data.Classes)
{
var typeCount = data.GetTypeCount(populationClass.type);
var toKill = (int)Math.Round((float)typeCount / data.TotalPop * unallocatedKills);

data.UpdatePopType(populationClass.type, -toKill);
}
}

InformationManager.DisplayMessage(new InformationMessage(
Expand Down