implement cost formula for asteroid expansion

src/ui/GameWorldView.cpp

@@ -59,6 +59,7 @@
 #include "BuilderModeExitedEvent.h"
 #include "BlueprintModeExitedEvent.h"
 #include "BuildingBlocksChangedEvent.h"
+#include "ExpansionCostChangedEvent.h"
 #include "GameSpeedChangedEvent.h"
 #include "SchematicChoicesAvailableEvent.h"
 #include "TickAdvancedEvent.h"
@@ -276,6 +277,7 @@ void GameWorldView::onFrame()
     {
         const Tick newTick      = m_sim->currentTick();
         const int  newBlocks    = m_sim->buildingBlocksStock();
+        const int  newExpCost   = m_sim->currentExpansionCost();
         const int  newBoss      = m_sim->bossWaveCounter();
         const Tick newCountdown = m_sim->bossCountdownTicks();
 
@@ -291,6 +293,12 @@ void GameWorldView::onFrame()
             EventManager::getInstance()->sendEventImmediately(
                 std::make_shared<BuildingBlocksChangedEvent>(newBlocks));
         }
+        if (newExpCost != m_lastExpansionCost)
+        {
+            m_lastExpansionCost = newExpCost;
+            EventManager::getInstance()->sendEventImmediately(
+                std::make_shared<ExpansionCostChangedEvent>(newExpCost));
+        }
         if (newBoss != m_lastBossCounter || newCountdown != m_lastBossCountdown)
         {
             m_lastBossCounter   = newBoss;
@@ -435,7 +443,7 @@ QRect GameWorldView::viewportRect() const
 
 float GameWorldView::asteroidLeftEdge() const
 {
-    float leftX = -static_cast<float>(m_config->world.regions.asteroidWidth_tiles);
+    float leftX = -static_cast<float>(m_sim->currentAsteroidWidth_tiles());
     for (const Building& b : m_sim->buildings().allBuildings())
     {
         for (const QPoint& cell : b.bodyCells)
@@ -1827,6 +1835,7 @@ void GameWorldView::resetForNewGame()
     m_prevNonZeroSpeed  = 1.0;
     m_lastTick          = Tick(-1);
     m_lastBlocks        = -1;
+    m_lastExpansionCost = -1;
     m_lastBossCounter   = -1;
     m_lastBossCountdown = Tick(-1);
     m_lastArtifactCount = -1;

src/ui/GameWorldView.h

@@ -226,6 +226,7 @@ private:
 
     Tick m_lastTick          = Tick(-1);
     int  m_lastBlocks        = -1;
+    int  m_lastExpansionCost = -1;
     int  m_lastBossCounter   = -1;
     Tick m_lastBossCountdown = Tick(-1);
     int  m_lastArtifactCount = -1;

src/ui/HeaderBar.cpp

@@ -8,6 +8,8 @@
 #include <QPushButton>
 #include <QSignalMapper>
 
+#include "Command.h"
+#include "CommandRequestedEvent.h"
 #include "EventManager.h"
 #include "SpeedChangeRequestedEvent.h"
 #include "Tick.h"
@@ -32,6 +34,17 @@ HeaderBar::HeaderBar(QWidget* parent)
     layout->addStretch();
     layout->addWidget(m_bossLabel);
 
+    // Asteroid expansion button, to the left of the speed buttons (REQ-UI-HEADER,
+    // REQ-UI-EXPAND-BUTTON). Caption/enabled state are set on the first
+    // ExpansionCostChangedEvent; clicking requests an ExpandAsteroidCommand.
+    m_expandButton = new QPushButton(tr("Expand"), this);
+    layout->addWidget(m_expandButton);
+    connect(m_expandButton, &QPushButton::clicked, this, []() {
+        EventManager::getInstance()->sendEventImmediately(
+            std::make_shared<CommandRequestedEvent>(
+                std::make_shared<ExpandAsteroidCommand>()));
+    });
+
     const char* labels[] = { "0x", "0.5x", "1x", "2x", "10x" };
     QSignalMapper* mapper = new QSignalMapper(this);
     for (int i = 0; i < kSpeedCount; ++i)
@@ -67,7 +80,21 @@ void HeaderBar::handleEvent(std::shared_ptr<const TickAdvancedEvent> event)
 
 void HeaderBar::handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> event)
 {
+    m_blocks = event->blocks;
     m_blocksLabel->setText(tr("Blocks: %1").arg(event->blocks));
+    updateExpandButton();
+}
+
+void HeaderBar::handleEvent(std::shared_ptr<const ExpansionCostChangedEvent> event)
+{
+    m_expansionCost = event->cost;
+    updateExpandButton();
+}
+
+void HeaderBar::updateExpandButton()
+{
+    m_expandButton->setText(tr("Expand: %1 Blocks").arg(m_expansionCost));
+    m_expandButton->setEnabled(m_blocks >= m_expansionCost);
 }
 
 void HeaderBar::handleEvent(std::shared_ptr<const GameSpeedChangedEvent> event)

src/ui/HeaderBar.h

@@ -8,6 +8,7 @@
 #include "BossWaveUpdatedEvent.h"
 #include "BuildingBlocksChangedEvent.h"
 #include "EventHandler.h"
+#include "ExpansionCostChangedEvent.h"
 #include "GameSpeedChangedEvent.h"
 #include "Tick.h"
 #include "TickAdvancedEvent.h"
@@ -18,6 +19,7 @@ class QPushButton;
 class HeaderBar : public QWidget,
                   public CombinedEventHandler<TickAdvancedEvent,
                                               BuildingBlocksChangedEvent,
+                                              ExpansionCostChangedEvent,
                                               GameSpeedChangedEvent,
                                               BossWaveUpdatedEvent,
                                               ArtifactCountChangedEvent>
@@ -34,16 +36,25 @@ private slots:
 private:
     void handleEvent(std::shared_ptr<const TickAdvancedEvent> event) override;
     void handleEvent(std::shared_ptr<const BuildingBlocksChangedEvent> event) override;
+    void handleEvent(std::shared_ptr<const ExpansionCostChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const GameSpeedChangedEvent> event) override;
     void handleEvent(std::shared_ptr<const BossWaveUpdatedEvent> event) override;
     void handleEvent(std::shared_ptr<const ArtifactCountChangedEvent> event) override;
 
+    // Refreshes the Expand button caption and enabled state from the current
+    // expansion cost and building block stock (REQ-UI-EXPAND-BUTTON).
+    void updateExpandButton();
+
     QLabel*                  m_timeLabel;
     QLabel*                  m_blocksLabel;
     QLabel*                  m_artifactsLabel;
     QLabel*                  m_bossLabel;
+    QPushButton*             m_expandButton;
     std::vector<QPushButton*> m_speedButtons;
 
+    int                      m_blocks        = 0;
+    int                      m_expansionCost = 0;
+
     static const double kSpeeds[];
     static const int    kSpeedCount;
 };