implement cost formula for asteroid expansion

src/lib/config/ConfigLoader.cpp

@@ -278,8 +278,8 @@ WorldConfig ConfigLoader::loadWorld(const std::string& path)
     cfg.regions.contestZoneWidth_tiles  = static_cast<int>(requireInt(tbl["regions"]["contest_zone_width_tiles"],  file, "regions.contest_zone_width_tiles"));
     cfg.regions.enemyBufferWidth_tiles  = static_cast<int>(requireInt(tbl["regions"]["enemy_buffer_width_tiles"],  file, "regions.enemy_buffer_width_tiles"));
 
-    cfg.expansion.columnsPerExpansion_tiles = static_cast<int>(requireInt(tbl["expansion"]["columns_per_expansion_tiles"], file, "expansion.columns_per_expansion_tiles"));
-    cfg.expansion.costBuildingBlocks        = static_cast<int>(requireInt(tbl["expansion"]["cost_building_blocks"],        file, "expansion.cost_building_blocks"));
+    cfg.expansion.columnsPerExpansion_tiles   = static_cast<int>(requireInt(tbl["expansion"]["columns_per_expansion_tiles"], file, "expansion.columns_per_expansion_tiles"));
+    cfg.expansion.costBuildingBlocksFormula   = requireFormula(tbl["expansion"]["cost_building_blocks_formula"],            file, "expansion.cost_building_blocks_formula");
 
     cfg.push.pushExpandColumns_tiles = static_cast<int>(requireInt(tbl["push"]["push_expand_columns_tiles"], file, "push.push_expand_columns_tiles"));
     cfg.push.bossAdvanceSeconds = requireDouble(tbl["push"]["boss_advance_seconds"], file, "push.boss_advance_seconds");

src/lib/config/WorldConfig.h

@@ -14,8 +14,8 @@ struct WorldRegions
 // Asteroid expansion (REQ-EXP-UNLOCK, REQ-EXP-COST).
 struct WorldExpansion
 {
-    int columnsPerExpansion_tiles;
-    int costBuildingBlocks;
+    int     columnsPerExpansion_tiles;
+    Formula costBuildingBlocksFormula;  // cost in building blocks; x = expansions already purchased
 };
 
 // Push effects (REQ-PSH-*, REQ-WAV-BOSS-ADVANCE).

src/lib/eventsystem/event/CMakeLists.txt

