games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Fix obelisks puzzle revealing

Browse Source 
Teams and players were messed up in lib; hardcoded constants were refactored.
This commit is contained in:
Vadim Markovtsev 2016-01-20 10:44:13 +03:00
parent e4b73180bd
commit 10f888a483
8 changed files with 95 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/VCAI/Goals.cpp
View File

@ -275,7 +275,7 @@ TSubgoal Win::whatToDoToAchieve()
// 0.85 -> radius now 2 tiles // 0.85 -> radius now 2 tiles
// 0.95 -> 1 tile radius, position is fully known // 0.95 -> 1 tile radius, position is fully known
// AFAIK H3 AI does something like this // AFAIK H3 AI does something like this
int3 grailPos = cb->getGrailPos(ratio); int3 grailPos = cb->getGrailPos(&ratio);
if(ratio > 0.99) if(ratio > 0.99)
{ {
return sptr (Goals::DigAtTile(grailPos)); return sptr (Goals::DigAtTile(grailPos));

2
client/CPlayerInterface.cpp
View File

@ -2170,7 +2170,7 @@ void CPlayerInterface::showPuzzleMap()
//TODO: interface should not know the real position of Grail... //TODO: interface should not know the real position of Grail...
double ratio = 0; double ratio = 0;
int3 grailPos = cb->getGrailPos(ratio); int3 grailPos = cb->getGrailPos(&ratio);
GH.pushInt(new CPuzzleWindow(grailPos, ratio)); GH.pushInt(new CPuzzleWindow(grailPos, ratio));
} }

8
lib/CGameInfoCallback.cpp
View File

@ -723,15 +723,16 @@ int CPlayerSpecificInfoCallback::getHeroSerial(const CGHeroInstance * hero, bool
return -1; return -1;
} }
int3 CPlayerSpecificInfoCallback::getGrailPos( double &outKnownRatio ) int3 CPlayerSpecificInfoCallback::getGrailPos( double *outKnownRatio )
{ {
if (!player || CGObelisk::obeliskCount == 0) if (!player || CGObelisk::obeliskCount == 0)
{ {
outKnownRatio = 0.0; *outKnownRatio = 0.0;
} }
else else
{ {
outKnownRatio = static_cast<double>(CGObelisk::visited[gs->getPlayerTeam(*player)->id]) / CGObelisk::obeliskCount; *outKnownRatio = static_cast<double>(CGObelisk::visited[gs->getPlayerTeam(*player)->id])
/ CGObelisk::obeliskCount;
} }
return gs->map->grailPos; return gs->map->grailPos;
} }
@ -964,4 +965,3 @@ void IGameEventRealizer::setObjProperty(ObjectInstanceID objid, int prop, si64 v
sob.val = static_cast<ui32>(val); sob.val = static_cast<ui32>(val);
commitPackage(&sob); commitPackage(&sob);
} }

3
lib/CGameInfoCallback.h
View File

@ -125,7 +125,7 @@ class DLL_LINKAGE CPlayerSpecificInfoCallback : public CGameInfoCallback
public: public:
int howManyTowns() const; int howManyTowns() const;
int howManyHeroes(bool includeGarrisoned = true) const; int howManyHeroes(bool includeGarrisoned = true) const;
int3 getGrailPos(double &outKnownRatio); int3 getGrailPos(double *outKnownRatio);
boost::optional<PlayerColor> getMyColor() const; boost::optional<PlayerColor> getMyColor() const;
std::vector <const CGTownInstance *> getTownsInfo(bool onlyOur = true) const; //true -> only owned; false -> all visible std::vector <const CGTownInstance *> getTownsInfo(bool onlyOur = true) const; //true -> only owned; false -> all visible
@ -154,4 +154,3 @@ public:
virtual void showInfoDialog(const std::string &msg, PlayerColor player); virtual void showInfoDialog(const std::string &msg, PlayerColor player);
}; };

6
lib/mapObjects/CQuest.cpp
View File

