games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

Discharging conditions

Browse Source
This commit is contained in:
SoundSSGood
2025-05-14 15:07:21 +02:00
parent fcc9b8ecfa
commit f614a8a7f5
10 changed files with 123 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/gameState/GameStatePackVisitor.cpp
View File

@@ -926,6 +926,14 @@ void GameStatePackVisitor::visitDischargeArtifact(DischargeArtifact & pack)
auto artInst = gs.getArtInstance(pack.id);
assert(artInst);
artInst->discharge(pack.charges);
if(artInst->getType()->getRemoveOnDepletion() && artInst->getCharges() == 0 && pack.artLoc.has_value())
{
BulkEraseArtifacts ePack;
ePack.artHolder = pack.artLoc.value().artHolder;
ePack.creature = pack.artLoc.value().creature;
ePack.posPack.push_back(pack.artLoc.value().slot);
ePack.visit(*this);
}
}
void GameStatePackVisitor::visitAssembledArtifact(AssembledArtifact & pack)
@@ -1341,14 +1349,14 @@ void GameStatePackVisitor::visitBattleResultsApplied(BattleResultsApplied & pack
{
pack.learnedSpells.visit(*this);
for(auto & movingPack : pack.movingArtifacts)
movingPack.visit(*this);
for(auto & discharging : pack.dischargingArtifacts)
discharging.visit(*this);
for(auto & growing : pack.growingArtifacts)
growing.visit(*this);
for(auto & discharging : pack.dischargingArtifacts)
discharging.visit(*this);
for(auto & movingPack : pack.movingArtifacts)
movingPack.visit(*this);
const auto currentBattle = std::find_if(gs.currentBattles.begin(), gs.currentBattles.end(),
[&](const auto & battle)