games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-23 12:08:45 +02:00
Code Issues Releases Activity

Hota-related bugs were fixed

Browse Source
This commit is contained in:
nordsoft 2023-10-13 12:52:45 +02:00
parent 9108f7e3e5
commit 2bf8cdc9f5
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/mapObjects/CQuest.cpp
View File

@ -60,7 +60,7 @@ static std::string visitedTxt(const bool visited)
const std::string & CQuest::missionName(int mission) const std::string & CQuest::missionName(int mission)
{ {
static const std::array<std::string, 11> names = { static const std::array<std::string, 13> names = {
"empty", "empty",
"heroLevel", "heroLevel",
"primarySkill", "primarySkill",
@ -71,7 +71,9 @@ const std::string & CQuest::missionName(int mission)
"bringResources", "bringResources",
"bringHero", "bringHero",
"bringPlayer", "bringPlayer",
"keymaster" "keymaster",
"hota",
"other"
}; };
if(static_cast<size_t>(mission) < names.size()) if(static_cast<size_t>(mission) < names.size())
@ -299,6 +301,7 @@ void CQuest::defineQuestName()
{ {
//standard quests //standard quests
questName = CQuest::missionName(0); questName = CQuest::missionName(0);
if(mission != Rewardable::Limiter{}) questName = CQuest::missionName(12);
if(mission.heroLevel > 0) questName = CQuest::missionName(1); if(mission.heroLevel > 0) questName = CQuest::missionName(1);
for(auto & s : mission.primary) if(s) questName = CQuest::missionName(2); for(auto & s : mission.primary) if(s) questName = CQuest::missionName(2);
if(!mission.spells.empty()) questName = CQuest::missionName(2); if(!mission.spells.empty()) questName = CQuest::missionName(2);
@ -310,6 +313,7 @@ void CQuest::defineQuestName()
if(mission.resources.nonZero()) questName = CQuest::missionName(7); if(mission.resources.nonZero()) questName = CQuest::missionName(7);
if(!mission.heroes.empty()) questName = CQuest::missionName(8); if(!mission.heroes.empty()) questName = CQuest::missionName(8);
if(!mission.players.empty()) questName = CQuest::missionName(9); if(!mission.players.empty()) questName = CQuest::missionName(9);
if(mission.daysPassed > 0 || !mission.heroClasses.empty()) questName = CQuest::missionName(11);
} }
void CQuest::addKillTargetReplacements(MetaString &out) const void CQuest::addKillTargetReplacements(MetaString &out) const
@ -425,10 +429,6 @@ void CGSeerHut::setObjToKill()
quest->heroName = getHeroToKill(false)->getNameTranslated(); quest->heroName = getHeroToKill(false)->getNameTranslated();
quest->heroPortrait = getHeroToKill(false)->getPortraitSource(); quest->heroPortrait = getHeroToKill(false)->getPortraitSource();
} }
quest->getCompletionText(configuration.onSelect);
for(auto & i : configuration.info)
quest->getCompletionText(i.message);
} }
void CGSeerHut::init(CRandomGenerator & rand) void CGSeerHut::init(CRandomGenerator & rand)
@ -470,6 +470,10 @@ void CGSeerHut::initObj(CRandomGenerator & rand)
if(!quest->isCustomComplete) if(!quest->isCustomComplete)
quest->completedText.appendTextID(TextIdentifier("core", "seerhut", "quest", quest-> questName, quest->missionState(2), quest->textOption).get()); quest->completedText.appendTextID(TextIdentifier("core", "seerhut", "quest", quest-> questName, quest->missionState(2), quest->textOption).get());
} }
quest->getCompletionText(configuration.onSelect);
for(auto & i : configuration.info)
quest->getCompletionText(i.message);
} }
void CGSeerHut::getRolloverText(MetaString &text, bool onHover) const void CGSeerHut::getRolloverText(MetaString &text, bool onHover) const

1
lib/mapping/MapFormatH3M.cpp
View File

@ -1830,6 +1830,7 @@ CGObjectInstance * CMapLoaderH3M::readSeerHut(const int3 & position, const Objec
if(features.levelHOTA3) if(features.levelHOTA3)
{ {
uint32_t repeateableQuestsCount = reader->readUInt32(); uint32_t repeateableQuestsCount = reader->readUInt32();
hut->quest->repeatedQuest = repeateableQuestsCount != 0;
if(repeateableQuestsCount != 0) if(repeateableQuestsCount != 0)
logGlobal->warn("Map '%s': Seer Hut at %s - %d repeatable quests are not implemented!", mapName, position.toString(), repeateableQuestsCount); logGlobal->warn("Map '%s': Seer Hut at %s - %d repeatable quests are not implemented!", mapName, position.toString(), repeateableQuestsCount);

2
lib/rewardable/Limiter.cpp
View File

@ -72,7 +72,7 @@ bool Rewardable::Limiter::heroAllowed(const CGHeroInstance * hero) const
if(daysPassed != 0) if(daysPassed != 0)
{ {
if (IObjectInterface::cb->getDate(Date::DAY) < daysPassed) if (IObjectInterface::cb->getDate(Date::DAY) <= daysPassed)
return false; return false;
} }