@ -533,7 +533,7 @@ void CGSeerHut::newTurn() const
{ {
if (quest->lastDay >= 0 && quest->lastDay < cb->getDate()-1) //time is up if (quest->lastDay >= 0 && quest->lastDay < cb->getDate()-1) //time is up
{ {
cb->setObjProperty (id, 10, CQuest::COMPLETE); cb->setObjProperty (id, CGSeerHut::OBJPROP_VISITED, CQuest::COMPLETE);
} }
} }
@ -550,7 +550,7 @@ void CGSeerHut::onHeroVisit( const CGHeroInstance * h ) const
if (firstVisit) if (firstVisit)
{ {
isCustom = quest->isCustomFirst; isCustom = quest->isCustomFirst;
cb->setObjProperty (id, 10, CQuest::IN_PROGRESS); cb->setObjProperty (id, CGSeerHut::OBJPROP_VISITED, CQuest::IN_PROGRESS);
AddQuest aq; AddQuest aq;
aq.quest = QuestInfo (quest, this, visitablePos()); aq.quest = QuestInfo (quest, this, visitablePos());
@ -645,7 +645,7 @@ void CGSeerHut::finishQuest(const CGHeroInstance * h, ui32 accept) const
default: default:
break; break;
} }
cb->setObjProperty (id, 10, CQuest::COMPLETE); //mission complete cb->setObjProperty (id, CGSeerHut::OBJPROP_VISITED, CQuest::COMPLETE); //mission complete
completeQuest(h); //make sure to remove QuestGuard at the very end completeQuest(h); //make sure to remove QuestGuard at the very end
} }
} }

2
lib/mapObjects/CQuest.h
View File

@ -118,6 +118,8 @@ public:
h & rewardType & rID & rVal & seerName; h & rewardType & rID & rVal & seerName;
} }
protected: protected:
static constexpr int OBJPROP_VISITED = 10;
void setPropertyDer(ui8 what, ui32 val) override; void setPropertyDer(ui8 what, ui32 val) override;
}; };

34
lib/mapObjects/MiscObjects.cpp
View File

