Rename ship/station scrap drop entities to "debris"

src/balancing/ArenaSimulation.cpp

@@ -22,7 +22,7 @@
 #include "PositionComponent.h"
 #include "RepairSystem.h"
 #include "SalvagerSystem.h"
-#include "ScrapSystem.h"
+#include "DebrisSystem.h"
 #include "ShipIdentityComponent.h"
 #include "ShipSystem.h"
 #include "ShipsConfig.h"
@@ -63,7 +63,7 @@ ArenaSimulation::ArenaSimulation(const GameConfig& gameConfig,
     m_movementIntentSystem = std::make_unique<MovementIntentSystem>();
     m_dynamicBodySystem    = std::make_unique<DynamicBodySystem>();
     m_combatSystem   = std::make_unique<CombatSystem>(m_gameConfig);
-    m_scrapSystem    = std::make_unique<ScrapSystem>(m_admin);
+    m_debrisSystem    = std::make_unique<DebrisSystem>(m_admin);
     m_salvagerSystem = std::make_unique<SalvagerSystem>(m_admin);
     m_repairSystem   = std::make_unique<RepairSystem>(m_admin);
 
@@ -322,9 +322,9 @@ void ArenaSimulation::tick()
     // Ship behavior systems (tick step 7): evaluate, select winner, execute.
     // Module + combat systems emit their tool beams into a shared buffer.
     m_shipSystem->clearMovementIntents();
-    m_aiSystem->tick(m_admin, *m_buildingSystem, *m_scrapSystem);
+    m_aiSystem->tick(m_admin, *m_buildingSystem, *m_debrisSystem);
     std::vector<BeamFiredEvent> beamFiredEvents;
-    m_salvagerSystem->tick(m_currentTick, *m_scrapSystem, *m_buildingSystem, beamFiredEvents);
+    m_salvagerSystem->tick(m_currentTick, *m_debrisSystem, *m_buildingSystem, beamFiredEvents);
     m_repairSystem->tick(m_currentTick, beamFiredEvents);
 
     // Combat resolution (tick step 8).
@@ -340,7 +340,7 @@ void ArenaSimulation::tick()
     m_dynamicBodySystem->tick(m_admin);
 
     // Scrap despawn (tick step 11).
-    m_scrapSystem->tickDespawn(m_currentTick);
+    m_debrisSystem->tickDespawn(m_currentTick);
 
     ++m_currentTick;
 
@@ -371,8 +371,8 @@ void ArenaSimulation::tickDeaths()
         if (si.scrapDrop > 0)
         {
             const Tick despawnAt = m_currentTick
-                + secondsToTicks(m_gameConfig.world.scrapDespawnSeconds);
-            m_scrapSystem->spawn(pos.value, si.scrapDrop, despawnAt);
+                + secondsToTicks(m_gameConfig.world.debrisDespawnSeconds);
+            m_debrisSystem->spawn(pos.value, si.scrapDrop, despawnAt);
         }
         m_shipSystem->despawn(deadEntity);
     }
@@ -497,9 +497,9 @@ const ShipSystem& ArenaSimulation::getShips() const
     return *m_shipSystem;
 }
 
-const ScrapSystem& ArenaSimulation::getScraps() const
+const DebrisSystem& ArenaSimulation::getDebrisSystem() const
 {
-    return *m_scrapSystem;
+    return *m_debrisSystem;
 }
 
 EntityAdmin& ArenaSimulation::getAdmin()

src/balancing/ArenaSimulation.h

@@ -26,7 +26,7 @@ class MovementIntentSystem;
 class RepairSystem;
 class SalvagerSystem;
 class ShipSystem;
