games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

Merge pull request #2142 from IvanSavenko/fix_artifact_bonuses

Browse Source 
Fix broken bonuses of new artifacts
This commit is contained in:
Ivan Savenko
2023-05-10 01:32:47 +03:00
committed by GitHub
parent cb8201876b 79982c4ad4
commit 2a7278f45c
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/NetPacksLib.cpp
View File

@@ -1793,6 +1793,9 @@ void BulkSmartRebalanceStacks::applyGs(CGameState * gs)
void PutArtifact::applyGs(CGameState *gs) void PutArtifact::applyGs(CGameState *gs)
{ {
assert(art->canBePutAt(al)); assert(art->canBePutAt(al));
// Ensure that artifact has been correctly added via NewArtifact pack
assert(vstd::contains(gs->map->artInstances, art));
assert(!art->getParentNodes().empty());
art->putAt(al); art->putAt(al);
//al.hero->putArtifact(al.slot, art); //al.hero->putArtifact(al.slot, art);
} }

28
server/CGameHandler.cpp
View File

@@ -6793,8 +6793,21 @@ void CGameHandler::putArtifact(const ArtifactLocation &al, const CArtifactInstan
bool CGameHandler::giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * artType, ArtifactPosition pos) bool CGameHandler::giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact * artType, ArtifactPosition pos)
{ {
assert(artType); assert(artType);
if(pos != ArtifactPosition::FIRST_AVAILABLE && !ArtifactUtils::isSlotBackpack(pos))
if(pos == ArtifactPosition::FIRST_AVAILABLE)
{
if(!artType->canBePutAt(h, ArtifactUtils::getArtAnyPosition(h, artType->getId())))
COMPLAIN_RET("Cannot put artifact in that slot!");
}
else if(ArtifactUtils::isSlotBackpack(pos))
{
if(!artType->canBePutAt(h, ArtifactUtils::getArtBackpackPosition(h, artType->getId())))
COMPLAIN_RET("Cannot put artifact in that slot!");
}
else
{
COMPLAIN_RET_FALSE_IF(!artType->canBePutAt(h, pos, false), "Cannot put artifact in that slot!"); COMPLAIN_RET_FALSE_IF(!artType->canBePutAt(h, pos, false), "Cannot put artifact in that slot!");
}
CArtifactInstance * newArtInst = nullptr; CArtifactInstance * newArtInst = nullptr;
if(artType->canBeDisassembled()) if(artType->canBeDisassembled())
@@ -6803,18 +6816,15 @@ bool CGameHandler::giveHeroNewArtifact(const CGHeroInstance * h, const CArtifact
newArtInst = new CArtifactInstance(); newArtInst = new CArtifactInstance();
newArtInst->artType = artType; // *NOT* via settype -> all bonus-related stuff must be done by NewArtifact apply newArtInst->artType = artType; // *NOT* via settype -> all bonus-related stuff must be done by NewArtifact apply
NewArtifact na;
na.art = newArtInst;
sendAndApply(&na); // -> updates a!!!, will create a on other machines
if(giveHeroArtifact(h, newArtInst, pos)) if(giveHeroArtifact(h, newArtInst, pos))
{
NewArtifact na;
na.art = newArtInst;
sendAndApply(&na); // -> updates a!!!, will create a on other machines
return true; return true;
}
else else
{
delete newArtInst;
return false; return false;
}
} }
void CGameHandler::setBattleResult(BattleResult::EResult resultType, int victoriusSide) void CGameHandler::setBattleResult(BattleResult::EResult resultType, int victoriusSide)