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 hota quests

Browse Source
This commit is contained in:
nordsoft
2023-10-14 00:15:15 +02:00
parent 5f52e6b35e
commit 4651893b48
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/mapObjects/CQuest.cpp
View File

@@ -261,6 +261,9 @@ void CQuest::addTextReplacements(MetaString & text, std::vector<Component> & com
text.replaceRawString(loot.buildList()); text.replaceRawString(loot.buildList());
} }
if(lastDay >= 0)
text.replaceNumber(lastDay - IObjectInterface::cb->getDate(Date::DAY));
} }
void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components, bool firstVisit, const CGHeroInstance * h) const void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components, bool firstVisit, const CGHeroInstance * h) const
@@ -273,6 +276,9 @@ void CQuest::getVisitText(MetaString &iwText, std::vector<Component> &components
else if(failRequirements) else if(failRequirements)
iwText.appendRawString(nextVisitText.toString()); iwText.appendRawString(nextVisitText.toString());
if(lastDay >= 0)
iwText.appendTextID(TextIdentifier("core", "seerhut", "time", textOption).get());
addTextReplacements(iwText, components); addTextReplacements(iwText, components);
} }
@@ -283,7 +289,7 @@ void CQuest::getRolloverText(MetaString &ms, bool onHover) const
std::string questState = missionState(onHover ? 3 : 4); std::string questState = missionState(onHover ? 3 : 4);
ms.appendRawString(VLC->generaltexth->translate("core.seerhut.quest", questName, questState, textOption)); ms.appendTextID(TextIdentifier("core", "seerhut", "quest", questName, questState, textOption).get());
std::vector<Component> components; std::vector<Component> components;
addTextReplacements(ms, components); addTextReplacements(ms, components);

2
lib/mapping/MapFormatH3M.cpp
View File

@@ -2074,7 +2074,7 @@ int CMapLoaderH3M::readQuest(IQuestObject * guard, const int3 & position)
if(missionSubID == 1) if(missionSubID == 1)
{ {
missionId = int(EQuestMission::HOTA_REACH_DATE); missionId = int(EQuestMission::HOTA_REACH_DATE);
guard->quest->mission.daysPassed = reader->readUInt32(); guard->quest->mission.daysPassed = reader->readUInt32() + 1;
break; break;
} }
break; break;