@ -60,7 +60,7 @@ static std::string & visitedTxt(const bool visited)
void CPlayersVisited::setPropertyDer( ui8 what, ui32 val ) void CPlayersVisited::setPropertyDer( ui8 what, ui32 val )
{ {
if(what == 10) if(what == CPlayersVisited::OBJPROP_VISITED)
players.insert(PlayerColor(val)); players.insert(PlayerColor(val));
} }
@ -1310,7 +1310,7 @@ void CGWitchHut::onHeroVisit( const CGHeroInstance * h ) const
iw.soundID = soundBase::gazebo; iw.soundID = soundBase::gazebo;
iw.player = h->getOwner(); iw.player = h->getOwner();
if(!wasVisited(h->tempOwner)) if(!wasVisited(h->tempOwner))
cb->setObjProperty(id, 10, h->tempOwner.getNum()); cb->setObjProperty(id, CGWitchHut::OBJPROP_VISITED, h->tempOwner.getNum());
ui32 txt_id; ui32 txt_id;
if(h->getSecSkillLevel(SecondarySkill(ability))) //you already know this skill if(h->getSecSkillLevel(SecondarySkill(ability))) //you already know this skill
{ {
@ -1420,7 +1420,7 @@ void CGShrine::onHeroVisit( const CGHeroInstance * h ) const
} }
if(!wasVisited(h->tempOwner)) if(!wasVisited(h->tempOwner))
cb->setObjProperty(id, 10, h->tempOwner.getNum()); cb->setObjProperty(id, CGShrine::OBJPROP_VISITED, h->tempOwner.getNum());
InfoWindow iw; InfoWindow iw;
iw.soundID = soundBase::temple; iw.soundID = soundBase::temple;
@ -1821,7 +1821,7 @@ void CCartographer::blockingDialogAnswered(const CGHeroInstance *hero, ui32 answ
//water = 0; land = 1; underground = 2; //water = 0; land = 1; underground = 2;
cb->getAllTiles (fw.tiles, hero->tempOwner, subID - 1, !subID + 1); //reveal appropriate tiles cb->getAllTiles (fw.tiles, hero->tempOwner, subID - 1, !subID + 1); //reveal appropriate tiles
cb->sendAndApply (&fw); cb->sendAndApply (&fw);
cb->setObjProperty (id, 10, hero->tempOwner.getNum()); cb->setObjProperty (id, CCartographer::OBJPROP_VISITED, hero->tempOwner.getNum());
} }
} }
@ -1843,11 +1843,13 @@ void CGObelisk::onHeroVisit( const CGHeroInstance * h ) const
iw.text.addTxt(MetaString::ADVOB_TXT, 96); iw.text.addTxt(MetaString::ADVOB_TXT, 96);
cb->sendAndApply(&iw); cb->sendAndApply(&iw);
cb->setObjProperty(id, 20, h->tempOwner.getNum()); //increment general visited obelisks counter // increment general visited obelisks counter
cb->setObjProperty(id, CGObelisk::OBJPROP_INC, team.getNum());
openWindow(OpenWindow::PUZZLE_MAP, h->tempOwner.getNum()); openWindow(OpenWindow::PUZZLE_MAP, h->tempOwner.getNum());
cb->setObjProperty(id, 10, h->tempOwner.getNum()); //mark that particular obelisk as visited // mark that particular obelisk as visited
cb->setObjProperty(id, CGObelisk::OBJPROP_VISITED, h->tempOwner.getNum());
} }
else else
{ {
@ -1869,19 +1871,25 @@ std::string CGObelisk::getHoverText(PlayerColor player) const
void CGObelisk::setPropertyDer( ui8 what, ui32 val ) void CGObelisk::setPropertyDer( ui8 what, ui32 val )
{ {
CPlayersVisited::setPropertyDer(what, val);
switch(what) switch(what)
{ {
case 20: case CGObelisk::OBJPROP_INC:
assert(val < PlayerColor::PLAYER_LIMIT_I);
visited[TeamID(val)]++;
if(visited[TeamID(val)] > obeliskCount)
{ {
logGlobal->errorStream() << "Error: Visited " << visited[TeamID(val)] << "\t\t" << obeliskCount; assert(val < PlayerColor::PLAYER_LIMIT_I);
auto progress = ++visited[TeamID(val)];
logGlobal->debugStream() << boost::format("Player %d: obelisk progress %d / %d")
% val % static_cast<int>(progress) % static_cast<int>(obeliskCount);
if(progress > obeliskCount)
{
logGlobal->errorStream() << "Error: Visited " << progress << "\t\t" << obeliskCount;
assert(0); assert(0);
} }
break;
}
default:
CPlayersVisited::setPropertyDer(what, val);
break; break;
} }
} }

3
lib/mapObjects/MiscObjects.h
View File

@ -28,6 +28,8 @@ public:
h & static_cast<CGObjectInstance&>(*this); h & static_cast<CGObjectInstance&>(*this);
h & players; h & players;
} }
static constexpr int OBJPROP_VISITED = 10;
}; };
class DLL_LINKAGE CGCreature : public CArmedInstance //creatures on map class DLL_LINKAGE CGCreature : public CArmedInstance //creatures on map
@ -451,6 +453,7 @@ class DLL_LINKAGE CGDenOfthieves : public CGObjectInstance
class DLL_LINKAGE CGObelisk : public CPlayersVisited class DLL_LINKAGE CGObelisk : public CPlayersVisited
{ {
public: public:
static constexpr int OBJPROP_INC = 20;
static ui8 obeliskCount; //how many obelisks are on map static ui8 obeliskCount; //how many obelisks are on map
static std::map<TeamID, ui8> visited; //map: team_id => how many obelisks has been visited static std::map<TeamID, ui8> visited; //map: team_id => how many obelisks has been visited