games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix quest regressions

Browse Source
This commit is contained in:
nordsoft
2023-10-09 02:19:58 +02:00
parent 3f3c079c0e
commit 0cf3205e15
2 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
lib/mapObjects/CQuest.cpp
View File

@@ -178,6 +178,49 @@ bool CQuest::checkQuest(const CGHeroInstance * h) const
} }
} }
void CQuest::completeQuest(IGameCallback * cb, const CGHeroInstance *h) const
{
switch (missionType)
{
case CQuest::MISSION_ART:
for(auto & elem : m5arts)
{
if(h->hasArt(elem))
{
cb->removeArtifact(ArtifactLocation(h, h->getArtPos(elem, false)));
}
else
{
const auto * assembly = h->getAssemblyByConstituent(elem);
assert(assembly);
auto parts = assembly->getPartsInfo();
// Remove the assembly
cb->removeArtifact(ArtifactLocation(h, h->getArtPos(assembly)));
// Disassemble this backpack artifact
for(const auto & ci : parts)
{
if(ci.art->getTypeId() != elem)
cb->giveHeroNewArtifact(h, ci.art->artType, ArtifactPosition::BACKPACK_START);
}
}
}
break;
case CQuest::MISSION_ARMY:
cb->takeCreatures(h->id, m6creatures);
break;
case CQuest::MISSION_RESOURCES:
for (int i = 0; i < 7; ++i)
{
cb->giveResource(h->getOwner(), static_cast<EGameResID>(i), -static_cast<int>(m7resources[i]));
}
break;
default:
break;
}
}
void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components, bool isCustom, bool firstVisit, const CGHeroInstance * h) const void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components, bool isCustom, bool firstVisit, const CGHeroInstance * h) const
{ {
MetaString text; MetaString text;
@@ -590,9 +633,9 @@ void CGSeerHut::initObj(CRandomGenerator & rand)
if(!quest->isCustomFirst) if(!quest->isCustomFirst)
quest->firstVisitText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(0), quest->textOption).get()); quest->firstVisitText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(0), quest->textOption).get());
if(!quest->isCustomNext) if(!quest->isCustomNext)
quest->firstVisitText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(1), quest->textOption).get()); quest->nextVisitText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(1), quest->textOption).get());
if(!quest->isCustomComplete) if(!quest->isCustomComplete)
quest->firstVisitText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(2), quest->textOption).get()); quest->completedText.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, quest->missionState(2), quest->textOption).get());
} }
else else
{ {
@@ -758,11 +801,6 @@ int CGSeerHut::checkDirection() const
} }
} }
void CGSeerHut::completeQuest() const //reward
{
cb->setObjProperty(id, CGSeerHut::OBJPROP_VISITED, CQuest::COMPLETE); //mission complete
}
const CGHeroInstance * CGSeerHut::getHeroToKill(bool allowNull) const const CGHeroInstance * CGSeerHut::getHeroToKill(bool allowNull) const
{ {
const CGObjectInstance *o = cb->getObjByQuestIdentifier(quest->m13489val); const CGObjectInstance *o = cb->getObjByQuestIdentifier(quest->m13489val);
@@ -785,7 +823,10 @@ void CGSeerHut::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answer)
{ {
CRewardableObject::blockingDialogAnswered(hero, answer); CRewardableObject::blockingDialogAnswered(hero, answer);
if(answer) if(answer)
completeQuest(); {
quest->completeQuest(cb, hero);
cb->setObjProperty(id, CGSeerHut::OBJPROP_VISITED, CQuest::COMPLETE); //mission complete
}
} }
void CGSeerHut::afterAddToMap(CMap* map) void CGSeerHut::afterAddToMap(CMap* map)

4
lib/mapObjects/CQuest.h
View File

@@ -83,7 +83,7 @@ public:
virtual void getVisitText (MetaString &text, std::vector<Component> &components, bool isCustom, bool FirstVisit, const CGHeroInstance * h = nullptr) const; virtual void getVisitText (MetaString &text, std::vector<Component> &components, bool isCustom, bool FirstVisit, const CGHeroInstance * h = nullptr) const;
virtual void getCompletionText(MetaString &text) const; virtual void getCompletionText(MetaString &text) const;
virtual void getRolloverText (MetaString &text, bool onHover) const; //hover or quest log entry virtual void getRolloverText (MetaString &text, bool onHover) const; //hover or quest log entry
virtual void completeQuest (const CGHeroInstance * h) const {}; virtual void completeQuest(IGameCallback *, const CGHeroInstance * h) const;
virtual void addReplacements(MetaString &out, const std::string &base) const; virtual void addReplacements(MetaString &out, const std::string &base) const;
void addArtifactID(const ArtifactID & id); void addArtifactID(const ArtifactID & id);
@@ -156,8 +156,6 @@ public:
const CGHeroInstance *getHeroToKill(bool allowNull = false) const; const CGHeroInstance *getHeroToKill(bool allowNull = false) const;
const CGCreature *getCreatureToKill(bool allowNull = false) const; const CGCreature *getCreatureToKill(bool allowNull = false) const;
void getRolloverText (MetaString &text, bool onHover) const; void getRolloverText (MetaString &text, bool onHover) const;
void finishQuest (const CGHeroInstance * h, ui32 accept) const; //common for both objects
virtual void completeQuest() const;
void afterAddToMap(CMap * map) override; void afterAddToMap(CMap * map) override;