games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-27 21:49:10 +02:00
Code Issues Releases Activity

Fix: Skyship Grail should work immediately after capturing without battle

Browse Source
This commit is contained in:
Dmitry Orlov 2021-10-29 11:45:10 +03:00 committed by Andrii Danylchenko
parent e219e1febf
commit e4c2f0c822
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/mapObjects/CGTownInstance.cpp
View File

@ -683,7 +683,8 @@ void CGTownInstance::onHeroVisit(const CGHeroInstance * h) const
else
{
auto heroColor = h->getOwner();
setOwner(heroColor);
onTownCaptured(heroColor);
if(cb->gameState()->getPlayerStatus(heroColor) == EPlayerStatus::WINNER)
{
return; //we just won game, we do not need to perform any extra actions
@ -1362,7 +1363,7 @@ void CGTownInstance::setGarrisonedHero(CGHeroInstance *h)
bool CGTownInstance::armedGarrison() const
{
return stacksCount() || garrisonHero;
return !stacks.empty() || garrisonHero;
}
const CTown * CGTownInstance::getTown() const
@ -1526,18 +1527,21 @@ void CGTownInstance::battleFinished(const CGHeroInstance * hero, const BattleRes
{
if(result.winner == BattleSide::ATTACKER)
{
auto heroColor = hero->getOwner(); //get tempOwner
clearArmy();
setOwner(heroColor); //give control after checkout is done
FoWChange fw;
fw.player = heroColor;
fw.mode = 1;
cb->getTilesInRange(fw.tiles, getSightCenter(), getSightRadius(), tempOwner, 1);
cb->sendAndApply(&fw);
onTownCaptured(hero->getOwner());
}
}
void CGTownInstance::onTownCaptured(const PlayerColor winner) const
{
setOwner(winner);
FoWChange fw;
fw.player = winner;
fw.mode = 1;
cb->getTilesInRange(fw.tiles, getSightCenter(), getSightRadius(), winner, 1);
cb->sendAndApply(& fw);
}
void CGTownInstance::afterAddToMap(CMap * map)
{
if(ID == Obj::TOWN)

3
lib/mapObjects/CGTownInstance.h
View File

@ -349,7 +349,7 @@ public:
void onHeroVisit(const CGHeroInstance * h) const override;
void onHeroLeave(const CGHeroInstance * h) const override;
void initObj(CRandomGenerator & rand) override;
void battleFinished(const CGHeroInstance *hero, const BattleResult &result) const override;
void battleFinished(const CGHeroInstance * hero, const BattleResult & result) const override;
std::string getObjectName() const override;
void afterAddToMap(CMap * map) override;
@ -365,6 +365,7 @@ protected:
private:
void setOwner(const PlayerColor owner) const;
void onTownCaptured(const PlayerColor winner) const;
int getDwellingBonus(const std::vector<CreatureID>& creatureIds, const std::vector<ConstTransitivePtr<CGDwelling> >& dwellings) const;
void updateBonusingBuildings();
bool hasBuiltInOldWay(ETownType::ETownType type, BuildingID bid) const;

3
server/CGameHandler.cpp
View File

@ -1982,7 +1982,8 @@ void CGameHandler::newTurn()
{
n.res[player] = n.res[player] + t->dailyIncome();
}
if (t->hasBuilt(BuildingID::GRAIL, ETownType::TOWER))
if(t->hasBuilt(BuildingID::GRAIL)
&& t->town->buildings.at(BuildingID::GRAIL)->height == CBuilding::HEIGHT_SKYSHIP)
{
// Skyship, probably easier to handle same as Veil of darkness
//do it every new day after veils apply