city: remove city if shrunk to zero (#302)

* city: remove city if shrunk to zero * add CityEventCityAbandoned
kazzmir · Feb 9, 2025 · 115fc57 · 115fc57
1 parent 44a225f
commit 115fc57
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 17 deletions.
diff --git a/game/magic/city/city.go b/game/magic/city/city.go
@@ -26,6 +26,9 @@ type CityEventPopulationGrowth struct {
     Grow bool
 }
 
+type CityEventCityAbandoned struct {
+}
+
 type CityEventNewUnit struct {
     Unit units.Unit
     WeaponBonus data.WeaponBonus
@@ -1435,10 +1438,6 @@ func (city *City) DoNextTurn(garrison []units.StackUnit, mapObject *maplib.Map)
             }
         }
 
-        if city.Population > city.MaximumCitySize() * 1000 {
-            city.Population = city.MaximumCitySize() * 1000
-        }
-
         if math.Abs(float64(city.Population/1000 - oldPopulation/1000)) > 0 {
             cityEvents = append(cityEvents, &CityEventPopulationGrowth{Size: (city.Population - oldPopulation)/1000, Grow: city.Population > oldPopulation})
         }
@@ -1465,6 +1464,15 @@ func (city *City) DoNextTurn(garrison []units.StackUnit, mapObject *maplib.Map)
                 }
             }
         }
+
+        if city.Population > city.MaximumCitySize() * 1000 {
+            city.Population = city.MaximumCitySize() * 1000
+        }
+
+        if city.Population < 1000 {
+            cityEvents = append(cityEvents, &CityEventCityAbandoned{})
+        }
+
     }
 
     if city.HasEnchantment(data.CityEnchantmentGaiasBlessing) {

diff --git a/game/magic/game/game.go b/game/magic/game/game.go
@@ -6065,25 +6065,29 @@ func (game *Game) StartPlayerTurn(player *playerlib.Player) {
         for _, event := range cityEvents {
             switch event.(type) {
             case *citylib.CityEventPopulationGrowth:
-                // growth := event.(*citylib.CityEventPopulationGrowth)
-
-                growthEvent := event.(*citylib.CityEventPopulationGrowth)
+                if player.IsHuman() {
+                    growthEvent := event.(*citylib.CityEventPopulationGrowth)
 
-                verb := "grown"
-                if !growthEvent.Grow {
-                    verb = "shrunk"
-                }
+                    verb := "grown"
+                    if !growthEvent.Grow {
+                        verb = "shrunk"
+                    }
 
-                // FIXME: can citizens shrink to 0, in which case the city should be removed?
+                    scrollEvent := GameEventScroll{
+                        Title: "CITY GROWTH",
+                        Text: fmt.Sprintf("%v has %v to a population of %v.", city.Name, verb, city.Citizens()),
+                    }
 
-                scrollEvent := GameEventScroll{
-                    Title: "CITY GROWTH",
-                    Text: fmt.Sprintf("%v has %v to a population of %v.", city.Name, verb, city.Citizens()),
+                    select {
+                        case game.Events<- &scrollEvent:
+                        default:
+                    }
                 }
-
+            case *citylib.CityEventCityAbandoned:
+                removeCities = append(removeCities, city)
                 if player.IsHuman() {
                     select {
-                        case game.Events<- &scrollEvent:
+                        case game.Events<- &GameEventNotice{Message: fmt.Sprintf("The city of %v has been abandoned.", city.Name)}:
                         default:
                     }
                 }

diff --git a/test/overworld/main.go b/test/overworld/main.go
@@ -354,6 +354,7 @@ func createScenario4(cache *lbx.LbxCache) *gamelib.Game {
     return game
 }
 
+// city growth message
 func createScenario5(cache *lbx.LbxCache) *gamelib.Game {
     log.Printf("Running scenario 5")
     wizard := setup.WizardCustom{
@@ -3397,6 +3398,48 @@ func createScenario40(cache *lbx.LbxCache) *gamelib.Game {
     return game
 }
 
+// shrink city to zero
+func createScenario41(cache *lbx.LbxCache) *gamelib.Game {
+    log.Printf("Running scenario 41")
+    wizard := setup.WizardCustom{
+        Name: "bob",
+        Banner: data.BannerRed,
+        Race: data.RaceTroll,
+        Abilities: []setup.WizardAbility{},
+        Books: []data.WizardBook{},
+    }
+
+    game := gamelib.MakeGame(cache, setup.NewGameSettings{
+        Magic: data.MagicSettingNormal,
+        Difficulty: data.DifficultyAverage,
+    })
+
+    game.Plane = data.PlaneArcanus
+
+    player := game.AddPlayer(wizard, true)
+
+    x, y, _ := game.FindValidCityLocation(game.Plane)
+
+    city := citylib.MakeCity("Erfurt", x, y, player.Wizard.Race, player.Wizard.Banner, player.TaxRate, game.BuildingInfo, game.CurrentMap(), game)
+    city.Population = 1000
+    city.Plane = data.PlaneArcanus
+    city.Banner = wizard.Banner
+    city.ProducingUnit = units.TrollSettlers
+    city.Production = float32(city.ProducingUnit.ProductionCost)
+    city.Farmers = 1
+    city.ResetCitizens(nil)
+
+    player.AddCity(city)
+    player.Gold = 1000
+    player.Mana = 1000
+
+    player.LiftFog(x, y, 4, data.PlaneArcanus)
+
+    game.Camera.Center(x, y)
+
+    return game
+}
+
 func NewEngine(scenario int) (*Engine, error) {
     cache := lbx.AutoCache()
 
@@ -3443,6 +3486,7 @@ func NewEngine(scenario int) (*Engine, error) {
         case 38: game = createScenario38(cache)
         case 39: game = createScenario39(cache)
         case 40: game = createScenario40(cache)
+        case 41: game = createScenario41(cache)
         default: game = createScenario1(cache)
     }