evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store the ship's species as a world property

Browse Source 
prevents smorgasbord when upgrading the ship after the player changes the species of the character that owns the ship
This commit is contained in:
Kae 2024-03-27 17:06:51 +11:00
parent b8c34971d4
commit d53c3ae0e7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/game/StarUniverseServer.cpp
View File

@ -656,7 +656,13 @@ void UniverseServer::updateShips() {
auto newShipUpgrades = p.second->shipUpgrades(); auto newShipUpgrades = p.second->shipUpgrades();
if (auto shipWorld = getWorld(ClientShipWorldId(p.second->playerUuid()))) { if (auto shipWorld = getWorld(ClientShipWorldId(p.second->playerUuid()))) {
shipWorld->executeAction([&](WorldServerThread*, WorldServer* shipWorld) { shipWorld->executeAction([&](WorldServerThread*, WorldServer* shipWorld) {
auto const& speciesShips = m_speciesShips.get(p.second->playerSpecies()); String species;
if (auto jSpecies = shipWorld->getProperty("ship.species").optString())
species = *jSpecies;
else
shipWorld->setProperty("ship.species", species = p.second->playerSpecies());
auto const& speciesShips = m_speciesShips.get(species);
Json jOldShipLevel = shipWorld->getProperty("ship.level"); Json jOldShipLevel = shipWorld->getProperty("ship.level");
unsigned newShipLevel = min<unsigned>(speciesShips.size() - 1, newShipUpgrades.shipLevel); unsigned newShipLevel = min<unsigned>(speciesShips.size() - 1, newShipUpgrades.shipLevel);
@ -1973,7 +1979,8 @@ Maybe<WorkerPoolPromise<WorldServerThreadPtr>> UniverseServer::shipWorldPromise(
if (!shipWorld) { if (!shipWorld) {
Logger::info("UniverseServer: Creating new client ship world {}", clientShipWorldId); Logger::info("UniverseServer: Creating new client ship world {}", clientShipWorldId);
shipWorld = make_shared<WorldServer>(Vec2U(2048, 2048), File::ephemeralFile()); shipWorld = make_shared<WorldServer>(Vec2U(2048, 2048), File::ephemeralFile());
auto shipStructure = WorldStructure(speciesShips.get(clientContext->playerSpecies()).first()); auto& species = clientContext->playerSpecies();
auto shipStructure = WorldStructure(speciesShips.get(species).first());
shipStructure = shipWorld->setCentralStructure(shipStructure); shipStructure = shipWorld->setCentralStructure(shipStructure);
ShipUpgrades currentUpgrades = clientContext->shipUpgrades(); ShipUpgrades currentUpgrades = clientContext->shipUpgrades();
@ -1984,6 +1991,7 @@ Maybe<WorkerPoolPromise<WorldServerThreadPtr>> UniverseServer::shipWorldPromise(
shipWorld->setSpawningEnabled(false); shipWorld->setSpawningEnabled(false);
shipWorld->setProperty("invinciblePlayers", true); shipWorld->setProperty("invinciblePlayers", true);
shipWorld->setProperty("ship.level", 0); shipWorld->setProperty("ship.level", 0);
shipWorld->setProperty("ship.species", species);
shipWorld->setProperty("ship.fuel", 0); shipWorld->setProperty("ship.fuel", 0);
shipWorld->setProperty("ship.maxFuel", currentUpgrades.maxFuel); shipWorld->setProperty("ship.maxFuel", currentUpgrades.maxFuel);
shipWorld->setProperty("ship.crewSize", currentUpgrades.crewSize); shipWorld->setProperty("ship.crewSize", currentUpgrades.crewSize);