games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00
Code Issues Releases Activity

Merge pull request #5706 from IvanSavenko/antagarich

Browse Source 
Fix missing messages on events without guards on .vmap's (e.g. Antagarich Burning)
This commit is contained in:
Ivan Savenko
2025-05-14 11:52:52 +03:00
committed by GitHub
parent a13ab8f013 79591ac587
commit c62e1d289e
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/mapObjects/CGPandoraBox.cpp
View File

@@ -36,7 +36,7 @@ void CGPandoraBox::init()
for(auto & i : configuration.info)
{
i.reward.removeObject = true;
if(!message.empty() && i.message.empty())
if(!message.empty() && i.message.empty() && stacksCount() == 0)
i.message = message;
}
}
@@ -219,7 +219,6 @@ void CGPandoraBox::serializeJsonOptions(JsonSerializeFormat & handler)
if(!handler.getCurrent()["guards"].Vector().empty())
CCreatureSet::serializeJson(handler, "guards", 7);
bool hasSomething = false;
Rewardable::VisitInfo vinfo;
vinfo.visitType = Rewardable::EEventType::EVENT_FIRST_VISIT;
@@ -239,11 +238,7 @@ void CGPandoraBox::serializeJsonOptions(JsonSerializeFormat & handler)
{
auto s = handler.enterStruct("primarySkills");
for(int idx = 0; idx < vinfo.reward.primary.size(); idx ++)
{
handler.serializeInt(NPrimarySkill::names[idx], vinfo.reward.primary[idx], 0);
if(vinfo.reward.primary[idx])
hasSomething = true;
}
}
handler.serializeIdArray("artifacts", vinfo.reward.grantedArtifacts);
@@ -274,18 +269,8 @@ void CGPandoraBox::serializeJsonOptions(JsonSerializeFormat & handler)
vinfo.reward.secondary[rawId] = level;
}
}
hasSomething = hasSomething
|| vinfo.reward.heroExperience
|| vinfo.reward.manaDiff
|| vinfo.reward.resources.nonZero()
|| !vinfo.reward.grantedArtifacts.empty()
|| !vinfo.reward.heroBonuses.empty()
|| !vinfo.reward.creatures.empty()
|| !vinfo.reward.secondary.empty();
if(hasSomething)
configuration.info.push_back(vinfo);
configuration.info.push_back(vinfo);
}
}
@@ -297,7 +282,7 @@ void CGEvent::init()
for(auto & i : configuration.info)
{
i.reward.removeObject = removeAfterVisit;
if(!message.empty() && i.message.empty())
if(!message.empty() && i.message.empty() && stacksCount() == 0)
i.message = message;
}
}