Use pre-increment in action point tests

src/main/scala/net/eagle0/eagle/library/actions/applier/ActionResultApplierImpl.scala

@@ -279,7 +279,7 @@ class ActionResultApplierImpl(validator: Option[Validator]) extends ActionResult
       .getOrElse(afterVictor)
 
     val afterEagleMap = result.newEagleMap
-      .map(em => afterGameType.copy(eagleMap = Some(em)))
+      .map(em => afterGameType.copy(eagleMap = em))
       .getOrElse(afterGameType)
 
     afterEagleMap.copy(actionResultCount = afterEagleMap.actionResultCount + 1)

src/main/scala/net/eagle0/eagle/library/util/view_filters/GameStateViewFilter.scala

@@ -54,7 +54,7 @@ object GameStateViewFilter {
       battalionTypes = gs.battalionTypes,
       chronicleEntries = gs.chronicleEntries,
       gameType = gs.gameType,
-      eagleMap = gs.eagleMap
+      eagleMap = Some(gs.eagleMap)
     )
   }
 }

src/main/scala/net/eagle0/eagle/model/proto_converters/EagleMapInfoConverter.scala

@@ -4,6 +4,9 @@ import net.eagle0.eagle.common.eagle_map_info.EagleMapInfo as EagleMapInfoProto
 import net.eagle0.eagle.model.state.game_state.EagleMapInfo
 
 object EagleMapInfoConverter {
+  private def isSet(proto: EagleMapInfoProto): Boolean =
+    proto.mapWidth != 0 || proto.mapHeight != 0 || proto.sha256.nonEmpty
+
   def toProto(eagleMapInfo: EagleMapInfo): EagleMapInfoProto =
     EagleMapInfoProto(
       mapWidth = eagleMapInfo.mapWidth,
@@ -20,8 +23,14 @@ object EagleMapInfoConverter {
       centroidsSha256 = proto.centroidsSha256
     )
 
+  def fromRequiredProto(proto: Option[EagleMapInfoProto]): EagleMapInfo = {
+    val eagleMapInfo = proto
+      .getOrElse(throw new IllegalArgumentException("EagleMapInfo proto is required"))
+    fromProto(eagleMapInfo)
+  }
+
   def fromProtoOption(proto: Option[EagleMapInfoProto]): Option[EagleMapInfo] =
     proto
-      .filter(p => p.mapWidth != 0 || p.mapHeight != 0 || p.sha256.nonEmpty)
+      .filter(isSet)
       .map(fromProto)
 }

src/main/scala/net/eagle0/eagle/model/proto_converters/game_state/GameStateConverter.scala

@@ -71,7 +71,7 @@ object GameStateConverter {
           randomSeed: Long,
           chronicleEntries: Vector[ChronicleEntry],
           gameType: GameType,
-          eagleMap: Option[net.eagle0.eagle.model.state.game_state.EagleMapInfo]
+          eagleMap: net.eagle0.eagle.model.state.game_state.EagleMapInfo
         ) =>
       GameStateProto(
         gameId = gameId,
@@ -97,7 +97,7 @@ object GameStateConverter {
         chronicleEntries = chronicleEntries.map(ChronicleEntryConverter.toProto),
         gameType = GameTypeConverter.toProto(gameType)._1,
         tutorialPhase = GameTypeConverter.toProto(gameType)._2,
-        eagleMap = eagleMap.map(EagleMapInfoConverter.toProto)
+        eagleMap = Some(EagleMapInfoConverter.toProto(eagleMap))
       )
   }
 
@@ -161,7 +161,7 @@ object GameStateConverter {
           gameType =
             if gameType == GameTypeProto.UNKNOWN_GAME_TYPE then GameType.Normal
             else GameTypeConverter.fromProto(gameType, tutorialPhase),
-          eagleMap = EagleMapInfoConverter.fromProtoOption(eagleMap)
+          eagleMap = EagleMapInfoConverter.fromRequiredProto(eagleMap)
         )
     }
 }

src/main/scala/net/eagle0/eagle/model/state/game_state/GameState.scala