@@ -3,6 +3,7 @@ SET(HDRS
 	${CMAKE_CURRENT_SOURCE_DIR}/TracePrintRequestedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/TickAdvancedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/BuildingBlocksChangedEvent.h
+	${CMAKE_CURRENT_SOURCE_DIR}/ExpansionCostChangedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/EntitySelectedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/GameSpeedChangedEvent.h
 	${CMAKE_CURRENT_SOURCE_DIR}/BossWaveUpdatedEvent.h

src/lib/eventsystem/event/ExpansionCostChangedEvent.h

@@ -0,0 +1,17 @@
+#ifndef EXPANSION_COST_CHANGED_EVENT_H
+#define EXPANSION_COST_CHANGED_EVENT_H
+
+#include "Event.h"
+
+// Fired when the current asteroid-expansion cost changes (REQ-EXP-COST): once at
+// startup and again after each expansion is purchased. Carries the cost in
+// building blocks so the header Expand button can update its caption/enabled
+// state (REQ-UI-EXPAND-BUTTON).
+class ExpansionCostChangedEvent : public Event
+{
+public:
+	explicit ExpansionCostChangedEvent(int cost) : cost(cost) {}
+	const int cost;
+};
+
+#endif   // EXPANSION_COST_CHANGED_EVENT_H

src/lib/sim/BuildingSystem.cpp

@@ -24,6 +24,7 @@ BuildingSystem::BuildingSystem(const GameConfig& config,
     , m_spawnShip(std::move(spawnShip))
     , m_isItemUnlocked(std::move(isItemUnlocked))
     , m_rng(rng)
+    , m_asteroidWidth_tiles(config.world.regions.asteroidWidth_tiles)
 {
 }
 
@@ -281,7 +282,7 @@ bool BuildingSystem::bodyCellsWithinWorldBounds(const std::vector<QPoint>& bodyC
                                                 QPoint anchor) const
 {
     const int heightTiles = m_config.world.heightTiles;
-    const int leftEdgeX   = -m_config.world.regions.asteroidWidth_tiles;
+    const int leftEdgeX   = -m_asteroidWidth_tiles;
     for (const QPoint& cell : bodyCells)
     {
         const QPoint worldCell = anchor + cell;

src/lib/sim/BuildingSystem.h

@@ -59,6 +59,11 @@ public:
     bool isPlacementValid(BuildingType type, QPoint anchor,
                           Rotation rotation) const;
 
+    // Sets the current buildable asteroid width in tiles. Grows the left
+    // placement bound as the player unlocks asteroid expansions (REQ-EXP-UNLOCK).
+    // Defaults to world.regions.asteroid_width_tiles at construction.
+    void setAsteroidWidth_tiles(int widthTiles) { m_asteroidWidth_tiles = widthTiles; }
+
     // Remove a building or construction site by id.  Returns the refund in
     // building blocks (floor(cost * refundPercentage / 100)).  Returns 0 for
     // unknown ids.
@@ -179,6 +184,7 @@ private:
                        const std::optional<ShipLayoutConfig>&)> m_spawnShip;
     std::function<bool(const std::string&)>        m_isItemUnlocked;
     std::mt19937&                                  m_rng;
+    int                                            m_asteroidWidth_tiles;
 
     std::vector<Building>           m_buildings;
     std::deque<ConstructionSite>    m_constructionQueue;

src/lib/sim/Command.h

@@ -35,6 +35,7 @@ enum class CommandKind
     SetSplitterFilters,
     ClearBeltTiles,
     ApplySchematicChoice,
+    ExpandAsteroid,
     Reset
 };
 
@@ -129,6 +130,14 @@ struct ApplySchematicChoiceCommand : Command
     int choiceIndex = 0;
 };
 
+// Unlocks the next asteroid expansion (REQ-EXP-UNLOCK). Carries no payload: the
+// simulation derives the cost and column count from its own expansion counter
+// and config, so a recorded command replays identically.
+struct ExpandAsteroidCommand : Command
+{
+    ExpandAsteroidCommand() : Command(CommandKind::ExpandAsteroid) {}
+};
+
 // Restart boundary: reinitializes the simulation with a fresh seed and, if
 // config is set, a reloaded config (GameConfig is move-only, so it is carried by
 // shared_ptr and moved into the sim on apply). A null config keeps the current

src/lib/sim/Simulation.cpp

@@ -2,6 +2,7 @@
 
 #include <algorithm>
 #include <cassert>
+#include <cmath>
 
 #include "AiSystem.h"
 #include "Command.h"
@@ -132,6 +133,7 @@ void Simulation::reset(unsigned int seed)
     m_nextDepartureTick        = secondsToTicks(m_config.world.departureIntervalSeconds);
     m_nextBuildingId                   = 1;
     m_buildingBlocksStock      = m_config.world.startingBuildingBlocks;
+    m_expansionsPurchased      = 0;
     m_gameOver                      = false;
     m_isWon                         = false;
     m_artifactCount                 = 0;
@@ -275,6 +277,9 @@ void Simulation::apply(const Command& command)
     case CommandKind::ApplySchematicChoice:
         applySchematicChoice(static_cast<const ApplySchematicChoiceCommand&>(command).choiceIndex);
         break;
+    case CommandKind::ExpandAsteroid:
+        tryExpandAsteroid();
+        break;
     case CommandKind::Reset:
     {
         const ResetCommand& c = static_cast<const ResetCommand&>(command);
@@ -993,6 +998,7 @@ unsigned long long Simulation::computeStateChecksum() const
     hasher.append(m_gameOver);
     hasher.append(m_isWon);
     hasher.append(m_artifactCount);
+    hasher.append(m_expansionsPurchased);
 
     // WaveSystem scalar state, reached through existing accessors.
     hasher.append(threatLevel());
@@ -1100,6 +1106,31 @@ int Simulation::buildingBlocksStock() const
     return m_buildingBlocksStock;
 }
 
+int Simulation::currentAsteroidWidth_tiles() const
+{
+    return m_config.world.regions.asteroidWidth_tiles
+        + m_expansionsPurchased * m_config.world.expansion.columnsPerExpansion_tiles;
+}
+
+int Simulation::currentExpansionCost() const
+{
+    const double cost = m_config.world.expansion.costBuildingBlocksFormula.evaluate(
+        static_cast<double>(m_expansionsPurchased));
+    return static_cast<int>(std::floor(cost));
+}
+
+void Simulation::tryExpandAsteroid()
+{
+    const int cost = currentExpansionCost();
+    if (m_buildingBlocksStock < cost)
+    {
+        return;
+    }
+    m_buildingBlocksStock -= cost;
+    ++m_expansionsPurchased;
+    m_buildingSystem->setAsteroidWidth_tiles(currentAsteroidWidth_tiles());
+}
+
 bool Simulation::isGameOver() const
 {
     return m_gameOver;

src/lib/sim/Simulation.h

@@ -72,6 +72,12 @@ public:
     // The seed this run was (re)initialized with; written to the replay header.
     unsigned int getSeed()        const;
     int    buildingBlocksStock()  const;
+    // Current asteroid width in tiles = base width + purchased expansions
+    // (REQ-EXP-UNLOCK, REQ-GW-ASTEROID-EXPAND).
+    int    currentAsteroidWidth_tiles() const;
+    // Building block cost of the next expansion, floored to an integer
+    // (REQ-EXP-COST); x = number of expansions already purchased.
+    int    currentExpansionCost()  const;
     bool   isGameOver()           const;
     bool   isWon()                const;
     int    artifactCount()        const;
@@ -136,6 +142,11 @@ private:
     // Clears the pending choices after application.
     void applySchematicChoice(int choiceIndex);
 
+    // Unlocks one asteroid expansion if affordable (REQ-EXP-UNLOCK): checks the
+    // current cost against the stock, deducts it, increments the expansion
+    // counter, and widens the buildable asteroid. No-op if blocks are short.
+    void tryExpandAsteroid();
+
     // Mutable subsystem accessors; same chokepoint rule as the mutators above.
     BuildingSystem&       buildingsMutable();
     BeltSystem&           beltsMutable();
@@ -165,6 +176,7 @@ private:
     Tick     m_nextDepartureTick;
     BuildingId m_nextBuildingId;
     int      m_buildingBlocksStock;
+    int      m_expansionsPurchased = 0;  // REQ-EXP-COST formula variable x
     bool     m_gameOver    = false;
     bool     m_isWon       = false;
     int      m_artifactCount = 0;