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

Merge pull request #5720 from SoundSSGood/artifact-charges

Browse Source 
Charged artifacts
This commit is contained in:
Ivan Savenko
2025-05-21 13:49:14 +03:00
committed by GitHub
parent 184e841b16 e85b1d4c1c
commit 323231fc30
28 changed files with 480 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/gameState/GameStatePackVisitor.cpp
View File

@@ -820,6 +820,13 @@ void GameStatePackVisitor::visitBulkRebalanceStacks(BulkRebalanceStacks & pack)
move.visit(*this);
}
void GameStatePackVisitor::visitGrowUpArtifact(GrowUpArtifact & pack)
{
auto artInst = gs.getArtInstance(pack.id);
assert(artInst);
artInst->growingUp();
}
void GameStatePackVisitor::visitPutArtifact(PutArtifact & pack)
{
auto art = gs.getArtInstance(pack.id);
@@ -914,6 +921,21 @@ void GameStatePackVisitor::visitBulkMoveArtifacts(BulkMoveArtifacts & pack)
bulkArtsPut(pack.artsPack0, artInitialSetLeft, *rightSet);
}
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)
{
auto artSet = gs.getArtSet(pack.al.artHolder);
@@ -1217,22 +1239,6 @@ void GameStatePackVisitor::visitBattleResultAccepted(BattleResultAccepted & pack
if(const auto defenderHero = gs.getHero(pack.heroResult[BattleSide::DEFENDER].heroID))
defenderHero->removeBonusesRecursive(Bonus::OneBattle);
if(pack.winnerSide != BattleSide::NONE)
{
// Grow up growing artifacts
if(const auto winnerHero = gs.getHero(pack.heroResult[pack.winnerSide].heroID))
{
if(winnerHero->getCommander() && winnerHero->getCommander()->alive)
{
for(auto & art : winnerHero->getCommander()->artifactsWorn)
gs.getArtInstance(art.second.getID())->growingUp();
}
for(auto & art : winnerHero->artifactsWorn)
gs.getArtInstance(art.second.getID())->growingUp();
}
}
if(gs.getSettings().getBoolean(EGameSettings::MODULE_STACK_EXPERIENCE))
{
if(const auto attackerArmy = gs.getArmyInstance(pack.heroResult[BattleSide::ATTACKER].armyID))
@@ -1343,8 +1349,14 @@ void GameStatePackVisitor::visitBattleResultsApplied(BattleResultsApplied & pack
{
pack.learnedSpells.visit(*this);
for(auto & artPack : pack.artifacts)
artPack.visit(*this);
for(auto & discharging : pack.dischargingArtifacts)
discharging.visit(*this);
for(auto & growing : pack.growingArtifacts)
growing.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)