@@ -37,5 +37,5 @@ case class GameState(
     randomSeed: Long,
     chronicleEntries: Vector[ChronicleEntry],
     gameType: GameType,
-    eagleMap: Option[EagleMapInfo] = None
+    eagleMap: EagleMapInfo
 )

src/main/scala/net/eagle0/eagle/service/InMemoryHistory.scala

@@ -54,7 +54,13 @@ object InMemoryHistory {
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = net.eagle0.eagle.model.state.GameType.Normal
+    gameType = net.eagle0.eagle.model.state.GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 }
 

src/main/scala/net/eagle0/eagle/service/SqliteHistory.scala

@@ -2017,7 +2017,13 @@ object SqliteHistory {
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   /**

src/main/scala/net/eagle0/eagle/service/new_game_creation/NewGameCreation.scala

@@ -493,14 +493,12 @@ object FixedNewGameCreation extends NewGameCreation {
   }
 
   private def genericStartGameResult(gameId: GameId, gameParameters: GameParameters): ActionResultC = {
-    val eagleMapProto = gameParameters.eagleMap
-    val eagleMap      = eagleMapProto.map(em =>
-      EagleMapInfo(
-        mapWidth = em.mapWidth,
-        mapHeight = em.mapHeight,
-        sha256 = em.sha256,
-        centroidsSha256 = em.centroidsSha256
-      )
+    val eagleMapProto = gameParameters.getEagleMap
+    val eagleMap      = EagleMapInfo(
+      mapWidth = eagleMapProto.mapWidth,
+      mapHeight = eagleMapProto.mapHeight,
+      sha256 = eagleMapProto.sha256,
+      centroidsSha256 = eagleMapProto.centroidsSha256
     )
     ActionResultC(
       actionResultType = ActionResultType.GameStart,
@@ -514,7 +512,7 @@ object FixedNewGameCreation extends NewGameCreation {
         )
       ),
       newRandomSeed = Some(gameId),
-      newEagleMap = eagleMap
+      newEagleMap = Some(eagleMap)
     )
   }
 

src/main/scala/net/eagle0/eagle/service/new_game_creation/TutorialGameCreation.scala

@@ -110,13 +110,12 @@ object TutorialGameCreation {
 
     // Start with base ActionResultC
     // Start at BattleRequest phase so battle begins immediately
-    val eagleMap = tutorialParams.eagleMap.map(em =>
-      EagleMapInfo(
-        mapWidth = em.mapWidth,
-        mapHeight = em.mapHeight,
-        sha256 = em.sha256,
-        centroidsSha256 = em.centroidsSha256
-      )
+    val eagleMapProto = tutorialParams.getEagleMap
+    val eagleMap      = EagleMapInfo(
+      mapWidth = eagleMapProto.mapWidth,
+      mapHeight = eagleMapProto.mapHeight,
+      sha256 = eagleMapProto.sha256,
+      centroidsSha256 = eagleMapProto.centroidsSha256
     )
 
     val baseResult = ActionResultC(
@@ -127,7 +126,7 @@ object TutorialGameCreation {
       newRandomSeed = Some(gameId),
       newProvinces = provinces,
       newGameType = Some(GameType.Tutorial(TutorialPhase.OpeningBattle)),
-      newEagleMap = eagleMap
+      newEagleMap = Some(eagleMap)
     )
 
     // Build factions, heroes, and battalions from tutorial parameters

src/test/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistances_test.cpp

@@ -28,11 +28,11 @@ class ActionPointDistancesTest : public ::testing::Test {
         //  P P P M P P
 
         // const_cast is safe because we own the mutable buffer (map)
-        for (int i = 6; i < 12; i++) {
+        for (int i = 6; i < 12; ++i) {
             const_cast<Terrain*>(map->mutable_terrain()->GetMutableObject(i))
                     ->mutate_type(net::eagle0::shardok::storage::fb::Terrain_::Type_FOREST);
         }
-        for (int i = 18; i < 24; i++) {
+        for (int i = 18; i < 24; ++i) {
             const_cast<Terrain*>(map->mutable_terrain()->GetMutableObject(i))
                     ->mutate_type(net::eagle0::shardok::storage::fb::Terrain_::Type_RIVER);
         }

src/test/scala/net/eagle0/eagle/ai/FactionLeaderProvinceRankerTest.scala

@@ -75,7 +75,13 @@ class FactionLeaderProvinceRankerTest extends AnyFlatSpec with Matchers with Bef
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   "rankedProvinceIds" should "order by hostile, then hostile + neutral" in {

src/test/scala/net/eagle0/eagle/ai/FixLeaderAloneCommandSelectorTest.scala

@@ -79,7 +79,13 @@ class FixLeaderAloneCommandSelectorTest extends AnyFlatSpec with Matchers with B
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def makeMarchAvailable(

src/test/scala/net/eagle0/eagle/ai/InvitationCommandSelectorTest.scala

@@ -84,7 +84,13 @@ class InvitationCommandSelectorTest extends AnyFlatSpec with Matchers with Befor
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val actingFaction: FactionC = makeFaction(

src/test/scala/net/eagle0/eagle/ai/MidGameAIClientTest.scala

@@ -98,7 +98,13 @@ class MidGameAIClientTest extends AnyFlatSpec with Matchers with BeforeAndAfterE
       battalionTypes = battalionTypes,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def makeFaction(

src/test/scala/net/eagle0/eagle/ai/MoveLeaderToBetterProvinceCommandChooserTest.scala

@@ -110,7 +110,13 @@ class MoveLeaderToBetterProvinceCommandChooserTest extends AnyFlatSpec with Matc
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val faction: FactionC = makeFaction(

src/test/scala/net/eagle0/eagle/ai/ResolveDiplomacyCommandSelectorTest.scala

@@ -351,7 +351,13 @@ class ResolveDiplomacyCommandSelectorTest extends AnyFlatSpec with Matchers with
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val acceptRejectAndImprison =

src/test/scala/net/eagle0/eagle/ai/SeekMoreLeadersCommandChooserTest.scala

@@ -146,7 +146,13 @@ class SeekMoreLeadersCommandChooserTest extends AnyFlatSpec with Matchers with B
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def makeMarchAvailable(

src/test/scala/net/eagle0/eagle/library/actions/applier/ActionResultApplierImplTest.scala

@@ -67,7 +67,13 @@ class ActionResultApplierImplTest extends AnyFlatSpec with Matchers with BeforeA
     battalionTypes = Vector.empty,
     randomSeed = 1L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   // ============ Basic State Updates ============

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableAlmsCommandFactoryTest.scala

@@ -70,7 +70,13 @@ class AvailableAlmsCommandFactoryTest extends AnyFlatSpec with Matchers with Bef
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val extraProvinceVassal1 = HeroC(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableApprehendOutlawCommandFactoryTest.scala

@@ -86,7 +86,13 @@ class AvailableApprehendOutlawCommandFactoryTest extends AnyFlatSpec with Matche
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableArmTroopsCommandFactoryTest.scala

@@ -97,7 +97,13 @@ class AvailableArmTroopsCommandFactoryTest extends AnyFlatSpec with Matchers wit
     battalionTypes = battalionTypes,
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommands" should "return nothing if there are no battalions" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableAttackDecisionCommandFactoryTest.scala

@@ -184,7 +184,13 @@ class AvailableAttackDecisionCommandFactoryTest extends AnyFlatSpec with Matcher
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def getAttackDecisionCommand(gs: GameState): AttackDecisionAvailable =

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableCommandsFactoryTest.scala

@@ -62,7 +62,13 @@ class AvailableCommandsFactoryTest extends AnyFlatSpec with Matchers with MockFa
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val baseProvince = ProvinceC(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableControlWeatherCommandsFactoryTest.scala

@@ -70,7 +70,13 @@ class AvailableControlWeatherCommandsFactoryTest extends AnyFlatSpec with Before
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDeclineQuestCommandsFactoryTest.scala

@@ -78,7 +78,13 @@ class AvailableDeclineQuestCommandsFactoryTest extends AnyFlatSpec with Matchers
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommand" should "return None when the province is not ruled by the faction leader" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDefendCommandsFactoryTest.scala

@@ -147,7 +147,13 @@ class AvailableDefendCommandsFactoryTest extends AnyFlatSpec with BeforeAndAfter
     battalionTypes = battalionTypes,
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val defendingProvince = ProvinceC(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDiplomacyCommandsFactoryTest.scala

@@ -153,7 +153,13 @@ class AvailableDiplomacyCommandsFactoryTest extends AnyFlatSpec with Matchers wi
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def gameState: GameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableDivineCommandsFactoryTest.scala

@@ -87,7 +87,13 @@ class AvailableDivineCommandsFactoryTest extends AnyFlatSpec with Matchers with
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommand" should "return None when the province is not ruled by the faction leader" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableExileVassalCommandFactoryTest.scala

@@ -58,7 +58,13 @@ class AvailableExileVassalCommandFactoryTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommand" should "include non-leader vassals" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableFeastCommandFactoryTest.scala

@@ -53,7 +53,13 @@ class AvailableFeastCommandFactoryTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     AvailableFeastCommandFactory.availableCommand(
@@ -99,7 +105,13 @@ class AvailableFeastCommandFactoryTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     inside(AvailableFeastCommandFactory.availableCommand(gameState, 9, 5).get) {
@@ -144,7 +156,13 @@ class AvailableFeastCommandFactoryTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     inside(AvailableFeastCommandFactory.availableCommand(gameState, 9, 5).get) {
@@ -193,7 +211,13 @@ class AvailableFeastCommandFactoryTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     inside(AvailableFeastCommandFactory.availableCommand(gameState, 9, 5).get) {
@@ -242,7 +266,13 @@ class AvailableFeastCommandFactoryTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     inside(AvailableFeastCommandFactory.availableCommand(gameState, 9, 5).get) {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleCapturedHeroCommandFactoryTest.scala

@@ -97,7 +97,13 @@ class AvailableHandleCapturedHeroCommandFactoryTest
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameStateWithOne: GameState = inside(gameStateWithTwo.provinces(provinceId)) {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleRiotCrackDownCommandFactoryTest.scala

@@ -67,7 +67,13 @@ class AvailableHandleRiotCrackDownCommandFactoryTest extends AnyFlatSpec with Be
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit =

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleRiotDoNothingCommandFactoryTest.scala

@@ -61,7 +61,13 @@ class AvailableHandleRiotDoNothingCommandFactoryTest extends AnyFlatSpec with Be
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {}

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHandleRiotGiveCommandFactoryTest.scala

@@ -53,7 +53,13 @@ class AvailableHandleRiotGiveCommandFactoryTest extends AnyFlatSpec with BeforeA
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableHeroGiftCommandFactoryTest.scala

@@ -84,7 +84,13 @@ class AvailableHeroGiftCommandFactoryTest extends AnyFlatSpec with Matchers with
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val brother1             = HeroC(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableImproveCommandsFactoryTest.scala

@@ -88,7 +88,13 @@ class AvailableImproveCommandsFactoryTest extends AnyFlatSpec with Matchers with
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableIssueOrdersCommandFactoryTest.scala

@@ -116,7 +116,13 @@ class AvailableIssueOrdersCommandFactoryTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommands" should "return nothing if the province leader is not a faction leader" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableManagePrisonerCommandsFactoryTest.scala

@@ -112,7 +112,13 @@ class AvailableManagePrisonerCommandsFactoryTest extends AnyFlatSpec with Before
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def getManagePrisonersCommand(gs: GameState): ManagePrisonersAvailable =

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableMarchCommandFactoryTest.scala

@@ -56,7 +56,13 @@ class AvailableMarchCommandFactoryTest extends AnyFlatSpec with BeforeAndAfterEa
       battalionTypes = battalionTypes,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def getMarchCommand(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableOrganizeTroopsCommandsFactoryTest.scala

@@ -93,7 +93,13 @@ class AvailableOrganizeTroopsCommandsFactoryTest extends AnyFlatSpec with Before
     battalionTypes = battalionTypes,
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "availableCommand" should "include all battalions, below cap or not, if stats are high enough" in {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailablePleaseRecruitMeCommandFactoryTest.scala

@@ -84,7 +84,13 @@ class AvailablePleaseRecruitMeCommandFactoryTest extends AnyFlatSpec with Before
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val baseProvinces: Map[Int, ProvinceC] = Map(actingProvince.id -> actingProvince)

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableReconCommandFactoryTest.scala

@@ -68,7 +68,13 @@ class AvailableReconCommandFactoryTest extends AnyFlatSpec with BeforeAndAfterEa
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableRecruitHeroesCommandFactoryTest.scala

@@ -90,7 +90,13 @@ class AvailableRecruitHeroesCommandFactoryTest extends AnyFlatSpec with Matchers
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableResolveBreakAllianceCommandFactoryTest.scala

@@ -82,7 +82,13 @@ class AvailableResolveBreakAllianceCommandFactoryTest extends AnyFlatSpec with M
     battalionTypes = Vector.empty,
     randomSeed = 12345L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {}

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableResolveRansomOfferCommandFactoryTest.scala

@@ -135,7 +135,13 @@ class AvailableResolveRansomOfferCommandFactoryTest extends AnyFlatSpec with Mat
     battalionTypes = Vector(),
     randomSeed = 1L,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableResolveTributeCommandsFactoryTest.scala

@@ -68,7 +68,13 @@ class AvailableResolveTributeCommandsFactoryTest extends AnyFlatSpec with Matche
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def makeHostileArmyGroup(

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableRestCommandsFactoryTest.scala

@@ -32,7 +32,13 @@ class AvailableRestCommandsFactoryTest extends AnyFlatSpec with Matchers {
       battalionTypes = Vector(),
       randomSeed = 0,
       chronicleEntries = Vector(),
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
     val command = AvailableRestCommandsFactory.availableCommand(gameState, 12, 6)

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableReturnCommandsFactoryTest.scala

@@ -50,7 +50,13 @@ class AvailableReturnCommandsFactoryTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableSendSuppliesCommandFactoryTest.scala

@@ -72,7 +72,13 @@ class AvailableSendSuppliesCommandFactoryTest extends AnyFlatSpec with BeforeAnd
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState: GameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableStartEpidemicCommandFactoryTest.scala

@@ -100,7 +100,13 @@ class AvailableStartEpidemicCommandFactoryTest extends AnyFlatSpec with BeforeAn
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableSwearBrotherhoodCommandFactoryTest.scala

@@ -95,7 +95,13 @@ class AvailableSwearBrotherhoodCommandFactoryTest extends AnyFlatSpec with Match
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTradeCommandFactoryTest.scala

@@ -52,7 +52,13 @@ class AvailableTradeCommandFactoryTest extends AnyFlatSpec with Matchers with Be
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTrainCommandsFactoryTest.scala

@@ -94,7 +94,13 @@ class AvailableTrainCommandsFactoryTest extends AnyFlatSpec with BeforeAndAfterE
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit =

src/test/scala/net/eagle0/eagle/library/actions/availability/AvailableTravelCommandsFactoryTest.scala

@@ -56,7 +56,13 @@ class AvailableTravelCommandsFactoryTest extends AnyFlatSpec with Matchers with
     battalionTypes = Vector(),
     randomSeed = 0,
     chronicleEntries = Vector(),
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndBattleAftermathPhaseActionTest.scala

@@ -99,7 +99,13 @@ class EndBattleAftermathPhaseActionTest extends AnyFlatSpec with Matchers with B
       battalionTypes = Vector.empty,
       randomSeed = randomSeed,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   behavior of "EndBattleAftermathPhaseActionTest"

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndDefenseDecisionPhaseActionTest.scala

@@ -118,7 +118,13 @@ class EndDefenseDecisionPhaseActionTest extends AnyFlatSpec with Matchers {
     victor = None,
     battalionTypes = Vector.empty,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "execute" should "end the phase and proceed to TRUCE_TURN_BACK" in {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndDiplomacyResolutionPhaseActionTest.scala

@@ -39,7 +39,13 @@ class EndDiplomacyResolutionPhaseActionTest extends AnyFlatSpec with Matchers wi
     battalionTypes = Vector.empty,
     randomSeed = 12345L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val applier          = ActionResultApplierImpl(Some(RuntimeValidator))

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndHandleRiotsPhaseActionTest.scala

@@ -73,7 +73,13 @@ class EndHandleRiotsPhaseActionTest extends AnyFlatSpec with BeforeAndAfterEach
     battalionTypes = Vector.empty,
     randomSeed = 1L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndPlayerCommandsPhaseActionTest.scala

@@ -144,7 +144,13 @@ class EndPlayerCommandsPhaseActionTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector.empty,
       randomSeed = randomSeed,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def gameState: GameState = makeGameState()

src/test/scala/net/eagle0/eagle/library/actions/impl/action/EndVassalCommandsPhaseActionTest.scala

@@ -49,7 +49,13 @@ class EndVassalCommandsPhaseActionTest extends AnyFlatSpec with Matchers {
       battalionTypes = Vector.empty,
       randomSeed = 0xfeedfaceL,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private def endVassalResult(results: Vector[?]): ActionResultC =

src/test/scala/net/eagle0/eagle/library/actions/impl/action/FreeHeroBackstoryVisibilityRecoveryTest.scala

@@ -62,7 +62,13 @@ class FreeHeroBackstoryVisibilityRecoveryTest extends AnyFlatSpec with MockFacto
       battalionTypes = Vector.empty,
       randomSeed = 12345L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val heroWithBackstory: Map[Int, HeroT] = Map(

src/test/scala/net/eagle0/eagle/library/actions/impl/action/NewRoundActionTest.scala

@@ -106,7 +106,13 @@ class NewRoundActionTest
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   // Helper to run NewRoundAction and return Scala ActionResults

src/test/scala/net/eagle0/eagle/library/actions/impl/action/NewYearActionTest.scala

@@ -131,7 +131,13 @@ class NewYearActionTest extends AnyFlatSpec with Matchers with BeforeAndAfterEac
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def gs: GameState = baseGameState

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformFoodConsumptionPhaseActionTest.scala

@@ -89,7 +89,13 @@ class PerformFoodConsumptionPhaseActionTest extends AnyFlatSpec with Matchers wi
     battalionTypes = battalionTypes,
     randomSeed = 1L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {}

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformForcedTurnBackActionTest.scala

@@ -75,7 +75,13 @@ class PerformForcedTurnBackActionTest extends AnyFlatSpec with Matchers with Bef
     victor = None,
     battalionTypes = Vector.empty,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val gsWithoutBlizzard = gsWithBlizzard.copy(

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformHeroDeparturesActionTest.scala

@@ -73,7 +73,13 @@ class PerformHeroDeparturesActionTest extends AnyFlatSpec with Matchers with Bef
     victor = None,
     battalionTypes = Vector.empty,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformHostileArmySetupActionTest.scala

@@ -63,7 +63,13 @@ class PerformHostileArmySetupActionTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "any setup" should "move to the next round phase" in {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceEventsActionTest.scala

@@ -161,7 +161,13 @@ class PerformProvinceEventsActionTest extends AnyFlatSpec with BeforeAndAfterEac
     battalionTypes = Vector.empty,
     randomSeed = randomSeed,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "changedProvince" should "remove beasts if we're past their end date" in {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformProvinceMoveResolutionActionTest.scala

@@ -115,7 +115,13 @@ class PerformProvinceMoveResolutionActionTest extends AnyFlatSpec with Matchers
     victor = None,
     battalionTypes = Vector.empty,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def getResults(gs: GameState) =

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformReconResolutionActionTest.scala

@@ -65,7 +65,13 @@ class PerformReconResolutionActionTest extends AnyFlatSpec with BeforeAndAfterEa
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val baseProvinces: Map[Int, ProvinceC] = Map(

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformUnaffiliatedHeroesActionTest.scala

@@ -79,7 +79,13 @@ class PerformUnaffiliatedHeroesActionTest extends AnyFlatSpec with Matchers with
     battalionTypes = Vector.empty,
     randomSeed = 12345L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   override def beforeEach(): Unit = {

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PerformVassalCommandsPhaseActionTest.scala

@@ -266,7 +266,13 @@ class PerformVassalCommandsPhaseActionTest extends AnyFlatSpec with Matchers wit
       battalionTypes = battalionTypes,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val marchGameState = baseGameState(

src/test/scala/net/eagle0/eagle/library/actions/impl/action/PrisonerExchangeActionTest.scala

@@ -43,7 +43,13 @@ class PrisonerExchangeActionTest extends AnyFlatSpec with Matchers {
     victor = None,
     battalionTypes = Vector.empty,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def prisoner(heroId: Int, lastFactionId: Int): UnaffiliatedHeroC =

src/test/scala/net/eagle0/eagle/library/actions/impl/action/ProvinceConqueredActionTest.scala

@@ -205,7 +205,13 @@ class ProvinceConqueredActionTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val currentDate = Date(year = 2024, month = Date.Month.July)

src/test/scala/net/eagle0/eagle/library/actions/impl/action/ResolveBattleActionTest.scala

@@ -503,7 +503,13 @@ class ResolveBattleActionTest extends AnyFlatSpec with MockFactory with Matchers
     victor = None,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val startingGameStateWithAllies = startingGameState.copy(

src/test/scala/net/eagle0/eagle/library/actions/impl/action/TruceTurnBackPhaseActionTest.scala

@@ -114,7 +114,13 @@ class TruceTurnBackPhaseActionTest extends AnyFlatSpec with Matchers {
     battalionTypes = Vector.empty,
     randomSeed = 1L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "results" should "advance to the next phase" in {

src/test/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/CapturedHeroMessagePromptGeneratorTest.scala

@@ -109,7 +109,13 @@ class CapturedHeroMessagePromptGeneratorTest extends AnyFlatSpec with Matchers w
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "execute message prompt" should "return an appropriate execute message" in {

src/test/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/ChronicleUpdatePromptGeneratorTest.scala

@@ -82,7 +82,13 @@ class ChronicleUpdatePromptGeneratorTest extends AnyFlatSpec with BeforeAndAfter
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val mockClientTextStore = mock[ClientTextStore]

src/test/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/DivineMessagePromptGeneratorTest.scala

@@ -101,7 +101,13 @@ class DivineMessagePromptGeneratorTest extends AnyFlatSpec with Matchers with Mo
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "generate" should "tell the LLM not to describe exile prisoner quests as releases" in {

src/test/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/GeneratorUtilitiesTest.scala

@@ -58,7 +58,13 @@ class GeneratorUtilitiesTest extends AnyFlatSpec with Matchers with BeforeAndAft
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
     val clientTextStore = mock[ClientTextStore]
     GeneratorUtilities

src/test/scala/net/eagle0/eagle/library/actions/llm_prompt_generators/QuestEndedGeneratorUtilitiesTest.scala

@@ -113,7 +113,13 @@ class QuestEndedGeneratorUtilitiesTest extends AnyFlatSpec with Matchers with Mo
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private def mockTextStore: ClientTextStore = {

src/test/scala/net/eagle0/eagle/library/util/GameStateViewFilterTest.scala

@@ -226,7 +226,13 @@ class GameStateViewFilterTest extends AnyFlatSpec with BeforeAndAfterEach with M
     battalionTypes = Vector.empty,
     randomSeed = 0L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   "filteredGameState" should "return all provinces when there is no factionId" in {

src/test/scala/net/eagle0/eagle/library/util/ProvinceUtilsTest.scala

@@ -438,7 +438,13 @@ class ProvinceUtilsTest extends AnyFlatSpec with Matchers with BeforeAndAfterEac
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   "isFocusProvince" should "return true when the ruling faction has this province as its focus" in {

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/AllianceOfferCommandSelectorTest.scala

@@ -61,7 +61,13 @@ class AllianceOfferCommandSelectorTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/AlmsCommandSelectorTest.scala

@@ -89,7 +89,13 @@ class AlmsCommandSelectorTest extends AnyFlatSpec with Matchers with BeforeAndAf
       battalionTypes = battalionTypes,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   "chosenAlmsCommand" should "give 1000 food if we need 10 support in December" in {

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/AttackCommandChooserTest.scala

@@ -181,7 +181,13 @@ class AttackCommandChooserTest extends AnyFlatSpec with Matchers with BeforeAndA
     victor = None,
     randomSeed = 12345L,
     chronicleEntries = Vector.empty,
-    gameType = GameType.Normal
+    gameType = GameType.Normal,
+    eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+      mapWidth = 0,
+      mapHeight = 0,
+      sha256 = "",
+      centroidsSha256 = ""
+    )
   )
 
   private val availableBattalionTypes = Vector(

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/AttackDecisionCommandChooserTest.scala

@@ -97,7 +97,13 @@ class AttackDecisionCommandChooserTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = battalionTypes,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val defaultSupplies = Supplies(gold = 0, food = 0)

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/CommandChoiceHelpersTest.scala

@@ -184,7 +184,13 @@ class CommandChoiceHelpersTest extends AnyFlatSpec with Matchers with BeforeAndA
       battalionTypes = battalionTypes,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   behavior of "CommandChoiceHelpersTest"

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/ExpandCommandSelectorTest.scala

@@ -126,7 +126,13 @@ class ExpandCommandSelectorTest extends AnyFlatSpec with Matchers with BeforeAnd
       battalionTypes = battalionTypesVector,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   "heroIdsToMarch" should "never send a faction leader by themselves" in

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/FulfillQuestsCommandSelectorTest.scala

@@ -83,7 +83,13 @@ class FulfillQuestsCommandSelectorTest extends AnyFlatSpec with Matchers with Be
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val gameState = makeGameState(

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/ImproveCommandSelectorTest.scala

@@ -69,7 +69,13 @@ class ImproveCommandSelectorTest extends AnyFlatSpec with Matchers with BeforeAn
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val improveCommand = ImproveAvailable(

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/TruceOfferCommandSelectorTest.scala

@@ -61,7 +61,13 @@ class TruceOfferCommandSelectorTest extends AnyFlatSpec with Matchers with Befor
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/AllianceQuestCommandChooserTest.scala

@@ -93,7 +93,13 @@ class AllianceQuestCommandChooserTest extends AnyFlatSpec with BeforeAndAfterEac
       battalionTypes = Vector.empty,
       randomSeed = 0L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/AlmsAcrossRealmQuestCommandChooserTest.scala

@@ -101,7 +101,13 @@ class AlmsAcrossRealmQuestCommandChooserTest extends AnyFlatSpec with BeforeAndA
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/AlmsToProvinceQuestCommandChooserTest.scala

@@ -81,7 +81,13 @@ class AlmsToProvinceQuestCommandChooserTest extends AnyFlatSpec with BeforeAndAf
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/ApprehendOutlawQuestCommandChooserTest.scala

@@ -64,7 +64,13 @@ class ApprehendOutlawQuestCommandChooserTest extends AnyFlatSpec with Matchers {
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/BattalionDiversityQuestCommandChooserTest.scala

@@ -119,7 +119,13 @@ class BattalionDiversityQuestCommandChooserTest extends AnyFlatSpec with Matcher
       battalionTypes = battalionTypes,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/BetrayAllyQuestCommandChooserTest.scala

@@ -93,7 +93,13 @@ class BetrayAllyQuestCommandChooserTest extends AnyFlatSpec with Matchers {
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
 
   private val diplomacyAvailable: DiplomacyAvailable = DiplomacyAvailable(

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/ControlWeatherQuestCommandChooserTest.scala

@@ -75,7 +75,13 @@ class ControlWeatherQuestCommandChooserTest extends AnyFlatSpec with Matchers {
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }
 

src/test/scala/net/eagle0/eagle/library/util/command_choice_helpers/quest_command_selectors/DevelopProvincesQuestCommandChooserTest.scala

@@ -101,7 +101,13 @@ class DevelopProvincesQuestCommandChooserTest extends AnyFlatSpec with Matchers
       battalionTypes = Vector.empty,
       randomSeed = 1L,
       chronicleEntries = Vector.empty,
-      gameType = GameType.Normal
+      gameType = GameType.Normal,
+      eagleMap = net.eagle0.eagle.model.state.game_state.EagleMapInfo(
+        mapWidth = 0,
+        mapHeight = 0,
+        sha256 = "",
+        centroidsSha256 = ""
+      )
     )
   }