Skip to content

Decrement turns of unhappiness counter per city, if positive #1008

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

Merged
ajhalme merged 3 commits into from
Sep 28, 2026
Merged

Decrement turns of unhappiness counter per city, if positive #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e41f06
Decrement turns of unhappiness counter per city, if positive
zack-the-coding-actuary Sep 27, 2026
43f71fa
Revert "Decrement turns of unhappiness counter per city, if positive"
zack-the-coding-actuary Sep 28, 2026
2ba3077
Update city unhappiness turns decrement function outside of Player.Re…
zack-the-coding-actuary Sep 28, 2026
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
8 changes: 8 additions & 0 deletions C7Engine/C7GameData/Player.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,14 @@ public void DoCorruptionCalculations(GameData gameData) {
}
}

// Call once at turn advance, decrement penalty turns of unhappiness for drafting / whipping
public void DecrementCityUnhappinessPenalties(GameData gameData) {
foreach (City c in cities) {
// TODO: Add drafting unhappiness decrement when implemented
c.turnsOfUnhappinessDueToPopRushing -= (c.turnsOfUnhappinessDueToPopRushing > 0) ? 1 : 0;
}
}

public void RecalculateCitizenMoods(GameData gameData, bool goIntoDisorderIfUnhappy = false) {
foreach (City c in cities) {
City.Mood cityMood = c.RecalculateCitizenMoods(gameData);
Expand Down
1 change: 1 addition & 0 deletions C7Engine/EntryPoints/TurnHandling.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public static async Task AdvanceTurn() {
gameData.turn++;
foreach (Player player in gameData.players) {
player.MaybeSpawnBonusUnits(gameData);
player.DecrementCityUnhappinessPenalties(gameData);
player.RecalculateCitizenMoods(gameData, goIntoDisorderIfUnhappy: true);
player.DoCorruptionCalculations(gameData);

Expand Down
Loading