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

Taking artifacts as a reward

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-01 18:09:27 +03:00
parent 5dec3efa2f
commit 6688d28198
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/rewardable/Info.cpp
View File

@@ -183,6 +183,7 @@ void Rewardable::Info::configureReward(Rewardable::Configuration & object, vstd:
reward.secondary = randomizer.loadSecondaries(source["secondary"], rng, variables);
reward.grantedArtifacts = randomizer.loadArtifacts(source["artifacts"], rng, variables);
reward.takenArtifacts = randomizer.loadArtifacts(source["takenArtifacts"], rng, variables);
reward.scrolls = randomizer.loadSpells(source["scrolls"], rng, variables);
reward.spells = randomizer.loadSpells(source["spells"], rng, variables);
reward.creatures = randomizer.loadCreatures(source["creatures"], rng, variables);

18
lib/rewardable/Interface.cpp
View File

@@ -166,6 +166,24 @@ void Rewardable::Interface::grantRewardAfterLevelup(const Rewardable::VisitInfo
for(const ArtifactID & art : info.reward.grantedArtifacts)
cb->giveHeroNewArtifact(hero, art, ArtifactPosition::FIRST_AVAILABLE);
for(const ArtifactID & art : info.reward.takenArtifacts)
{
// hero does not have such artifact alone, but he might have it as part of assembled artifact
if(!hero->hasArt(art))
{
const auto * assembly = hero->getCombinedArtWithPart(art);
if (assembly)
{
DisassembledArtifact da;
da.al = ArtifactLocation(hero->id, hero->getArtPos(assembly));
cb->sendAndApply(da);
}
}
if(hero->hasArt(art))
cb->removeArtifact(ArtifactLocation(hero->id, hero->getArtPos(art, false)));
}
for(const SpellID & spell : info.reward.scrolls)
cb->giveHeroNewScroll(hero, spell, ArtifactPosition::FIRST_AVAILABLE);

4
lib/rewardable/Reward.cpp
View File

@@ -114,6 +114,9 @@ void Rewardable::Reward::loadComponents(std::vector<Component> & comps, const CG
for(const auto & entry : grantedArtifacts)
comps.emplace_back(ComponentType::ARTIFACT, entry);
for(const auto & entry : takenArtifacts)
comps.emplace_back(ComponentType::ARTIFACT, entry);
for(const SpellID & spell : scrolls)
comps.emplace_back(ComponentType::SPELL, spell);
@@ -145,6 +148,7 @@ void Rewardable::Reward::serializeJson(JsonSerializeFormat & handler)
handler.serializeInt("manaOverflowFactor", manaOverflowFactor);
handler.serializeInt("movePoints", movePoints);
handler.serializeIdArray("artifacts", grantedArtifacts);
handler.serializeIdArray("takenArtifacts", takenArtifacts);
handler.serializeIdArray("scrolls", scrolls);
handler.serializeIdArray("spells", spells);
handler.enterArray("creatures").serializeStruct(creatures);