-class ScrapSystem;
+class DebrisSystem;
 
 struct ArenaStatus
 {
@@ -86,7 +86,7 @@ public:
     const ArenaConfig& getArenaConfig() const;
     const BuildingSystem& getBuildings() const;
     const ShipSystem& getShips() const;
-    const ScrapSystem& getScraps() const;
+    const DebrisSystem& getDebrisSystem() const;
     EntityAdmin&       getAdmin();
     const EntityAdmin& getAdmin() const;
 
@@ -114,7 +114,7 @@ private:
     std::unique_ptr<MovementIntentSystem> m_movementIntentSystem;
     std::unique_ptr<DynamicBodySystem>    m_dynamicBodySystem;
     std::unique_ptr<CombatSystem>   m_combatSystem;
-    std::unique_ptr<ScrapSystem>    m_scrapSystem;
+    std::unique_ptr<DebrisSystem>    m_debrisSystem;
     std::unique_ptr<SalvagerSystem> m_salvagerSystem;
     std::unique_ptr<RepairSystem>   m_repairSystem;
 

src/balancing/ArenaView.cpp

@@ -24,11 +24,11 @@
 #include "PositionComponent.h"
 #include "RepairBehavior.h"
 #include "SalvageScrapBehavior.h"
-#include "ScrapSystem.h"
+#include "DebrisSystem.h"
 #include "SensorRangeComponent.h"
 #include "ShipIdentityComponent.h"
 #include "StationBodyComponent.h"
-#include "ScrapDataComponent.h"
+#include "DebrisComponent.h"
 
 namespace
 {
@@ -153,7 +153,7 @@ void ArenaView::handleEvent(std::shared_ptr<const BeamFiredEvent> event)
         maxRadius = shorter / 2.0f;
     }
     else if (m_sim->getAdmin().isValid(event->target)
-        && m_sim->getAdmin().hasAll<ScrapDataComponent>(event->target))
+        && m_sim->getAdmin().hasAll<DebrisComponent>(event->target))
     {
         maxRadius = 0.1f;
     }
@@ -178,7 +178,7 @@ void ArenaView::paintGL()
     drawTiles(painter);
     drawBuildings(painter);
     drawStations(painter);
-    drawScrap(painter);
+    drawDebris(painter);
     if (m_debugDraw)
     {
         drawDebugSensorRanges(painter);
@@ -336,12 +336,12 @@ void ArenaView::drawBuildings(QPainter& painter)
     }
 }
 
-void ArenaView::drawScrap(QPainter& painter)
+void ArenaView::drawDebris(QPainter& painter)
 {
     const float r = getTilePx() * 0.2f;
-    for (const ScrapInfo& scrap : m_sim->getScraps().getAllScrapInfo())
+    for (const DebrisInfo& debris : m_sim->getDebrisSystem().getAllDebrisInfo())
     {
-        const QPointF center = worldToWidget(scrap.position);
+        const QPointF center = worldToWidget(debris.position);
         painter.setBrush(QColor(128, 110, 90));
         painter.setPen(QPen(QColor(50, 40, 30), 1));
         painter.drawEllipse(center,
@@ -529,9 +529,9 @@ void ArenaView::drawDebugTargetLines(QPainter& painter)
             const PositionComponent& pos, const FactionComponent& fac,
             const SalvageScrapBehavior& salvage)
         {
-            if (!salvage.scrapTarget.has_value()) { return; }
+            if (!salvage.debrisTarget.has_value()) { return; }
 
-            drawTargetLine(fac.isEnemy, pos.value, *salvage.scrapTarget);
+            drawTargetLine(fac.isEnemy, pos.value, *salvage.debrisTarget);
         });
 }
 

src/balancing/ArenaView.h

@@ -50,7 +50,7 @@ private:
     void drawTiles(QPainter& painter);
     void drawBuildings(QPainter& painter);
     void drawStations(QPainter& painter);
-    void drawScrap(QPainter& painter);
+    void drawDebris(QPainter& painter);
     void drawShips(QPainter& painter);
     void drawDebugSensorRanges(QPainter& painter);
     void drawDebugTargetLines(QPainter& painter);