mlangkabel/dota_factory
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename EntityId to BuildingId

Browse Source
This commit is contained in:
mlangkabel
2026-05-23 07:53:56 +02:00
parent dc4ebd5f2d
commit b57299fd2a
28 changed files with 273 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/balancing/ArenaSimulation.cpp
View File

@@ -27,7 +27,7 @@ ArenaSimulation::ArenaSimulation(const GameConfig& gameConfig,
, m_arenaConfig(std::move(arenaConfig))
, m_rng(seed)
, m_currentTick(0)
, m_nextId(1)
, m_nextBuildingId(1)
, m_beltSystem(1.0)
, m_team1HqEntity(entt::null)
, m_team2HqEntity(entt::null)
@@ -38,7 +38,7 @@ ArenaSimulation::ArenaSimulation(const GameConfig& gameConfig,
m_buildingSystem = std::make_unique<BuildingSystem>(
m_gameConfig,
m_beltSystem,
[this]() { return allocateId(); },
[this]() { return allocateBuildingId(); },
[](int) {},
[](const std::string&, QVector2D, const std::optional<ShipLayoutConfig>&) {},
m_rng);
@@ -59,9 +59,9 @@ ArenaSimulation::ArenaSimulation(const GameConfig& gameConfig,
ArenaSimulation::~ArenaSimulation() = default;
EntityId ArenaSimulation::allocateId()
BuildingId ArenaSimulation::allocateBuildingId()
{
return m_nextId++;
return m_nextBuildingId++;
}
void ArenaSimulation::placeStructures()
@@ -89,7 +89,7 @@ void ArenaSimulation::placeStructures()
anchorY + hqParsed.footprint.height() / 2.0f);
m_team1HqEntity = m_admin.spawnStation(anchor, hqParsed.footprint, absCells,
hp, hp, false);
m_buildingSystem->registerTileOccupancy(absCells, allocateId());
m_buildingSystem->registerTileOccupancy(absCells, allocateBuildingId());
}
// Team 2 HQ — ECS proxy entity, enemy faction (isEnemy=true). No weapon.
@@ -108,7 +108,7 @@ void ArenaSimulation::placeStructures()
}
m_team2HqEntity = m_admin.spawnStation(anchor, hqParsed.footprint, absCells,
hp, hp, true);
m_buildingSystem->registerTileOccupancy(absCells, allocateId());
m_buildingSystem->registerTileOccupancy(absCells, allocateBuildingId());
}
auto placeArenaStation = [&](const ArenaStationEntry& entry, bool isEnemy)
@@ -156,7 +156,7 @@ void ArenaSimulation::placeStructures()
const entt::entity stationEntity = m_admin.spawnStation(
anchor, parsed.footprint, absCells, hp, hp, isEnemy);
m_admin.addComponent<Weapon>(stationEntity, weapon);
m_buildingSystem->registerTileOccupancy(absCells, allocateId());
m_buildingSystem->registerTileOccupancy(absCells, allocateBuildingId());
};
for (const ArenaStationEntry& entry : m_arenaConfig.teams[0].stations)

6
src/balancing/ArenaSimulation.h
View File

@@ -11,7 +11,7 @@
#include "BeltSystem.h"
#include "EcsComponents.h"
#include "EntityAdmin.h"
#include "EntityId.h"
#include "BuildingId.h"
#include "entt/entity/entity.hpp"
#include "FireEvent.h"
@@ -73,7 +73,7 @@ public:
const EntityAdmin& admin() const;
private:
EntityId allocateId();
BuildingId allocateBuildingId();
void placeStructures();
void spawnShips();
void tick();
@@ -85,7 +85,7 @@ private:
std::mt19937 m_rng;
Tick m_currentTick;
EntityId m_nextId;
BuildingId m_nextBuildingId;
EntityAdmin m_admin;
BeltSystem m_beltSystem;