Use Vector.empty in service post results

src/main/cpp/net/eagle0/shardok/ai/AIAttackGroups.hpp

@@ -27,7 +27,7 @@ struct TargetAndAttackLocations {
     Coords target;
     CoordsSet attackLocations;
 
-    [[nodiscard]] auto operator==(const TargetAndAttackLocations& rhs) const -> bool = default;
+    auto operator==(const TargetAndAttackLocations& rhs) const -> bool = default;
 };
 
 struct TargetPriorityList {
@@ -39,7 +39,7 @@ struct TargetPriorityList {
           priorityOrder(po) {}
 };
 
-[[nodiscard]] auto EffectiveDistance(
+auto EffectiveDistance(
         const Unit* unit,
         const HexMap* map,
         const AttackLocations& attackLocations,
@@ -47,7 +47,7 @@ struct TargetPriorityList {
         const BattalionTypeGetter& battalionTypeGetter,
         ActionPoints braveWaterCost) -> DIST_T;
 
-[[nodiscard]] auto EffectiveDistance(
+auto EffectiveDistance(
         const Unit* unit,
         const HexMap* map,
         const CoordsSet& locations,
@@ -55,14 +55,14 @@ struct TargetPriorityList {
         const BattalionTypeGetter& battalionTypeGetter,
         ActionPoints braveWaterCost) -> DIST_T;
 
-[[nodiscard]] auto EffectiveDistance(
+auto EffectiveDistance(
         const Unit* unit,
         const ActionPointDistances* notBravingApd,
         const ActionPointDistances* bravingApd,
         const CoordsSet& locations) -> DIST_T;
 
 // Chooses a list of targets in priority order for each unit.
-[[nodiscard]] auto GenerateTargetPriorities(
+auto GenerateTargetPriorities(
         const std::vector<const Unit*>& occupants,
         const HexMap* map,
         const CoordsSet& targets,

src/main/cpp/net/eagle0/shardok/ai/AIDistanceDebuf.cpp

@@ -104,10 +104,13 @@ auto DefenderDistanceBuf(
                 pointCostToDesiredTargetWithBraving);
     }
 
-    std::ranges::sort(pointCosts, [](const WithoutAndWith &left, const WithoutAndWith &right) {
-        return left.without == right.without ? left.with < right.with
-                                             : left.without < right.without;
-    });
+    std::sort(
+            begin(pointCosts),
+            end(pointCosts),
+            [](const WithoutAndWith &left, const WithoutAndWith &right) {
+                return left.without == right.without ? left.with < right.with
+                                                     : left.without < right.without;
+            });
 
     // experiment: add dummy values to the end with very high cost, so there's never an advantage
     // to leaving a defender unit alive in a castle.

src/main/cpp/net/eagle0/shardok/ai/AIDistanceDebuf.hpp

@@ -13,7 +13,7 @@
 
 namespace shardok {
 
-[[nodiscard]] auto DefenderDistanceBuf(
+auto DefenderDistanceBuf(
         const Coords &defenderLocation,
         const HexMap *hexMap,
         const MapId &mapId,

src/main/cpp/net/eagle0/shardok/ai/AIExperimentConfig.hpp

@@ -12,7 +12,7 @@
 
 namespace shardok {
 
-[[nodiscard]] inline auto CurrentAIExperimentId() -> int {
+inline auto CurrentAIExperimentId() -> int {
     const char* rawValue = std::getenv("SHARDOK_SCORING_EXPERIMENT_ID");
     if (rawValue == nullptr) { return 0; }
 
@@ -28,9 +28,7 @@ namespace shardok {
     return experimentId;
 }
 
-[[nodiscard]] inline auto IsAIExperiment(const int id) -> bool {
-    return CurrentAIExperimentId() == id;
-}
+inline auto IsAIExperiment(const int id) -> bool { return CurrentAIExperimentId() == id; }
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/ai/AIMinimumDistanceAndTarget.hpp

@@ -18,12 +18,12 @@ struct CoordsAndDistance {
     int distance;
 };
 
-[[nodiscard]] auto MinimumDistanceAndTarget(
+auto MinimumDistanceAndTarget(
         const ActionPointDistances *apd,
         const Coords &origin,
         const CoordsSet &destinations) -> CoordsAndDistance;
 
-[[nodiscard]] auto MinimumDistance(
+auto MinimumDistance(
         const ActionPointDistances *apd,
         const Coords &origin,
         const CoordsSet &destinations) -> int;

src/main/cpp/net/eagle0/shardok/ai/AIScoreUtilities.hpp

@@ -20,12 +20,12 @@ using GameState = net::eagle0::shardok::storage::fb::GameState;
 using PlayerInfo = net::eagle0::shardok::storage::fb::PlayerInfo;
 using Unit = net::eagle0::shardok::storage::fb::Unit;
 
-[[nodiscard]] auto HasAttachedHeroWithProfession(
+auto HasAttachedHeroWithProfession(
         const Unit *unit,
         net::eagle0::shardok::storage::fb::Profession profession) -> bool;
 
-[[nodiscard]] auto CastleClaimCapableAttackerUnitCount(const GameStateW &gameState) -> int;
-[[nodiscard]] auto PlayerInfoForPid(const GameStateW &, PlayerId pid) -> const PlayerInfo *;
+auto CastleClaimCapableAttackerUnitCount(const GameStateW &gameState) -> int;
+auto PlayerInfoForPid(const GameStateW &, PlayerId pid) -> const PlayerInfo *;
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/ai/AIStrategy.hpp

@@ -26,13 +26,11 @@ struct AIStrategy {
 };
 
 extern AIStrategy FleeStrategy;
-[[nodiscard]] auto AttackUnitsStrategy(const vector<TargetPriorityList>& targetPriorities)
-        -> AIStrategy;
-[[nodiscard]] auto AttackCastlesStrategy(const vector<TargetPriorityList>& targetPriorities)
-        -> AIStrategy;
+auto AttackUnitsStrategy(const vector<TargetPriorityList>& targetPriorities) -> AIStrategy;
+auto AttackCastlesStrategy(const vector<TargetPriorityList>& targetPriorities) -> AIStrategy;
 extern AIStrategy HoldCastlesStrategy;
 extern AIStrategy ScatterStrategy;
-[[nodiscard]] auto CrossRiversStrategy(const CoordsSet& targetLocations) -> AIStrategy;
+auto CrossRiversStrategy(const CoordsSet& targetLocations) -> AIStrategy;
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/ai/AITimeBudget.hpp

@@ -30,7 +30,7 @@ public:
     AIEvaluationCounter(AIEvaluationCounter&&) = delete;
     auto operator=(AIEvaluationCounter&&) -> AIEvaluationCounter& = delete;
 
-    [[nodiscard]] static int GetCurrentCount();
+    static int GetCurrentCount();
 };
 
 // Configuration structure for iterative deepening time budget
@@ -44,7 +44,7 @@ struct AITimeBudget {
 // Time budget is calculated dynamically based on number of available commands:
 //   budget = msPerCommand × numCommands (clamped to 200-5000ms)
 // If isAllAiBattle is true, uses allAiBattleTimeBudgetMaximum instead of the normal maximum.
-[[nodiscard]] auto CalculateTimeBudget(
+auto CalculateTimeBudget(
         PlayerId playerId,
         const GameSettingsSPtr& settings,
         const GameStateW& state,

src/main/cpp/net/eagle0/shardok/ai/AIUnitScoreCalculator.hpp

@@ -17,9 +17,9 @@ using net::eagle0::shardok::storage::fb::Unit;
 using ScoreValue = double;
 class AttackLocations;
 
-[[nodiscard]] auto ContextFreeUnitValue(const Unit *unit) -> ScoreValue;
+auto ContextFreeUnitValue(const Unit *unit) -> ScoreValue;
 
-[[nodiscard]] auto GetRangedAttackBonus(
+auto GetRangedAttackBonus(
         const Unit *unit,
         bool isAttacker,
         const HexMap *map,
@@ -32,7 +32,7 @@ class AttackLocations;
         double minVigorToCast,
         ActionPoints archeryActionPointCost = 0) -> double;
 
-[[nodiscard]] auto UnitValue(
+auto UnitValue(
         const Unit *unit,
         bool isAttacker,
         const std::vector<const Unit *> &attackerUnits,

src/main/cpp/net/eagle0/shardok/ai/AIWaterCrossingCalculator.hpp

@@ -31,7 +31,7 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {
 }
 
 // Units that need a water crossing to reach at least one of the destinations
-[[nodiscard]] auto UnitIdsRequiringWaterCrossing(
+auto UnitIdsRequiringWaterCrossing(
         const GameStateW& gameState,
         PlayerId pid,
         const CoordsSet& destinations,
@@ -39,14 +39,14 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {
         const BattalionTypeGetter& battalionTypeGetter) -> vector<UnitId>;
 
 // Units belonging to the player that are capable of creating water crossings
-[[nodiscard]] auto UnitIdsToCreateWaterCrossing(
+auto UnitIdsToCreateWaterCrossing(
         const GameStateW& gameState,
         PlayerId pid,
         const BattalionTypeGetter& battalionTypeGetter) -> vector<UnitId>;
 
 // Whether a unit of the given type can reach destination from origin, given the current state
 // of the map
-[[nodiscard]] auto CanReach(
+auto CanReach(
         const Coords& origin,
         const Coords& destination,
         const HexMap* hexMap,
@@ -56,12 +56,11 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {
 
 // Returns the *non*-water tiles from which you could bridge/freeze water to allow a unit to cross
 // from origin to destination
-[[nodiscard]] auto CrossingStartLocations(const HexMap* hexMap, const CoordsSet& waterCrossingTiles)
-        -> CoordsSet;
+auto CrossingStartLocations(const HexMap* hexMap, const CoordsSet& waterCrossingTiles) -> CoordsSet;
 
 // Returns the water tiles that, if they were bridged/frozen, would allow a unit to cross from
 // origin to destination
-[[nodiscard]] auto WaterCrossingTiles(
+auto WaterCrossingTiles(
         const Coords& origin,
         const Coords& destination,
         const HexMap* hexMap,
@@ -69,7 +68,7 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {
         const BattalionTypeSPtr& battalionType) -> CoordsSet;
 
 // Returns the set of tiles that the attacker should try to approach in order to bridge/freeze
-[[nodiscard]] auto IntendedCrossingStarts(
+auto IntendedCrossingStarts(
         const GameStateW& gameState,
         const vector<UnitId>& unitIdsCreatingCrossing,
         const CoordsSet& tilesToStartCrossingFrom,
@@ -77,7 +76,7 @@ static inline void AssertValid(const Coords& c, const HexMap* hexMap) {
         const BattalionTypeGetter& battalionTypeGetter) -> CoordsSet;
 
 // Calculate score based on water crossing strategy
-[[nodiscard]] auto WaterCrossingScore(
+auto WaterCrossingScore(
         PlayerId playerId,
         const BattalionTypeGetter& battalionTypeGetter,
         const GameStateW& gameState,

src/main/cpp/net/eagle0/shardok/ai/score/AIVictoryConditionScoreCalculator.hpp

@@ -23,7 +23,7 @@ using net::eagle0::shardok::storage::fb::PlayerInfo;
 
 using ScoreValue = double;
 
-[[nodiscard]] auto AttackerHoldsCriticalTilesVictoryScore(
+auto AttackerHoldsCriticalTilesVictoryScore(
         const GameStateW& gameState,
         const CoordsSet& criticalTileLocations,
         const PlayerInfo* player,
@@ -32,12 +32,12 @@ using ScoreValue = double;
         const BattalionTypeGetter& battalionTypeGetter,
         ActionPoints braveWaterCost) -> ScoreValue;
 
-[[nodiscard]] auto DefenderHoldsCriticalTilesVictoryScore(
+auto DefenderHoldsCriticalTilesVictoryScore(
         const GameStateW& gameState,
         const CoordsSet& criticalTileLocations,
         const PlayerInfo* player) -> ScoreValue;
 
-[[nodiscard]] auto LastPlayerStandingVictoryScore(
+auto LastPlayerStandingVictoryScore(
         const GameStateW& gameState,
         const PlayerInfo* player,
         const APDCache& apdCache,

src/main/cpp/net/eagle0/shardok/ai/score/private/AIScoreCalculatorSharedUtilities.cpp

@@ -7,7 +7,8 @@
 #include "src/main/cpp/net/eagle0/shardok/ai/AIScoreUtilities.hpp"
 #include "src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp"
 
-namespace shardok::score_calculator_internal {
+namespace shardok {
+namespace score_calculator_internal {
 
 auto EffectiveDistanceCache::GetOrCompute(
         const Unit* unit,
@@ -124,4 +125,5 @@ auto AttackerMultiplierForTargetDistance(
             isLateGame);
 }
 
-}  // namespace shardok::score_calculator_internal
+}  // namespace score_calculator_internal
+}  // namespace shardok

src/main/cpp/net/eagle0/shardok/ai/score/private/AIScoreCalculatorSharedUtilities.hpp

@@ -24,7 +24,8 @@
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/hex_map_generated.h"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/unit_generated.h"
 
-namespace shardok::score_calculator_internal {
+namespace shardok {
+namespace score_calculator_internal {
 
 using HexMap = net::eagle0::shardok::storage::fb::HexMap;
 using Unit = net::eagle0::shardok::storage::fb::Unit;
@@ -50,13 +51,13 @@ struct EffectiveDistanceCache {
     struct CacheKey {
         UnitId unitId;
         Coords target;
-        [[nodiscard]] bool operator==(const CacheKey& other) const {
+        bool operator==(const CacheKey& other) const {
             return unitId == other.unitId && target == other.target;
         }
     };
 
     struct CacheKeyHash {
-        [[nodiscard]] size_t operator()(const CacheKey& key) const {
+        size_t operator()(const CacheKey& key) const {
             return std::hash<UnitId>{}(key.unitId) ^ (std::hash<int>{}(key.target.row()) << 1) ^
                    (std::hash<int>{}(key.target.column()) << 2);
         }
@@ -64,7 +65,7 @@ struct EffectiveDistanceCache {
 
     mutable gtl::flat_hash_map<CacheKey, DIST_T, CacheKeyHash> cache;
 
-    [[nodiscard]] DIST_T GetOrCompute(
+    DIST_T GetOrCompute(
             const Unit* unit,
             const Coords& target,
             const ActionPointDistances* notBravingApd,
@@ -74,12 +75,11 @@ struct EffectiveDistanceCache {
 
 /// Calculate score for FLEE strategy
 /// Returns negative score based on fleeing units
-[[nodiscard]] auto FleeStrategyScoreForState(const GameStateW& gameState, PlayerId playerId)
-        -> ScoreValue;
+auto FleeStrategyScoreForState(const GameStateW& gameState, PlayerId playerId) -> ScoreValue;
 
 /// Calculate attacker multiplier based on distance to priority targets
 /// This is used to weight attacker units by their proximity to objectives
-[[nodiscard]] auto AttackerMultiplierForTargetDistance(
+auto AttackerMultiplierForTargetDistance(
         const Unit* attackingUnit,
         const std::vector<TargetAndAttackLocations>& priorityList,
         const std::vector<const Unit*>& occupants,
@@ -89,6 +89,7 @@ struct EffectiveDistanceCache {
         const ActionPointDistances* bravingApd,
         bool isLateGame) -> double;
 
-}  // namespace shardok::score_calculator_internal
+}  // namespace score_calculator_internal
+}  // namespace shardok
 
 #endif  // EAGLE0_SHARDOK_AI_SCORE_PRIVATE_AI_SCORE_CALCULATOR_SHARED_UTILITIES_HPP

src/main/cpp/net/eagle0/shardok/ai_battle_simulator/AiBattleSimulator.cpp

@@ -28,7 +28,8 @@
 #include "src/main/protobuf/net/eagle0/shardok/common/player_info.pb.h"
 #pragma clang diagnostic pop
 
-namespace shardok::ai_battle_simulator {
+namespace shardok {
+namespace ai_battle_simulator {
 
 namespace {
 
@@ -958,4 +959,5 @@ BattleResult AiBattleSimulator::CreateResultFromGameState(
     return result;
 }
 
-}  // namespace shardok::ai_battle_simulator
+}  // namespace ai_battle_simulator
+}  // namespace shardok

src/main/cpp/net/eagle0/shardok/ai_battle_simulator/AiBattleSimulator.hpp

@@ -30,9 +30,7 @@ class ShardokEngine;
 // Type alias for hex map
 using HexMap = net::eagle0::shardok::storage::fb::HexMap;
 
-}  // namespace shardok
-
-namespace shardok::ai_battle_simulator {
+namespace ai_battle_simulator {
 
 using BattleConfigProto = net::eagle0::shardok::ai_battle_simulator::BattleConfig;
 
@@ -148,6 +146,7 @@ private:
     CreateResultFromGameState(const GameStateW& state, int totalRounds, int totalCommands) const;
 };
 
-}  // namespace shardok::ai_battle_simulator
+}  // namespace ai_battle_simulator
+}  // namespace shardok
 
 #endif  // EAGLE0_SHARDOK_AI_BATTLE_SIMULATOR_AI_BATTLE_SIMULATOR_HPP

src/main/cpp/net/eagle0/shardok/ai_testing_common/AIClientFactory.cpp

@@ -7,7 +7,8 @@
 #include "src/main/cpp/net/eagle0/common/mcts/abstract/MCTSTypes.hpp"
 #include "src/main/cpp/net/eagle0/shardok/ai/ShardokAIClient.hpp"
 
-namespace shardok::ai_testing_common {
+namespace shardok {
+namespace ai_testing_common {
 
 auto AIClientFactory::Create(
         PlayerId playerId,
@@ -29,4 +30,5 @@ auto AIClientFactory::Create(
             mctsConfig);
 }
 
-}  // namespace shardok::ai_testing_common
+}  // namespace ai_testing_common
+}  // namespace shardok

src/main/cpp/net/eagle0/shardok/ai_testing_common/GamePhaseRunner.cpp

@@ -8,7 +8,8 @@
 #include "src/main/cpp/net/eagle0/shardok/library/ShardokEngine.hpp"
 #include "src/main/flatbuffer/net/eagle0/shardok/storage/game_state.hpp"
 
-namespace shardok::ai_testing_common {
+namespace shardok {
+namespace ai_testing_common {
 
 auto GamePhaseRunner::RunSetupPhase(
         ShardokEngine& engine,
@@ -57,4 +58,5 @@ auto GamePhaseRunner::RunSingleTurn(ShardokEngine& engine, PlayerId playerId, Sh
     return true;
 }
 
-}  // namespace shardok::ai_testing_common
+}  // namespace ai_testing_common
+}  // namespace shardok

src/main/cpp/net/eagle0/shardok/ai_testing_common/GameSettingsFactory.cpp

@@ -9,7 +9,8 @@
 #include "src/main/cpp/net/eagle0/common/byte_vector.hpp"
 #include "src/main/cpp/net/eagle0/shardok/util/BattalionTypeRegistrar.hpp"
 
-namespace shardok::ai_testing_common {
+namespace shardok {
+namespace ai_testing_common {
 
 auto GameSettingsFactory::CreateDefault() -> GameSettingsSPtr {
     auto settings = std::make_shared<GameSettings>();
@@ -30,4 +31,5 @@ auto GameSettingsFactory::CreateDefault() -> GameSettingsSPtr {
     return settings;
 }
 
-}  // namespace shardok::ai_testing_common
+}  // namespace ai_testing_common
+}  // namespace shardok

src/main/cpp/net/eagle0/shardok/ai_testing_common/GameSettingsFactory.hpp

@@ -10,7 +10,8 @@
 
 #include "src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp"
 
-namespace shardok::ai_testing_common {
+namespace shardok {
+namespace ai_testing_common {
 
 /**
  * Factory class for creating GameSettings instances with standard configuration.
@@ -32,6 +33,7 @@ public:
     static auto CreateDefault() -> GameSettingsSPtr;
 };
 
-}  // namespace shardok::ai_testing_common
+}  // namespace ai_testing_common
+}  // namespace shardok
 
 #endif  // EAGLE0_SHARDOK_AI_TESTING_COMMON_GAME_SETTINGS_FACTORY_HPP

src/main/cpp/net/eagle0/shardok/library/AvailableCommandsFactory.cpp

@@ -32,8 +32,9 @@ private:
     static auto CannotBecomeOutlaw(const GameStateW &gameState, PlayerId pid) -> bool {
         if (pid == UNCONTROLLED_PLAYER_ID) return false;
 
-        const auto &player = std::ranges::find_if(
-                *gameState->player_infos(),
+        const auto &player = std::find_if(
+                std::begin(*gameState->player_infos()),
+                std::end(*gameState->player_infos()),
                 [pid](const PlayerInfoFb *pi) { return pi->player_id() == pid; });
 
         return (player != std::end(*gameState->player_infos()) && player->cannot_become_outlaw());
@@ -42,8 +43,9 @@ private:
     static auto IsAttacker(const GameStateW &gameState, PlayerId pid) -> bool {
         if (pid == UNCONTROLLED_PLAYER_ID) return false;
 
-        const auto &player = std::ranges::find_if(
-                *gameState->player_infos(),
+        const auto &player = std::find_if(
+                std::begin(*gameState->player_infos()),
+                std::end(*gameState->player_infos()),
                 [pid](const PlayerInfoFb *pi) { return pi->player_id() == pid; });
 
         return (player == std::end(*gameState->player_infos()) || !player->is_defender());

src/main/cpp/net/eagle0/shardok/library/BattalionType.hpp

@@ -189,12 +189,12 @@ struct BattalionType {
     }
 
     [[nodiscard]] auto GetCostToEnterTerrain(const TerrainProto &terrain) const -> ActionCost {
-        if (HasBridge(terrain.modifier())) {
-            return {ActionCost::standard,
+        if (HasBridge(terrain.modifier()))
+            return ActionCost(
+                    ActionCost::standard,
                     ActionPoints(std::ceil(
                             100.0 * minimumCostToEnterBridge /
-                            terrain.modifier().bridge().integrity().value()))};
-        }
+                            terrain.modifier().bridge().integrity().value())));
         if (IsFrozen(terrain.modifier())) return costToEnterIce;
 
         auto terrainCost = GetCostToEnterTerrainType(terrain.type());
@@ -208,11 +208,11 @@ struct BattalionType {
     [[nodiscard]] auto GetCostToEnterTerrain(
             const net::eagle0::shardok::storage::fb::Terrain_::Type terrainType,
             const net::eagle0::shardok::storage::fb::TileModifier &tm) const -> ActionCost {
-        if (tm.bridge().present()) {
-            return {ActionCost::standard,
+        if (tm.bridge().present())
+            return ActionCost(
+                    ActionCost::standard,
                     ActionPoints(
-                            std::ceil(100.0 * minimumCostToEnterBridge / tm.bridge().integrity()))};
-        }
+                            std::ceil(100.0 * minimumCostToEnterBridge / tm.bridge().integrity())));
         if (tm.ice().present()) return costToEnterIce;
 
         auto terrainCost = GetCostToEnterTerrainType(terrainType);

src/main/cpp/net/eagle0/shardok/library/CombatDamage.hpp

@@ -44,7 +44,7 @@ inline constexpr DamageType DamageType_aessence = DamageType::DamageType_aessenc
 inline constexpr DamageType DamageType_impact = DamageType::DamageType_impact;
 inline constexpr int NUM_DAMAGE_TYPES = static_cast<int>(DamageType::NUM_DAMAGE_TYPES);
 
-[[nodiscard]] static inline bool DamageTypeGetsTerrainDefense(const DamageType type) {
+static inline bool DamageTypeGetsTerrainDefense(const DamageType type) {
     switch (type) {
         case DamageType_slashing:
         case DamageType_puncturing:
@@ -132,13 +132,11 @@ public:
         return damageByType.at(PenetratingIndex(type));
     };
 
-    [[nodiscard]] bool operator==(const CombatDamage& cmpr) const {
-        return damageByType == cmpr.damageByType;
-    }
+    bool operator==(const CombatDamage& cmpr) const { return damageByType == cmpr.damageByType; }
 
-    [[nodiscard]] bool operator!=(const CombatDamage& cmpr) const { return !(*this == cmpr); }
+    bool operator!=(const CombatDamage& cmpr) const { return !(*this == cmpr); }
 
-    [[nodiscard]] bool operator<=(const CombatDamage& cmpr) const {
+    bool operator<=(const CombatDamage& cmpr) const {
         return std::ranges::equal(
                 damageByType,
                 cmpr.damageByType,
@@ -147,7 +145,7 @@ public:
                 });
     }
 
-    [[nodiscard]] bool operator>=(const CombatDamage& cmpr) const {
+    bool operator>=(const CombatDamage& cmpr) const {
         return std::ranges::equal(
                 damageByType,
                 cmpr.damageByType,
@@ -156,15 +154,11 @@ public:
                 });
     }
 
-    [[nodiscard]] bool operator>(const CombatDamage& cmpr) const {
-        return ((*this >= cmpr) && !(*this == cmpr));
-    }
+    bool operator>(const CombatDamage& cmpr) const { return ((*this >= cmpr) && !(*this == cmpr)); }
 
-    [[nodiscard]] bool operator<(const CombatDamage& cmpr) const {
-        return ((*this <= cmpr) && !(*this == cmpr));
-    }
+    bool operator<(const CombatDamage& cmpr) const { return ((*this <= cmpr) && !(*this == cmpr)); }
 
-    [[nodiscard]] CombatDamage operator+(const CombatDamage& add) const {
+    CombatDamage operator+(const CombatDamage& add) const {
         return Builder()
                 .SetSlashing(
                         GetNormalDamageOfType(DamageType_slashing) +
@@ -225,7 +219,7 @@ public:
                 .Build();
     }
 
-    [[nodiscard]] CombatDamage operator*(const double factor) const {
+    CombatDamage operator*(const double factor) const {
         return Builder()
                 .SetSlashing(GetNormalDamageOfType(DamageType_slashing) * factor)
                 .SetPuncturing(GetNormalDamageOfType(DamageType_puncturing) * factor)
@@ -457,9 +451,7 @@ public:
     }
 };
 
-[[nodiscard]] inline CombatDamage operator*(const double factor, const CombatDamage& dmg) {
-    return dmg * factor;
-}
+inline CombatDamage operator*(const double factor, const CombatDamage& dmg) { return dmg * factor; }
 }  // namespace shardok
 
 #endif  // EAGLE0_SHARDOK_LIBRARY_COMBAT_DAMAGE_HPP

src/main/cpp/net/eagle0/shardok/library/FireUtils.hpp

@@ -21,23 +21,19 @@ using WeatherFb = net::eagle0::shardok::storage::fb::Weather;
 using TerrainProto = net::eagle0::shardok::common::Terrain;
 using Terrain = net::eagle0::shardok::storage::fb::Terrain;
 
-[[nodiscard]] auto PropensityByTerrain(const Terrain *terrain, const SettingsGetter &settings)
-        -> int;
+auto PropensityByTerrain(const Terrain *terrain, const SettingsGetter &settings) -> int;
 
-[[nodiscard]] auto PropensityByTerrain(const TerrainProto &terrain, const SettingsGetter &settings)
-        -> int;
+auto PropensityByTerrain(const TerrainProto &terrain, const SettingsGetter &settings) -> int;
 
-[[nodiscard]] auto PropensityByTerrain(
+auto PropensityByTerrain(
         const TerrainType &terrainType,
         const TileModifierProto &modifier,
         const SettingsGetter &settings) -> int;
 
-[[nodiscard]] auto GetFireDamage(
-        int troops,
-        double openEndedPercentileRoll1,
-        double openEndedPercentileRoll2) -> CombatDamage;
+auto GetFireDamage(int troops, double openEndedPercentileRoll1, double openEndedPercentileRoll2)
+        -> CombatDamage;
 
-[[nodiscard]] auto GetExtinguishOdds(
+auto GetExtinguishOdds(
         const SettingsGetter &settings,
         const Terrain *terrain,
         const WeatherFb *currentWeather,
@@ -45,7 +41,7 @@ using Terrain = net::eagle0::shardok::storage::fb::Terrain;
         double intelligence,
         bool ownTile) -> PercentileRollOdds;
 
-[[nodiscard]] auto GetStartFireOdds(
+auto GetStartFireOdds(
         const SettingsGetter &settings,
         const Terrain &terrain,
         const WeatherFb &currentWeather,

src/main/cpp/net/eagle0/shardok/library/GameStateW.hpp

@@ -36,19 +36,25 @@ public:
     using BaseType::BaseType;
 
     // Default constructor
-    GameStateW() = default;
+    GameStateW() : BaseType() {}
 
     // Copy constructor
-    GameStateW(const GameStateW& other) = default;
+    GameStateW(const GameStateW& other) : BaseType(other) {}
 
     // Move constructor
-    GameStateW(GameStateW&& other) noexcept = default;
+    GameStateW(GameStateW&& other) noexcept : BaseType(std::move(other)) {}
 
     // Copy assignment
-    GameStateW& operator=(const GameStateW& other) = default;
+    GameStateW& operator=(const GameStateW& other) {
+        BaseType::operator=(other);
+        return *this;
+    }
 
     // Move assignment
-    GameStateW& operator=(GameStateW&& other) noexcept = default;
+    GameStateW& operator=(GameStateW&& other) noexcept {
+        BaseType::operator=(std::move(other));
+        return *this;
+    }
 
     // Constructor from base type
     GameStateW(const BaseType& base) : BaseType(base) {}

src/main/cpp/net/eagle0/shardok/library/ShardokAction.hpp

@@ -42,7 +42,7 @@ private:
     [[nodiscard]] virtual auto InternalExecute(
             const GameStateW& currentState,
             const std::shared_ptr<RandomGenerator>& generator) const -> std::vector<ActionResult> {
-        return InternalExecuteWithRoll(currentState, generator, std::nullopt);
+        return InternalExecuteWithRoll(currentState, generator, std::optional<int32_t>());
     }
 
     [[nodiscard]] virtual auto InternalExecuteWithRoll(

src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistances.hpp

@@ -43,7 +43,7 @@ protected:
             const std::shared_ptr<BraveableTileInfo> &braveWaterPossibleCoords,
             const std::vector<Coords> &indexToCoords,
             const std::vector<std::array<int, 6>> &adjacencyTable);
-    [[nodiscard]] static auto GenerateDistances(
+    static auto GenerateDistances(
             int fromIndex,
             const HexMap *hexMap,
             bool includeBravingWater,
@@ -51,15 +51,13 @@ protected:
             const BattalionTypeSPtr &battalionType,
             const std::shared_ptr<BraveableTileInfo> &braveWaterPossibleCoords)
             -> std::vector<DIST_T>;
-    [[nodiscard]] auto BraveWaterPossibleCoords(const HexMap *hexMap) const
-            -> std::shared_ptr<BraveableTileInfo>;
+    auto BraveWaterPossibleCoords(const HexMap *hexMap) const -> std::shared_ptr<BraveableTileInfo>;
 
     // Create coordinate lookup table for efficient index->coords conversion
-    [[nodiscard]] static auto CreateIndexToCoords(const HexMap *hexMap) -> std::vector<Coords>;
+    static auto CreateIndexToCoords(const HexMap *hexMap) -> std::vector<Coords>;
 
     // Create adjacency lookup table for efficient neighbor access
-    [[nodiscard]] static auto CreateAdjacencyTable(const HexMap *hexMap)
-            -> std::vector<std::array<int, 6>>;
+    static auto CreateAdjacencyTable(const HexMap *hexMap) -> std::vector<std::array<int, 6>>;
 
     [[nodiscard]] auto ToIndex(const Coords &coords) const -> int {
         return coords.row() * column_count + coords.column();
@@ -72,9 +70,9 @@ public:
 
     virtual ~ActionPointDistances() = default;
 
-    [[nodiscard]] virtual auto Distance(int fromIndex, int toIndex) const -> DIST_T = 0;
+    virtual auto Distance(int fromIndex, int toIndex) const -> DIST_T = 0;
 
-    [[nodiscard]] virtual auto Distance(const Coords &from, const Coords &to) const -> DIST_T = 0;
+    virtual auto Distance(const Coords &from, const Coords &to) const -> DIST_T = 0;
 };
 
 class OnDemandActionPointDistances final : public ActionPointDistances {
@@ -93,11 +91,11 @@ public:
 
     ~OnDemandActionPointDistances() override = default;
 
-    [[nodiscard]] auto Distance(const int fromIndex, const int toIndex) const -> int16_t override {
+    auto Distance(const int fromIndex, const int toIndex) const -> int16_t override {
         return distances[fromIndex].get()[toIndex];
     }
 
-    [[nodiscard]] auto Distance(const Coords &from, const Coords &to) const -> int16_t override {
+    auto Distance(const Coords &from, const Coords &to) const -> int16_t override {
         return Distance(ToIndex(from), ToIndex(to));
     }
 };

src/main/cpp/net/eagle0/shardok/library/action_point_distances/ActionPointDistancesCache.hpp

@@ -22,7 +22,7 @@ struct MapId {
     uint64_t terrainTypesId;
     uint64_t modifierId;
 
-    [[nodiscard]] auto operator==(const MapId& other) const -> bool {
+    auto operator==(const MapId& other) const -> bool {
         return terrainTypesId == other.terrainTypesId && modifierId == other.modifierId;
     }
 };
@@ -34,7 +34,7 @@ struct FullCacheKey {
     bool includeBravingWater;
     int braveWaterCost;
 
-    [[nodiscard]] bool operator==(const FullCacheKey& other) const {
+    bool operator==(const FullCacheKey& other) const {
         return mapId == other.mapId && battalionTypeId == other.battalionTypeId &&
                includeBravingWater == other.includeBravingWater &&
                braveWaterCost == other.braveWaterCost;
@@ -43,7 +43,7 @@ struct FullCacheKey {
 
 // Hash function for FullCacheKey
 struct FullCacheKeyHash {
-    [[nodiscard]] size_t operator()(const FullCacheKey& key) const {
+    size_t operator()(const FullCacheKey& key) const {
         // Pack small fields into a single 64-bit value
         uint64_t packed = (static_cast<uint64_t>(key.battalionTypeId) << 32) |
                           (static_cast<uint64_t>(key.braveWaterCost) << 1) |
@@ -85,7 +85,7 @@ private:
     // Epoch system removed - TLS cache uses size-based eviction instead
 
     // Helper to build cache key
-    [[nodiscard]] static auto MakeCacheKey(
+    static auto MakeCacheKey(
             const MapId& mapId,
             const BattalionTypeSPtr& battalionType,
             bool includeBravingWater,
@@ -107,7 +107,7 @@ public:
             bool includeBravingWater,
             int braveWaterActionPointCost = -1) -> const ActionPointDistances*;
 
-    [[nodiscard]] static auto GetMapId(const HexMap* map) -> MapId;
+    static auto GetMapId(const HexMap* map) -> MapId;
 
     // Consolidate the thread-safe cache into the persistent cache and clear
     // the current thread's local cache. This is only safe if we know reads
@@ -116,7 +116,7 @@ public:
 
     // Cache management methods
     static void ClearThreadLocalCache();
-    [[nodiscard]] static size_t GetThreadLocalCacheSize();
+    static size_t GetThreadLocalCacheSize();
 };
 
 using APDCache = std::shared_ptr<ActionPointDistancesCache>;

src/main/cpp/net/eagle0/shardok/library/action_point_distances/FixedActionPointDistances.hpp

@@ -24,7 +24,7 @@ private:
 
 public:
     // Factory method to create FixedActionPointDistances
-    [[nodiscard]] static auto Create(
+    static auto Create(
             const HexMap *map,
             const BattalionTypeSPtr &battalionType,
             bool includeBravingWater,

src/main/cpp/net/eagle0/shardok/library/action_result_applier/ActionResultApplier.hpp

@@ -23,11 +23,11 @@ void MutatingApplyResult(
         GameStateW& mutatingGameState,
         const ActionResultProto& actionResult,
         const SettingsGetter& settings);
-[[nodiscard]] auto ApplyResult(
+auto ApplyResult(
         GameStateW startingState,
         const ActionResultProto& actionResult,
         const SettingsGetter& settings) -> GameStateW;
-[[nodiscard]] auto ApplyResults(
+auto ApplyResults(
         const GameStateW& startingState,
         const std::vector<ActionResultProto>& actionResults,
         const SettingsGetter& settings) -> GameStateW;

src/main/cpp/net/eagle0/shardok/library/action_result_applier/GameStateCopier.hpp

@@ -9,8 +9,7 @@
 
 namespace shardok {
 
-[[nodiscard]] auto CopyWithExtraUnits(const GameStateW& original, int additionalCount)
-        -> GameStateW;
+auto CopyWithExtraUnits(const GameStateW& original, int additionalCount) -> GameStateW;
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/library/actions/NewRoundAction.cpp

@@ -90,7 +90,7 @@ auto BurnStructuresResult(const GameStateW &gameState, const SettingsGetter &set
         *result.mutable_changed_tile_modifiers() = {burnedTmcs.begin(), burnedTmcs.end()};
         return result;
     } else {
-        return std::nullopt;
+        return std::optional<ActionResultProto>();
     }
 }
 

src/main/cpp/net/eagle0/shardok/library/actions/UpdateGameStatusAction.cpp

@@ -25,9 +25,10 @@ static inline auto GameIsOver(const GameStatusFb* status) -> bool {
 }
 
 auto UpdateGameStatusAction::GetPlayerInfo(int playerId) const -> const PlayerInfoFb* {
-    return *std::ranges::find_if(*gameState->player_infos(), [playerId](const PlayerInfoFb* pi) {
-        return pi->player_id() == playerId;
-    });
+    return *std::find_if(
+            std::begin(*gameState->player_infos()),
+            std::end(*gameState->player_infos()),
+            [playerId](const PlayerInfoFb* pi) { return pi->player_id() == playerId; });
 }
 
 static inline auto HasVictoryCondition(const PlayerInfoFb* pi, const VictoryCondition condition)

src/main/cpp/net/eagle0/shardok/library/command_factories/BraveWaterCommandFactory.cpp

@@ -126,7 +126,7 @@ void BraveWaterCommandFactory::AddAvailableBraveWaterCommands(
             }
 
             for (const auto &target : braveWaterTargets) {
-                std::optional<UnitId> ambusher = std::nullopt;
+                std::optional<UnitId> ambusher = std::optional<UnitId>();
                 const auto &targetOccupant = Occupant(units, target);
                 if (targetOccupant) { ambusher = targetOccupant->unit_id(); }
                 commands.push_back(BraveWaterCommandFactory(settings)

src/main/cpp/net/eagle0/shardok/library/command_factories/CommandFactoriesList.hpp

@@ -19,7 +19,7 @@ private:
 public:
     explicit CommandFactoriesList(const SettingsGetter& settings);
 
-    [[nodiscard]] auto GetFactories() const -> std::vector<std::shared_ptr<const CommandFactory>>;
+    auto GetFactories() const -> std::vector<std::shared_ptr<const CommandFactory>>;
 };
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/library/command_factories/CommandFactory.hpp

@@ -41,7 +41,7 @@ public:
 
     virtual void AddAvailableCommands(CommandList& commands, const CommandParams& params) const = 0;
 
-    [[nodiscard]] virtual auto IncludeInFollowUps() const -> bool { return true; }
+    virtual auto IncludeInFollowUps() const -> bool { return true; }
 };
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/library/commands/ArcheryCommand.hpp

@@ -46,13 +46,13 @@ public:
 
     ~ArcheryCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::ARCHERY_COMMAND;
     }
 
     auto CanUseClientRoll() const -> bool override { return true; }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] int GetActorUnitId() const override { return attackerId; }
     [[nodiscard]] MapIndex GetTargetRow() const override { return defenderLocation.row(); }

src/main/cpp/net/eagle0/shardok/library/commands/ControlCommand.hpp

@@ -32,11 +32,11 @@ public:
 
     ~ControlCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::CONTROL_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return false; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWhileStunned() const -> bool override { return false; }

src/main/cpp/net/eagle0/shardok/library/commands/DismissUnitCommand.hpp

@@ -41,11 +41,11 @@ public:
     [[nodiscard]] auto ExecuteWithRoll(const GameStateW& currentState, double roll) const
             -> vector<ActionResult>;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::DISMISS_UNIT_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return false; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWhileStunned() const -> bool override { return false; }

src/main/cpp/net/eagle0/shardok/library/commands/FortifyCommand.hpp

@@ -31,11 +31,11 @@ public:
             int agilityXp,
             int professionKnowledgeBump);
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::FORTIFY_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] int GetActorUnitId() const override { return fortifyingUnitId; }
 };

src/main/cpp/net/eagle0/shardok/library/commands/HideCommand.hpp

@@ -37,7 +37,7 @@ public:
         return net::eagle0::shardok::common::HIDE_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] int GetActorUnitId() const override { return actorId; }
     [[nodiscard]] MapIndex GetTargetRow() const override { return target.row(); }

src/main/cpp/net/eagle0/shardok/library/commands/MeleeCommand.hpp

@@ -51,11 +51,11 @@ public:
 
     ~MeleeCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::MELEE_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     auto CanUseClientRoll() const -> bool override { return true; }
 

src/main/cpp/net/eagle0/shardok/library/commands/MeteorCancelCommand.hpp

@@ -33,11 +33,11 @@ public:
 
     ~MeteorCancelCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::METEOR_CANCEL_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
     [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return requiredToEndTurn; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWithLowVigor() const -> bool override { return true; }

src/main/cpp/net/eagle0/shardok/library/commands/MeteorStartCommand.hpp

@@ -33,11 +33,11 @@ public:
             const CoordsSet& nextRoundTargets);
     ~MeteorStartCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::METEOR_START_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] int GetActorUnitId() const override { return casterId; }
 };

src/main/cpp/net/eagle0/shardok/library/commands/MeteorTargetCommand.hpp

@@ -38,11 +38,11 @@ public:
 
     ~MeteorTargetCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::METEOR_TARGET_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
     [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return requiredToEndTurn; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWithLowVigor() const -> bool override { return true; }

src/main/cpp/net/eagle0/shardok/library/commands/MoveCommand.cpp

@@ -135,8 +135,9 @@ auto shardok::MoveCommand::InternalExecute(
                         KnownAdjacentEnemies(player, allUnits, map, allyPids, destination);
 
                 for (const Unit* possibleChargee : newAdjacentEnemies) {
-                    if (std::ranges::find_if(
-                                knownAdjacentEnemies,
+                    if (std::find_if(
+                                knownAdjacentEnemies.begin(),
+                                knownAdjacentEnemies.end(),
                                 [possibleChargee](const Unit* adj) {
                                     return adj->unit_id() == possibleChargee->unit_id();
                                 }) == knownAdjacentEnemies.end()) {

src/main/cpp/net/eagle0/shardok/library/commands/ReinforceCommand.hpp

@@ -46,11 +46,11 @@ public:
 
     ~ReinforceCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::REINFORCE_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return false; }
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return true; }

src/main/cpp/net/eagle0/shardok/library/commands/ReleaseUnitCommand.hpp

@@ -34,7 +34,7 @@ public:
         return net::eagle0::shardok::common::RELEASE_UNIT_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return false; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWhileStunned() const -> bool override { return false; }

src/main/cpp/net/eagle0/shardok/library/commands/RepairCommand.hpp

@@ -57,7 +57,7 @@ public:
         return net::eagle0::shardok::common::REPAIR_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] auto IsRequiredToEndTurn() const -> bool override { return false; }
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return true; }

src/main/cpp/net/eagle0/shardok/library/commands/ScoutCommand.hpp

@@ -55,11 +55,11 @@ public:
     [[nodiscard]] auto ExecuteWithRoll(const GameStateW& currentState, double roll) const
             -> vector<ActionResult>;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::SCOUT_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return false; }

src/main/cpp/net/eagle0/shardok/library/commands/StartFireCommand.hpp

@@ -43,11 +43,11 @@ public:
 
     ~StartFireCommand() override = default;
 
-    [[nodiscard]] auto GetCommandType() const -> CommandType override {
+    auto GetCommandType() const -> CommandType override {
         return net::eagle0::shardok::common::START_FIRE_COMMAND;
     }
 
-    [[nodiscard]] auto GetCommandProto() const -> CommandProto override;
+    auto GetCommandProto() const -> CommandProto override;
 
     [[nodiscard]] auto CanBeFollowUp() const -> bool override { return true; }
     [[nodiscard]] auto CanDoWithLowMorale() const -> bool override { return false; }

src/main/cpp/net/eagle0/shardok/library/fb_helpers/FlatbufferWrapper.hpp

@@ -141,7 +141,7 @@ public:
             return Wrapper();  // Return empty wrapper for invalid data
         }
 
-        size_t offset = 0;
+        size_t offset;
         std::memcpy(&offset, str.data(), sizeof(size_t));
 
         size_t size = str.size() - sizeof(size_t);
@@ -159,7 +159,7 @@ public:
             return Wrapper();  // Return empty wrapper for invalid data
         }
 
-        size_t offset = 0;
+        size_t offset;
         std::memcpy(&offset, bv.data(), sizeof(size_t));
 
         size_t size = bv.size() - sizeof(size_t);

src/main/cpp/net/eagle0/shardok/library/fb_helpers/GameStateHelpers.hpp

@@ -28,7 +28,7 @@ using net::eagle0::shardok::storage::fb::Unit;
 using Weather = net::eagle0::shardok::storage::fb::Weather;
 using GameStatusProto = net::eagle0::shardok::common::GameStatus;
 
-[[nodiscard]] auto SetupInitialGameState(
+auto SetupInitialGameState(
         const GameId& gameId,
         const HexMapProto& hexMapProto,
         const std::vector<PlayerInfoProto>& playerInfoProtos,
@@ -37,14 +37,14 @@ using GameStatusProto = net::eagle0::shardok::common::GameStatus;
         bool isWinter,
         const SettingsGetter& settings) -> GameStateW;
 
-[[nodiscard]] auto FromPlayerInfoProto(
+auto FromPlayerInfoProto(
         flatbuffers::FlatBufferBuilder& fbb,
         const PlayerInfoProto& playerInfoProto)
         -> flatbuffers::Offset<net::eagle0::shardok::storage::fb::PlayerInfo>;
 
-[[nodiscard]] auto ToPlayerInfoProto(const PlayerInfo* fbPI) -> PlayerInfoProto;
-[[nodiscard]] auto ToWeatherProto(const Weather* fbW) -> net::eagle0::shardok::common::Weather;
-[[nodiscard]] auto ToProto(const GameStatus* fbStatus) -> GameStatusProto;
+auto ToPlayerInfoProto(const PlayerInfo* fbPI) -> PlayerInfoProto;
+auto ToWeatherProto(const Weather* fbW) -> net::eagle0::shardok::common::Weather;
+auto ToProto(const GameStatus* fbStatus) -> GameStatusProto;
 
 }  // namespace shardok::fb
 

src/main/cpp/net/eagle0/shardok/library/fb_helpers/HexMapHelpers.hpp

@@ -22,15 +22,15 @@ using HexMap = net::eagle0::shardok::storage::fb::HexMap;
 using HexMapW = Wrapper<HexMap>;
 using HexMapProto = net::eagle0::shardok::common::HexMap;
 
-[[nodiscard]] auto ConvertHexMapProto(
+auto ConvertHexMapProto(
         FlatBufferBuilder& fbb,
         const net::eagle0::shardok::common::HexMap& mapProto,
         bool isWinter = false,
         float initialWinterIceIntegrity = 0.0f) -> Offset<HexMap>;
 
-[[nodiscard]] auto ToProto(const HexMap* hexMap) -> HexMapProto;
+auto ToProto(const HexMap* hexMap) -> HexMapProto;
 
-[[nodiscard]] auto CopyHexMap(const HexMap* hexMap) -> HexMapW;
+auto CopyHexMap(const HexMap* hexMap) -> HexMapW;
 
 }  // namespace shardok::fb
 

src/main/cpp/net/eagle0/shardok/library/fb_helpers/TerrainHelpers.hpp

@@ -16,7 +16,7 @@ namespace shardok::fb {
 using Terrain = net::eagle0::shardok::storage::fb::Terrain;
 using TerrainProto = net::eagle0::shardok::common::Terrain;
 
-[[nodiscard]] auto ToTerrainProto(const Terrain* terrain) -> TerrainProto;
+auto ToTerrainProto(const Terrain* terrain) -> TerrainProto;
 
 }  // namespace shardok::fb
 

src/main/cpp/net/eagle0/shardok/library/fb_helpers/TileModifierHelpers.hpp

@@ -16,7 +16,7 @@ namespace shardok::fb {
 using TileModifier = net::eagle0::shardok::storage::fb::TileModifier;
 using TileModifierProto = net::eagle0::shardok::common::TileModifier;
 
-[[nodiscard]] auto ToTileModifierProto(const TileModifier& tileModifier) -> TileModifierProto;
+auto ToTileModifierProto(const TileModifier& tileModifier) -> TileModifierProto;
 
 }  // namespace shardok::fb
 

src/main/cpp/net/eagle0/shardok/library/map/Coordinates.hpp

@@ -23,12 +23,10 @@ namespace shardok {
 using Coords = net::eagle0::shardok::storage::fb::Coords;
 using CoordsProto = net::eagle0::shardok::common::Coords;
 
-[[nodiscard]] auto MakeCoordsProto(int row, int column) -> net::eagle0::shardok::common::Coords;
+auto MakeCoordsProto(int row, int column) -> net::eagle0::shardok::common::Coords;
 
-[[nodiscard]] static inline auto IsUnplaced(const Coords &c) -> bool {
-    return c.row() < 0 || c.column() < 0;
-}
-[[nodiscard]] static inline auto IsUnplaced(const CoordsProto &c) -> bool {
+static inline auto IsUnplaced(const Coords &c) -> bool { return c.row() < 0 || c.column() < 0; }
+static inline auto IsUnplaced(const CoordsProto &c) -> bool {
     return c.row() < 0 || c.column() < 0;
 }
 
@@ -43,15 +41,14 @@ using CoordsProto = net::eagle0::shardok::common::Coords;
 }  // namespace shardok
 
 namespace net::eagle0::shardok::storage::fb {
-[[nodiscard]] auto operator==(const Coords &lhs, const net::eagle0::shardok::common::Coords &rhs)
-        -> bool;
+auto operator==(const Coords &lhs, const net::eagle0::shardok::common::Coords &rhs) -> bool;
 }
 
 namespace net::eagle0::shardok::common {
-[[nodiscard]] auto operator==(
+auto operator==(
         const net::eagle0::shardok::common::Coords &lhs,
         const net::eagle0::shardok::common::Coords &rhs) -> bool;
-[[nodiscard]] auto operator==(
+auto operator==(
         const net::eagle0::shardok::common::Coords &lhs,
         const net::eagle0::shardok::storage::fb::Coords &rhs) -> bool;
 }  // namespace net::eagle0::shardok::common
@@ -59,7 +56,7 @@ namespace net::eagle0::shardok::common {
 namespace std {
 template<>
 struct hash<net::eagle0::shardok::common::Coords> {
-    [[nodiscard]] auto operator()(const net::eagle0::shardok::common::Coords &c) const -> size_t {
+    auto operator()(const net::eagle0::shardok::common::Coords &c) const -> size_t {
         return size_t(c.row() << 16 | c.column());
     }
 };

src/main/cpp/net/eagle0/shardok/library/map/CoordsSet.hpp

@@ -19,7 +19,7 @@ namespace shardok {
 
 constexpr bool kCoordsSetIndexChecks = false;
 
-constexpr size_t STANDARD_SIZE = size_t{12} * 14;
+constexpr size_t STANDARD_SIZE = 12 * 14;
 
 using HexMap = net::eagle0::shardok::storage::fb::HexMap;
 using BackingBitset = common::IterableBitset<168>;
@@ -34,7 +34,7 @@ private:
     uint32_t indexCount;
 
     [[nodiscard]] auto Index(const int row, const int column) const -> int {
-        return (row * mapWidth) + column;
+        return row * mapWidth + column;
     }
 
     [[nodiscard]] auto Index(const Coords& c) const -> int { return Index(c.row(), c.column()); }

src/main/cpp/net/eagle0/shardok/library/map/HexMapDirection.hpp

@@ -41,11 +41,11 @@ inline HexMapDirection& operator++(HexMapDirection& dir) {
 }
 
 struct HexMapDirectionsTo {
-    HexMapDirection main{};
-    HexMapDirection secondary{};  // Only valid if exactly on the line
-    bool usesSecondary{};
+    HexMapDirection main;
+    HexMapDirection secondary;  // Only valid if exactly on the line
+    bool usesSecondary;
 
-    bool Matches(const HexMapDirection dir) const {
+    bool Matches(const HexMapDirection dir) {
         return dir == main || (usesSecondary && dir == secondary);
     }
 };

src/main/cpp/net/eagle0/shardok/library/map/HexMapHasher.hpp

@@ -13,13 +13,13 @@
 namespace shardok {
 using HexMap = net::eagle0::shardok::storage::fb::HexMap;
 
-[[nodiscard]] auto GetModifierHash(const HexMap* map) -> uint64_t;
+auto GetModifierHash(const HexMap* map) -> uint64_t;
 
 // Helper function to compute modifier byte for consistent hashing
 // Excludes ice from hash since AI pathfinding should ignore ice
 // Compact bit layout: bridge=bit0, fire=bit1, snow=bit2
 template<typename TileModifier>
-[[nodiscard]] auto ComputeModifierByte(const TileModifier& modifier) -> int8_t {
+auto ComputeModifierByte(const TileModifier& modifier) -> int8_t {
     return static_cast<int8_t>(
             modifier.bridge().present() | modifier.fire().present() << 1 |
             modifier.snow().present() << 2);
@@ -27,7 +27,7 @@ template<typename TileModifier>
 
 // Overload for protobuf modifier
 template<typename ProtoModifier>
-[[nodiscard]] auto ComputeModifierByteProto(const ProtoModifier& modifier) -> int8_t {
+auto ComputeModifierByteProto(const ProtoModifier& modifier) -> int8_t {
     return static_cast<int8_t>(
             modifier.has_bridge() | modifier.has_fire() << 1 | modifier.has_snow() << 2);
 }

src/main/cpp/net/eagle0/shardok/library/map/Terrain.hpp

@@ -34,25 +34,23 @@ using TerrainType::Terrain_Type_UNKNOWN;
 
 constexpr int kTerrainTypeCount = net::eagle0::shardok::common::Terrain_Type_Type_ARRAYSIZE;
 
-[[nodiscard]] auto AllowsHiding(const Terrain* terrain) -> bool;
-[[nodiscard]] auto AllowsHiding(net::eagle0::shardok::storage::fb::Terrain_::Type type) -> bool;
-[[nodiscard]] auto AllowsHiding(const net::eagle0::shardok::storage::fb::TileModifier& modifier)
-        -> bool;
+auto AllowsHiding(const Terrain* terrain) -> bool;
+auto AllowsHiding(net::eagle0::shardok::storage::fb::Terrain_::Type type) -> bool;
+auto AllowsHiding(const net::eagle0::shardok::storage::fb::TileModifier& modifier) -> bool;
 
-[[nodiscard]] auto AllowsHiding(const TerrainProto& terrain) -> bool;
-[[nodiscard]] auto AllowsHiding(TerrainType type) -> bool;
-[[nodiscard]] auto AllowsHiding(const TileModifierProto& modifier) -> bool;
+auto AllowsHiding(const TerrainProto& terrain) -> bool;
+auto AllowsHiding(TerrainType type) -> bool;
+auto AllowsHiding(const TileModifierProto& modifier) -> bool;
 
-[[nodiscard]] auto AllowsFortification(const Terrain* terrain) -> bool;
+auto AllowsFortification(const Terrain* terrain) -> bool;
 
-[[nodiscard]] auto IsWater(net::eagle0::shardok::storage::fb::Terrain_::Type type) -> bool;
-[[nodiscard]] auto IsWater(TerrainType type) -> bool;
+auto IsWater(net::eagle0::shardok::storage::fb::Terrain_::Type type) -> bool;
+auto IsWater(TerrainType type) -> bool;
 
-[[nodiscard]] auto IsTraversible(const net::eagle0::shardok::storage::fb::Terrain& terrain) -> bool;
+auto IsTraversible(const net::eagle0::shardok::storage::fb::Terrain& terrain) -> bool;
 
-[[nodiscard]] auto MakeHexMapTerrain(TerrainType tp, TileModifierProto mod = TileModifierProto())
-        -> TerrainProto;
-[[nodiscard]] auto MakeHexMapTerrain(
+auto MakeHexMapTerrain(TerrainType tp, TileModifierProto mod = TileModifierProto()) -> TerrainProto;
+auto MakeHexMapTerrain(
         net::eagle0::shardok::storage::fb::Terrain_::Type tp,
         const net::eagle0::shardok::storage::fb::TileModifier& mod =
                 net::eagle0::shardok::storage::fb::TileModifier()) -> Terrain;

src/main/cpp/net/eagle0/shardok/library/map/TileModifier.hpp

@@ -23,7 +23,7 @@ namespace shardok {
 using SingleModifier = net::eagle0::shardok::common::TileModifier_SingleModifier;
 using TileModifierProto = net::eagle0::shardok::common::TileModifier;
 
-SingleModifier MakeSingleModifier(const std::optional<double>& integ = std::nullopt);
+SingleModifier MakeSingleModifier(const std::optional<double>& integ = std::optional<double>());
 
 bool operator==(const SingleModifier& lhs, const SingleModifier& rhs);
 

src/main/cpp/net/eagle0/shardok/library/settings/GameSettings.hpp

@@ -76,7 +76,7 @@ public:
             return settings.backingStruct;
         }
 
-        [[nodiscard]] auto GetRandomGenerator() const -> std::shared_ptr<RandomGenerator> {
+        [[nodiscard]] auto GetRandomGenerator() const -> const std::shared_ptr<RandomGenerator> {
             return settings.randomGenerator;
         }
 

src/main/cpp/net/eagle0/shardok/library/unit/Unit.hpp

@@ -22,12 +22,12 @@ namespace shardok {
 using Unit = net::eagle0::shardok::storage::fb::Unit;
 using Units = flatbuffers::Vector<const Unit *>;
 
-[[nodiscard]] auto IsDestroyed(const Unit &unit) -> bool;
+auto IsDestroyed(const Unit &unit) -> bool;
 
-[[nodiscard]] auto MaxActionPoints(const Unit &unit) -> ActionPoints;
+auto MaxActionPoints(const Unit &unit) -> ActionPoints;
 
-[[nodiscard]] auto OpponentKnowledge(const Unit &unit, PlayerId toPlayer) -> int;
-[[nodiscard]] auto OpponentKnowledge(const Unit *unit, PlayerId toPlayer) -> int;
+auto OpponentKnowledge(const Unit &unit, PlayerId toPlayer) -> int;
+auto OpponentKnowledge(const Unit *unit, PlayerId toPlayer) -> int;
 
 // Returns the casualty count.
 auto MutatingApplyDamageFrom(
@@ -50,7 +50,7 @@ auto MutatingApplyEnvironmentalDamage(
         double baseDeadliness,
         const BattalionTypeSPtr &type) -> int32_t;
 
-[[nodiscard]] auto WithTakenDamageFb(
+auto WithTakenDamageFb(
         const Unit *victim,
         const CombatDamage &amount,
         const Terrain &terrain,
@@ -71,10 +71,8 @@ void MutatingBumpCharismaXp(Unit *unit, int newXp);
 void MutatingBumpOpponentKnowledge(Unit *unit, PlayerId pid, int bump);
 void MutatingBumpAllKnowledgeToMinimum(Unit *unit, int bump);
 
-[[nodiscard]] auto ReserveUnitsForPlayer(const Units *units, PlayerId pid)
-        -> std::map<UnitId, const Unit *>;
-[[nodiscard]] auto PlacedUnitsForPlayer(const Units *units, PlayerId pid)
-        -> std::map<UnitId, const Unit *>;
+auto ReserveUnitsForPlayer(const Units *units, PlayerId pid) -> std::map<UnitId, const Unit *>;
+auto PlacedUnitsForPlayer(const Units *units, PlayerId pid) -> std::map<UnitId, const Unit *>;
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/library/util/CombatUtils.cpp

@@ -111,8 +111,8 @@ auto CombatUtils::CalculateUnitDamageGiven(
     const bool hasHero = unit->has_attached_hero();
     CombatDamage battalionDamage = CalculateBattalionDamageGiven(
             unit->battalion(),
-            (hasHero ? std::optional<double>{unit->attached_hero().charisma()} : std::nullopt),
-            (hasHero ? std::optional<double>{unit->attached_hero().bravery()} : std::nullopt),
+            (hasHero ? unit->attached_hero().charisma() : std::optional<double>()),
+            (hasHero ? unit->attached_hero().bravery() : std::optional<double>()),
             battalionRoll,
             settings);
 

src/main/cpp/net/eagle0/shardok/library/util/HexCubeUtils.hpp

@@ -20,20 +20,20 @@ struct Cube {
     Cube(const int16_t x, const int16_t y, const int16_t z) : x(x), y(y), z(z) {}
 };
 
-[[nodiscard]] auto OffsetToCube(const Coords &c) -> Cube;
+auto OffsetToCube(const Coords &c) -> Cube;
 
-[[nodiscard]] auto CubeToOffset(const Cube &cube) -> Coords;
+auto CubeToOffset(const Cube &cube) -> Coords;
 
-[[nodiscard]] static inline auto CubeDistance(const Cube &c1, const Cube &c2) -> int {
+static inline auto CubeDistance(const Cube &c1, const Cube &c2) -> int {
     return (abs(c1.x - c2.x) + abs(c1.y - c2.y) + abs(c1.z - c2.z)) / 2;
 }
 
-[[nodiscard]] auto CubesWithinDistance(const Cube &c1, int distance) -> std::vector<Cube>;
-[[nodiscard]] auto CubesWithExactDistance(const Cube &c1, int distance) -> std::vector<Cube>;
+auto CubesWithinDistance(const Cube &c1, int distance) -> std::vector<Cube>;
+auto CubesWithExactDistance(const Cube &c1, int distance) -> std::vector<Cube>;
 
 // Returns all the hexes that are on the line between c1 and c2, including the endpoints.
 // In a case where the line passes exactly between two hexes, includes BOTH hexes.
-[[nodiscard]] auto CubeLineInclusive(const Cube &c1, const Cube &c2) -> std::vector<Cube>;
+auto CubeLineInclusive(const Cube &c1, const Cube &c2) -> std::vector<Cube>;
 
 }  // namespace shardok
 

src/main/cpp/net/eagle0/shardok/library/util/HexMapUtils.hpp

@@ -173,7 +173,7 @@ auto Occupant(const UnitContainer &units, const Coords &coords)
         if (unit.location() == coords) { return unit; }
     }
 
-    return std::nullopt;
+    return std::optional<typename UnitContainer::value_type>();
 }
 
 template<class U>
@@ -182,7 +182,7 @@ auto Occupant(const std::map<UnitId, U> &units, const Coords &coords) -> std::op
         if (unit.location() == coords) { return unit; }
     }
 
-    return std::nullopt;
+    return std::optional<U>();
 }
 
 template<class U>
@@ -192,7 +192,7 @@ auto Occupant(const ::google::protobuf::Map<UnitId, U> &units, const Coords &coo
         if (unit.location() == coords) { return unit; }
     }
 
-    return std::nullopt;
+    return std::optional<U>();
 }
 
 template<class U, class UnitContainer>
@@ -201,7 +201,7 @@ auto Occupant(const UnitContainer &units, const Coords &coords) -> std::optional
         if (unit.location() == coords) { return unit; }
     }
 
-    return std::nullopt;
+    return std::optional<U>();
 }
 
 static inline auto FriendlyOccupant(
@@ -258,7 +258,7 @@ auto KnownEnemyOccupant(
         }
     }
 
-    return std::nullopt;
+    return std::optional<typename UnitContainer::value_type>();
 }
 
 [[nodiscard]] static inline auto KnownOccupant(

src/main/cpp/net/eagle0/shardok/library/util/MeteorRangeCoords.hpp

@@ -10,7 +10,7 @@
 
 namespace shardok {
 
-[[nodiscard]] auto CoordsInMeteorRange(
+auto CoordsInMeteorRange(
         const HexMap *hexMap,
         const Coords &location,
         const SettingsGetter &settings) -> CoordsSet;

src/main/cpp/net/eagle0/shardok/library/util/PlayerUtils.cpp

@@ -7,8 +7,9 @@
 namespace shardok {
 
 auto PlayerIsDefender(const GameState *gameState, int playerId) -> bool {
-    const auto playerInfo = std::ranges::find_if(
-            *gameState->player_infos(),
+    const auto playerInfo = std::find_if(
+            std::begin(*gameState->player_infos()),
+            std::end(*gameState->player_infos()),
             [playerId](const auto *pi) { return pi->player_id() == playerId; });
 
     if (playerInfo == std::end(*gameState->player_infos())) return false;
@@ -31,11 +32,12 @@ auto NextPlayerId(const GameState *gameState, const PlayerId pid, const bool all
 
 auto AlliedPids(const GameState *gameState, int playerId) -> std::vector<PlayerId> {
     if (gameState->player_infos() == nullptr) return {};
-    const auto &pi = std::ranges::find_if(
-            *gameState->player_infos(),
+    const auto &pi = std::find_if(
+            std::begin(*gameState->player_infos()),
+            std::end(*gameState->player_infos()),
             [playerId](const PlayerInfoFb *pi) { return pi->player_id() == playerId; });
 
-    if (pi == std::end(*gameState->player_infos())) { return {}; }
+    if (pi == std::end(*gameState->player_infos())) { return std::vector<PlayerId>{}; }
     std::vector<PlayerId> allyPids{};
 
     if (pi->allies()) {

src/main/cpp/net/eagle0/shardok/library/util/WeatherHelpers.hpp

@@ -13,12 +13,11 @@
 #include "src/main/protobuf/net/eagle0/shardok/common/weather.pb.h"
 #pragma GCC diagnostic pop
 
-[[nodiscard]] auto MakeWind(
-        net::eagle0::shardok::common::HexMapDirection direction,
-        int32_t speedInMph) -> net::eagle0::shardok::common::Weather::Wind;
-[[nodiscard]] auto MakeWeather(
+auto MakeWind(net::eagle0::shardok::common::HexMapDirection direction, int32_t speedInMph)
+        -> net::eagle0::shardok::common::Weather::Wind;
+auto MakeWeather(
         net::eagle0::shardok::common::Weather::Conditions conditions,
         net::eagle0::shardok::common::Weather::Wind wind) -> net::eagle0::shardok::common::Weather;
-[[nodiscard]] auto MonthIsWinter(int month) -> bool;
+auto MonthIsWinter(int month) -> bool;
 
 #endif  // EAGLE0_SHARDOK_LIBRARY_UTIL_WEATHER_HELPERS_HPP

src/main/cpp/net/eagle0/shardok/library/view_filters/ActionResultFilter.cpp

@@ -107,7 +107,7 @@ auto TargetIsHiddenFromOpponents(const ActionResultType type) -> bool {
                 hiddenActor,
                 wasHidden) &&
         !actorIsSelfOrAlly) {
-        return std::nullopt;
+        return std::optional<ActionResultView>();
     }
 
     ActionResultView resultView{};

src/main/cpp/net/eagle0/shardok/library/view_filters/GameStateGuesser.cpp

@@ -258,7 +258,7 @@ auto GameStateGuesser::GuessedState(
     }
 
     for (int i = 0; i < maxId; ++i) {
-        auto entry = std::ranges::find(foundUnits, i);
+        auto entry = std::find(std::begin(foundUnits), std::end(foundUnits), i);
         if (entry == std::end(foundUnits)) {
             net::eagle0::shardok::storage::fb::Unit newUnit;
             newUnit.mutate_unit_id(i);

src/main/cpp/net/eagle0/shardok/library/view_filters/GameStateGuesser.hpp

@@ -25,13 +25,13 @@ struct AverageStats {
     double training;
 };
 
-[[nodiscard]] auto KnownUnitStats(const GameStateView &gameStateView)
+auto KnownUnitStats(const GameStateView &gameStateView)
         -> std::unordered_map<PlayerId, AverageStats>;
 
 // Guess where an enemy mage might be targeting with their meteor.
 // Priority: (1) largest unit of targetPlayerId, (2) any unit of targetPlayerId,
 // (3) any castle not occupied by the caster's player, (4) first valid tile in range.
-[[nodiscard]] auto GuessMeteorTarget(
+auto GuessMeteorTarget(
         const SettingsGetter &settings,
         const HexMapProto &hexMap,
         const Coords &mageLocation,

src/main/cpp/net/eagle0/shardok/library/view_filters/GameStateViewDiffer.cpp

@@ -161,7 +161,7 @@ auto MakeGameStateViewDiff(const GameStateView &before, const GameStateView &aft
         }
     }
 
-    return changed ? std::optional<GameStateViewDiff>{diff} : std::nullopt;
+    return changed ? diff : std::optional<GameStateViewDiff>();
 }
 
 }  // namespace shardok

src/main/cpp/net/eagle0/shardok/server/EagleInterfaceGrpcServer.cpp

@@ -276,7 +276,7 @@ auto EagleInterfaceImpl::PostCommand(
                     request->token(),
                     request->index(),
                     request->has_roll() ? std::optional<int32_t>(request->roll().value())
-                                        : std::nullopt);
+                                        : std::optional<int32_t>());
         }
 
         {

src/main/cpp/net/eagle0/shardok/server/GameOverResponsePopulator.hpp

@@ -22,12 +22,12 @@ auto PopulateGameOverResponse(
         const std::vector<net::eagle0::shardok::storage::ResolvedUnit> &resolvedUnits,
         net::eagle0::common::GameOverResponse *gameOverResponse) -> bool;
 
-[[nodiscard]] auto IncludeUnitProtoInReturn(
+auto IncludeUnitProtoInReturn(
         const net::eagle0::shardok::storage::ResolvedUnit::UnitStatus &internalStatus) -> bool;
 
-[[nodiscard]] auto FromUnitFb(const Unit &unit) -> net::eagle0::common::CommonUnit;
+auto FromUnitFb(const Unit &unit) -> net::eagle0::common::CommonUnit;
 
-[[nodiscard]] auto FromInternalStatus(
+auto FromInternalStatus(
         const net::eagle0::shardok::storage::ResolvedUnit::UnitStatus internalStatus)
         -> net::eagle0::common::UnitStatus;
 

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/ConnectionHandler/DropGameConfirmationPanel.prefab

@@ -175,7 +175,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: -15, y: -124}
-  m_SizeDelta: {x: 160, y: 44}
+  m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4709387620957914250
 CanvasRenderer:
@@ -536,7 +536,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 151, y: -124}
-  m_SizeDelta: {x: 160, y: 44}
+  m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7560905983355139690
 CanvasRenderer:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/ConnectionHandler/Lobby Panel.prefab

@@ -7990,7 +7990,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 44}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2617165890227550574
 MonoBehaviour:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/CommandPanels/Battle Aftermath Decision Panel.prefab

@@ -5352,7 +5352,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 44}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &9214994086727143013
 MonoBehaviour:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/CommandPanels/March Panel Narrow.prefab

@@ -1072,9 +1072,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 44
+  m_MinHeight: 28
   m_PreferredWidth: -1
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -8158,9 +8158,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 44
+  m_MinHeight: 28
   m_PreferredWidth: -1
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Eagle/CommandPanels/Ransom Panel.prefab

@@ -1092,7 +1092,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 141, y: -16}
-  m_SizeDelta: {x: 218, y: 44}
+  m_SizeDelta: {x: 218, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7671732118854833925
 MonoBehaviour:
@@ -1173,7 +1173,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: -1
-  m_PreferredHeight: 44
+  m_PreferredHeight: 20
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/GameSelectionButton.prefab

@@ -176,7 +176,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: 410}
-  m_SizeDelta: {x: 528.3, y: 44}
+  m_SizeDelta: {x: 528.3, y: 32.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224798258896322370
 RectTransform:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Scenes/Connection.unity

@@ -802,7 +802,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: -15, y: -124}
-  m_SizeDelta: {x: 160, y: 44}
+  m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &65327892
 MonoBehaviour:
@@ -4360,7 +4360,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 540, y: -20}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &388979520
 MonoBehaviour:
@@ -5189,7 +5189,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 540, y: -100}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &478616035
 MonoBehaviour:
@@ -7393,7 +7393,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 540, y: -60}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &690908523
 MonoBehaviour:
@@ -12909,7 +12909,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 44}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1259883509
 MonoBehaviour:
@@ -13896,7 +13896,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 240, y: -60}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1329927116
 MonoBehaviour:
@@ -16285,7 +16285,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 495, y: -21.428572}
-  m_SizeDelta: {x: 150, y: 44}
+  m_SizeDelta: {x: 150, y: 42.857143}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1636735658
 MonoBehaviour:
@@ -16519,7 +16519,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 240, y: -100}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1653336955
 MonoBehaviour:
@@ -17474,7 +17474,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 1071, y: -20}
-  m_SizeDelta: {x: 200, y: 44}
+  m_SizeDelta: {x: 200, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1730376449
 MonoBehaviour:
@@ -18141,7 +18141,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 151, y: -124}
-  m_SizeDelta: {x: 160, y: 44}
+  m_SizeDelta: {x: 160, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1793816978
 MonoBehaviour:
@@ -20794,7 +20794,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 240, y: -20}
-  m_SizeDelta: {x: 300, y: 44}
+  m_SizeDelta: {x: 300, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2098264579
 MonoBehaviour:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Scenes/Eagle.unity

@@ -16238,7 +16238,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 767.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &128680686
 MonoBehaviour:
@@ -16256,7 +16256,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -16540,7 +16540,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 180
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -16564,7 +16564,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 541.01166, y: -16.5}
-  m_SizeDelta: {x: 162.49026, y: 44}
+  m_SizeDelta: {x: 162.49026, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &130723794
 GameObject:
@@ -18643,7 +18643,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -18667,7 +18667,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 960.1557, y: -16.5}
-  m_SizeDelta: {x: 198.59923, y: 44}
+  m_SizeDelta: {x: 198.59923, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &146542080
 GameObject:
@@ -21712,7 +21712,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -21736,7 +21736,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 767.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &170172716
 GameObject:
@@ -28272,7 +28272,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -28296,7 +28296,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 522.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &223285885
 GameObject:
@@ -32744,7 +32744,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 410.35156, y: -230.07692}
-  m_SizeDelta: {x: 810.7031, y: 44}
+  m_SizeDelta: {x: 810.7031, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &249661625
 MonoBehaviour:
@@ -49341,7 +49341,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -10, y: 0}
-  m_SizeDelta: {x: 44, y: 44}
+  m_SizeDelta: {x: 32, y: 32}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!1 &359802942
 GameObject:
@@ -58323,7 +58323,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 245
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -58347,7 +58347,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 204.09793, y: -12.923078}
-  m_SizeDelta: {x: 131.69049, y: 44}
+  m_SizeDelta: {x: 131.69049, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &430837821
 GameObject:
@@ -59823,7 +59823,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 650, y: -225.5}
-  m_SizeDelta: {x: 1290, y: 44}
+  m_SizeDelta: {x: 1290, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &440103821
 MonoBehaviour:
@@ -62550,7 +62550,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 640, y: -211.5}
-  m_SizeDelta: {x: 1280, y: 44}
+  m_SizeDelta: {x: 1280, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &459221576
 MonoBehaviour:
@@ -63253,7 +63253,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -63277,7 +63277,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 522.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &465743287
 GameObject:
@@ -77375,7 +77375,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -77399,7 +77399,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 465.82172, y: -12.923078}
-  m_SizeDelta: {x: 118.25268, y: 44}
+  m_SizeDelta: {x: 118.25268, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &547659159
 GameObject:
@@ -92966,7 +92966,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 180
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -92990,7 +92990,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 338.31927, y: -12.923078}
-  m_SizeDelta: {x: 96.75219, y: 44}
+  m_SizeDelta: {x: 96.75219, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &660980321
 GameObject:
@@ -116191,7 +116191,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 90, y: -89}
-  m_SizeDelta: {x: 180, y: 44}
+  m_SizeDelta: {x: 180, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &810386121
 MonoBehaviour:
@@ -116209,7 +116209,7 @@ MonoBehaviour:
   m_MinWidth: 0
   m_MinHeight: -1
   m_PreferredWidth: 180
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -118579,7 +118579,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 141, y: -16}
-  m_SizeDelta: {x: 218, y: 44}
+  m_SizeDelta: {x: 218, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &827047613
 MonoBehaviour:
@@ -118597,7 +118597,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: -1
-  m_PreferredHeight: 44
+  m_PreferredHeight: 20
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -141132,7 +141132,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 44}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &990335414
 MonoBehaviour:
@@ -145011,7 +145011,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 945, y: -20}
-  m_SizeDelta: {x: 200, y: 44}
+  m_SizeDelta: {x: 200, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1013253111
 MonoBehaviour:
@@ -145059,7 +145059,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 200
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 0
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
@@ -148728,7 +148728,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 1195, y: -12}
-  m_SizeDelta: {x: 100, y: 44}
+  m_SizeDelta: {x: 100, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1042458708
 MonoBehaviour:
@@ -175058,7 +175058,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 1012.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1262731469
 MonoBehaviour:
@@ -175076,7 +175076,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -175445,7 +175445,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 245
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -175469,7 +175469,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 329.1829, y: -16.5}
-  m_SizeDelta: {x: 221.16731, y: 44}
+  m_SizeDelta: {x: 221.16731, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1265208538
 GameObject:
@@ -204005,7 +204005,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -204029,7 +204029,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 59.126343, y: -12.923078}
-  m_SizeDelta: {x: 118.25268, y: 44}
+  m_SizeDelta: {x: 118.25268, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1467173694
 GameObject:
@@ -259963,7 +259963,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 650, y: -225.5}
-  m_SizeDelta: {x: 1290, y: 44}
+  m_SizeDelta: {x: 1290, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1842440878
 MonoBehaviour:
@@ -263166,7 +263166,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 90, y: -134}
-  m_SizeDelta: {x: 180, y: 44}
+  m_SizeDelta: {x: 180, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1868787946
 MonoBehaviour:
@@ -263184,7 +263184,7 @@ MonoBehaviour:
   m_MinWidth: 0
   m_MinHeight: -1
   m_PreferredWidth: 180
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -272110,7 +272110,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 225
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -272134,7 +272134,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 277.5, y: -17.5}
-  m_SizeDelta: {x: 225, y: 44}
+  m_SizeDelta: {x: 225, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1932891756
 GameObject:
@@ -276432,7 +276432,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 90, y: -44}
-  m_SizeDelta: {x: 180, y: 44}
+  m_SizeDelta: {x: 180, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1969473728
 MonoBehaviour:
@@ -276450,7 +276450,7 @@ MonoBehaviour:
   m_MinWidth: 0
   m_MinHeight: -1
   m_PreferredWidth: 180
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: -1
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -278940,7 +278940,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -278964,7 +278964,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 741.55646, y: -16.5}
-  m_SizeDelta: {x: 198.59923, y: 44}
+  m_SizeDelta: {x: 198.59923, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1981896738
 GameObject:
@@ -297066,7 +297066,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -297090,7 +297090,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 604.0744, y: -12.923078}
-  m_SizeDelta: {x: 118.25268, y: 44}
+  m_SizeDelta: {x: 118.25268, y: 25.846155}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2093294539
 GameObject:
@@ -299551,7 +299551,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 220
-  m_PreferredHeight: 44
+  m_PreferredHeight: 35
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -299575,7 +299575,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 99.29962, y: -16.5}
-  m_SizeDelta: {x: 198.59923, y: 44}
+  m_SizeDelta: {x: 198.59923, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2119216695
 GameObject:

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Scenes/Shared.unity

@@ -4457,9 +4457,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.LayoutElement
   m_IgnoreLayout: 0
   m_MinWidth: 65
-  m_MinHeight: 44
+  m_MinHeight: 20
   m_PreferredWidth: 65
-  m_PreferredHeight: 44
+  m_PreferredHeight: 20
   m_FlexibleWidth: 0
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
@@ -4489,7 +4489,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 94.005, y: -24.510002}
-  m_SizeDelta: {x: 65, y: 44}
+  m_SizeDelta: {x: 65, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &348932677
 GameObject:
@@ -4823,7 +4823,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 715, y: -20}
-  m_SizeDelta: {x: 150, y: 44}
+  m_SizeDelta: {x: 150, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &356069265
 MonoBehaviour:
@@ -4841,7 +4841,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 150
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 0
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
@@ -13973,7 +13973,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 545, y: -20}
-  m_SizeDelta: {x: 150, y: 44}
+  m_SizeDelta: {x: 150, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1233815601
 MonoBehaviour:
@@ -13991,7 +13991,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 150
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 0
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
@@ -15368,7 +15368,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 745, y: -1060}
-  m_SizeDelta: {x: 100, y: 44}
+  m_SizeDelta: {x: 100, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1384573208
 MonoBehaviour:
@@ -15386,7 +15386,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 100
-  m_PreferredHeight: 44
+  m_PreferredHeight: 30
   m_FlexibleWidth: 0
   m_FlexibleHeight: -1
   m_LayoutPriority: 1
@@ -20365,7 +20365,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 730, y: -20}
-  m_SizeDelta: {x: 120, y: 44}
+  m_SizeDelta: {x: 120, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1731381190
 MonoBehaviour:
@@ -20383,7 +20383,7 @@ MonoBehaviour:
   m_MinWidth: -1
   m_MinHeight: -1
   m_PreferredWidth: 120
-  m_PreferredHeight: 44
+  m_PreferredHeight: 40
   m_FlexibleWidth: 0
   m_FlexibleHeight: 0
   m_LayoutPriority: 1

src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Shardok/Button Prefab.prefab

@@ -118,7 +118,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -25}
-  m_SizeDelta: {x: 400, y: 44}
+  m_SizeDelta: {x: 400, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1803372434853685144
 CanvasRenderer:

src/main/scala/net/eagle0/common/FunctionalRandom.scala

@@ -87,7 +87,7 @@ abstract class FunctionalRandom {
       if rem == 0 then acc
       else go(rem - 1, gen(acc.nextRandom).map(acc.newValue :+ _))
 
-    go(count, RandomState(Vector.empty, this))
+    go(count, RandomState(Vector(), this))
   }
 
   def nextPair[T](
@@ -233,7 +233,7 @@ abstract class FunctionalRandom {
       case _            => accRS
     }
 
-    go(vec, RandomState(Vector.empty, this))
+    go(vec, RandomState(Vector(), this))
   }
 
   def nextCollectFirst[T, U](seq: Seq[T])(
@@ -268,7 +268,7 @@ abstract class FunctionalRandom {
       case _                      => ??? // above cases should cover
     }
 
-    go(vec, RandomState(Vector.empty, this))
+    go(vec, RandomState(Vector(), this))
   }
 
   def nextFlatCollectFirst[T, U](seq: Seq[T])(

src/main/scala/net/eagle0/common/name_generation/StringConstructionTester.scala

@@ -35,7 +35,7 @@ object StringConstructionTester {
           arraysUrl = Path.of(arraysPath).toUri.toURL,
           formatUrl = Path.of(formatPath).toUri.toURL,
           substitutions = newSubs,
-          atSpecializations = Vector.empty
+          atSpecializations = Vector()
         )
 
       val random = new JankyRandom(new Random())

src/main/scala/net/eagle0/common/name_generation/StringConstructionToken.scala

@@ -123,7 +123,7 @@ case class TitleCaseToken(base: StringConstructionToken) extends StringConstruct
       case first +: middle :+ last =>
         first.capitalize +: middle :+ last.capitalize
       case Vector(only: String)    => Vector(only.capitalize)
-      case Vector()                => Vector.empty
+      case Vector()                => Vector()
     }
 
   private def byWordCapitalized(string: String): Vector[String] =

src/main/scala/net/eagle0/common/name_generation/StringConstructionTokenGenerator.scala

@@ -16,7 +16,7 @@ object StringConstructionTokenGenerator {
       namesMap: Map[String, Vector[String]],
       formatString: String,
       atSpecializations: Vector[String],
-      substitutions: Map[String, String] = Map.empty
+      substitutions: Map[String, String] = Map()
   ): StringConstructionToken = {
     val formatStringWithSubstitutions = substitutions.foldLeft(formatString) {
       case (acc, (key, value)) =>

src/main/scala/net/eagle0/eagle/Main.scala

@@ -78,7 +78,7 @@ object Main {
 
         case _ => map
       }
-    nextOption(Map.empty, args.toVector)
+    nextOption(Map(), args.toVector)
   }
 
   def main(args: Array[String]): Unit = {

src/main/scala/net/eagle0/eagle/auth/JwtService.scala

@@ -113,13 +113,15 @@ object JwtService {
    *   Some(JwtService) if keys are available, None otherwise
    */
   def fromEnvironment(): Option[JwtService] = {
-    val pathOpt = sys.env.get("JWT_PUBLIC_KEY_FILE").filter(_.trim.nonEmpty).orElse {
-      val defaultFile = new java.io.File(defaultPublicKeyPath)
-      if defaultFile.exists() then Some(defaultPublicKeyPath)
-      else {
-        println(s"[JwtService] No public key found (checked JWT_PUBLIC_KEY_FILE env and $defaultPublicKeyPath)")
-        None
-      }
+    val pathOpt = sys.env.get("JWT_PUBLIC_KEY_FILE").filter(_.trim.nonEmpty) match {
+      case Some(p) => Some(p)
+      case None    =>
+        val defaultFile = new java.io.File(defaultPublicKeyPath)
+        if defaultFile.exists() then Some(defaultPublicKeyPath)
+        else {
+          println(s"[JwtService] No public key found (checked JWT_PUBLIC_KEY_FILE env and $defaultPublicKeyPath)")
+          None
+        }
     }
 
     pathOpt.flatMap { path =>

src/main/scala/net/eagle0/eagle/auth/OAuthService.scala

@@ -239,7 +239,7 @@ class OAuthServiceImpl(serverBaseUrl: String) extends OAuthService {
         val accessToken = (parsed \ "access_token").extract[String]
         Right(accessToken)
       }
-    }.toEither.fold(e => Left(s"Token exchange error: ${e.getMessage}"), identity)
+    }.toEither.left.map(e => s"Token exchange error: ${e.getMessage}").flatten
 
   private def fetchUserInfo(
       provider: OAuthProvider,
@@ -265,7 +265,7 @@ class OAuthServiceImpl(serverBaseUrl: String) extends OAuthService {
         val parsed = json.parse(body)
         parseUserInfo(provider, parsed)
       }
-    }.toEither.fold(e => Left(s"User info fetch error: ${e.getMessage}"), identity)
+    }.toEither.left.map(e => s"User info fetch error: ${e.getMessage}").flatten
 
   private def parseUserInfo(
       provider: OAuthProvider,
@@ -365,7 +365,7 @@ class OAuthServiceImpl(serverBaseUrl: String) extends OAuthService {
 
         Right(signedJWT.serialize())
       }
-    }.toEither.fold(e => Left(s"Failed to generate Apple client_secret: ${e.getMessage}"), identity)
+    }.toEither.left.map(e => s"Failed to generate Apple client_secret: ${e.getMessage}").flatten
 
   /** Exchange Apple authorization code for tokens */
   private def exchangeAppleCode(
@@ -405,7 +405,7 @@ class OAuthServiceImpl(serverBaseUrl: String) extends OAuthService {
       } else {
         Right(json.parse(body))
       }
-    }.toEither.fold(e => Left(s"Apple token exchange error: ${e.getMessage}"), identity)
+    }.toEither.left.map(e => s"Apple token exchange error: ${e.getMessage}").flatten
 
   /** Parse user info from Apple's id_token JWT */
   private def parseAppleIdToken(tokenResponse: org.json4s.JValue): Either[String, ProviderUserInfo] =
@@ -431,5 +431,5 @@ class OAuthServiceImpl(serverBaseUrl: String) extends OAuthService {
 
         Right(ProviderUserInfo(sub, email, "", username))
       }
-    }.toEither.fold(e => Left(s"Failed to parse Apple id_token: ${e.getMessage}"), identity)
+    }.toEither.left.map(e => s"Failed to parse Apple id_token: ${e.getMessage}").flatten
 }

src/main/scala/net/eagle0/eagle/client_text/ClientTextStoreImpl.scala

@@ -174,7 +174,7 @@ case class ClientTextStoreImpl(
       id: ClientTextId,
       addedFactionIds: Vector[FactionId]
   ): ClientTextStore = {
-    val originalFactionIds = accessibleTo.getOrElse(id, Vector.empty).sorted
+    val originalFactionIds = accessibleTo.getOrElse(id, Vector()).sorted
     val updatedFactionIds  =
       (originalFactionIds ++ addedFactionIds).distinct.sorted
 
@@ -400,7 +400,7 @@ object ClientTextStoreImpl {
       .recover {
         case _: FileNotFoundException =>
           println("No complete text store found")
-          Vector.empty
+          Vector()
       }
 
   private def loadedIncompleteTexts(
@@ -447,12 +447,12 @@ object ClientTextStoreImpl {
               }.toVector
             )
           }
-          .getOrElse((Vector.empty, Vector.empty))
+          .getOrElse((Vector(), Vector()))
       }
       .recover {
         case _: FileNotFoundException =>
           println("No incomplete text store found")
-          (Vector.empty, Vector.empty)
+          (Vector(), Vector())
       }
 
   private def loadedAccessibleTo(
@@ -483,7 +483,7 @@ object ClientTextStoreImpl {
       .recover {
         case _: FileNotFoundException =>
           println("No accessibleTo store found")
-          Map.empty
+          Map()
 
         case x => throw x
       }

src/main/scala/net/eagle0/eagle/client_text/TextGenerationResult.scala

@@ -26,7 +26,7 @@ object TextGenerationResult {
         }
     }
 
-    go(Seq.empty, results)
+    go(Seq(), results)
   }
 }
 

src/main/scala/net/eagle0/eagle/library/actions/impl/action/ChronicleEventGenerator.scala

@@ -331,7 +331,7 @@ object ChronicleEventGenerator {
           )
         }
 
-      case _ => Vector.empty
+      case _ => Vector()
     }
 
   def eventTextEntries(

src/main/scala/net/eagle0/eagle/library/actions/impl/action/EndPlayerCommandsPhaseAction.scala

@@ -191,12 +191,12 @@ case class EndPlayerCommandsPhaseAction(
                   case _: DeferredChange.EpidemicStarted =>
                     province.activeEvents :+ EpidemicEvent(startDate = currentDate)
 
-                  case _: DeferredChange.PrisonerMoved          => Vector.empty
-                  case _: DeferredChange.PrisonerReturned       => Vector.empty
-                  case _: DeferredChange.CapturedHeroImprisoned => Vector.empty
-                  case _: DeferredChange.CapturedHeroExecuted   => Vector.empty
-                  case _: DeferredChange.CapturedHeroExiled     => Vector.empty
-                  case _: DeferredChange.CapturedHeroReturned   => Vector.empty
+                  case _: DeferredChange.PrisonerMoved          => Vector()
+                  case _: DeferredChange.PrisonerReturned       => Vector()
+                  case _: DeferredChange.CapturedHeroImprisoned => Vector()
+                  case _: DeferredChange.CapturedHeroExecuted   => Vector()
+                  case _: DeferredChange.CapturedHeroExiled     => Vector()
+                  case _: DeferredChange.CapturedHeroReturned   => Vector()
                 }
               ),
               removedDeferredChangeIndex = Some(0)

src/main/scala/net/eagle0/eagle/library/actions/impl/action/EndProvinceMoveResolutionPhaseAction.scala

@@ -25,7 +25,7 @@ case class EndProvinceMoveResolutionPhaseAction(
       factions = factions,
       provinces = provinces,
       heroes = heroes,
-      killedHeroIds = Vector.empty
+      killedHeroIds = Vector()
     ).randomResults(functionalRandom)
       .map(
         _ :+

src/main/scala/net/eagle0/eagle/library/actions/impl/action/HeroStatGainAction.scala

@@ -221,7 +221,7 @@ case class HeroStatGainAction(
     val llmRequest = LlmRequestT.ProfessionGainedMessage(
       requestId = s"profession_gained_$heroId",
       eagleGameId = gameId,
-      recipientFactionIds = Vector.empty, // all factions
+      recipientFactionIds = Vector(), // all factions
       heroId = heroId,
       factionId = factionId.getOrElse(0),
       newProfession = profession
@@ -233,7 +233,7 @@ case class HeroStatGainAction(
         factionId = factionId.getOrElse(0),
         newProfession = profession
       ),
-      targetFactionIds = Vector.empty, // all factions
+      targetFactionIds = Vector(), // all factions
       affectedHeroIds = Vector(heroId),
       llm = NotificationT.Llm.Id(llmRequest.requestId),
       deferred = true

src/main/scala/net/eagle0/eagle/library/actions/impl/action/NewRoundAction.scala

@@ -140,7 +140,7 @@ case class NewRoundAction(
           chronicler_style = chroniclerStyle
         )
       )
-    else Vector.empty
+    else Vector()
 
   private def dateBefore(a: Date, b: Date): Boolean =
     a.year < b.year || (a.year == b.year && a.month.value < b.month.value)

src/main/scala/net/eagle0/eagle/library/actions/impl/action/PerformUnaffiliatedHeroesAction.scala

@@ -267,7 +267,7 @@ case class PerformUnaffiliatedHeroesAction(
       toCheck = gs.provinces.keys,
       nextHid = gs.heroes.values.map(_.id).max + 1,
       currentGenerator = heroGenerator,
-      acc = RandomState(Vector.empty, fr)
+      acc = RandomState(Vector(), fr)
     )
   }
 
@@ -464,7 +464,7 @@ case class PerformUnaffiliatedHeroesAction(
       toCheck = gs.provinces.keys,
       nextHid = gs.heroes.values.map(_.id).max + 1,
       currentGenerator = heroGenerator,
-      acc = RandomState(Vector.empty, fr)
+      acc = RandomState(Vector(), fr)
     )
   }
 
@@ -528,17 +528,17 @@ case class PerformUnaffiliatedHeroesAction(
       gs.heroes
     )
 
-    if spawnChance <= 0 then RandomState((Vector.empty, nextHid), fr)
+    if spawnChance <= 0 then RandomState((Vector(), nextHid), fr)
     else
       fr.nextDouble.continue {
         case (roll, nextFr) =>
-          if roll >= spawnChance then RandomState((Vector.empty, nextHid), nextFr)
+          if roll >= spawnChance then RandomState((Vector(), nextHid), nextFr)
           else {
             // Find provinces containing faction leaders (faction head or sworn brothers)
             val faction         = gs.factions(factionId)
             val leaderProvinces = FactionUtils.provincesWithLeaders(gs.provinces.values, faction)
 
-            if leaderProvinces.isEmpty then RandomState((Vector.empty, nextHid), nextFr)
+            if leaderProvinces.isEmpty then RandomState((Vector(), nextHid), nextFr)
             else
               nextFr.nextRandomElement(leaderProvinces.map(_.id)).continue {
                 case (targetPid, fr2) =>