games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Merge pull request #4061 from Laserlicht/hota_buildings

Browse Source 
Support HotA thives guild
This commit is contained in:
Ivan Savenko
2024-06-05 12:41:35 +03:00
committed by GitHub
parent 014857b58d 9c1ce214fc
commit a8dcbd8ff9
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/windows/CCastleInterface.cpp
View File

@ -744,6 +744,7 @@ void CCastleBuildings::buildingClicked(BuildingID building, BuildingSubID::EBuil
case BuildingID::SPECIAL_1: case BuildingID::SPECIAL_1:
case BuildingID::SPECIAL_2: case BuildingID::SPECIAL_2:
case BuildingID::SPECIAL_3: case BuildingID::SPECIAL_3:
case BuildingID::SPECIAL_4:
switch (subID) switch (subID)
{ {
case BuildingSubID::NONE: case BuildingSubID::NONE:
@ -808,6 +809,10 @@ void CCastleBuildings::buildingClicked(BuildingID building, BuildingSubID::EBuil
enterBlacksmith(ArtifactID::BALLISTA); enterBlacksmith(ArtifactID::BALLISTA);
break; break;
case BuildingSubID::THIEVES_GUILD:
enterAnyThievesGuild();
break;
default: default:
enterBuilding(building); enterBuilding(building);
break; break;

6
lib/CGameInfoCallback.cpp
View File

@ -224,15 +224,17 @@ void CGameInfoCallback::getThievesGuildInfo(SThievesGuildInfo & thi, const CGObj
ERROR_RET_IF(obj->ID == Obj::TOWN && !canGetFullInfo(obj), "Cannot get info about town guild object!"); ERROR_RET_IF(obj->ID == Obj::TOWN && !canGetFullInfo(obj), "Cannot get info about town guild object!");
//TODO: advmap object -> check if they're visited by our hero //TODO: advmap object -> check if they're visited by our hero
if(obj->ID == Obj::TOWN || obj->ID == Obj::TAVERN) if(obj->ID == Obj::TOWN || obj->ID == Obj::TAVERN)
{ {
int taverns = 0; int taverns = 0;
for(auto town : gs->players[*getPlayerID()].towns) for(auto town : gs->players[*getPlayerID()].towns)
{ {
if(town->hasBuilt(BuildingID::TAVERN)) if(town->hasBuilt(BuildingID::TAVERN))
taverns++; taverns++;
if(town->hasBuilt(BuildingSubID::THIEVES_GUILD))
taverns += 2;
} }
gs->obtainPlayersStats(thi, taverns); gs->obtainPlayersStats(thi, taverns);
} }
else if(obj->ID == Obj::DEN_OF_THIEVES) else if(obj->ID == Obj::DEN_OF_THIEVES)

3
lib/constants/Enumerations.h
View File

@ -50,6 +50,7 @@ namespace BuildingSubID
EXPERIENCE_VISITING_BONUS, EXPERIENCE_VISITING_BONUS,
LIGHTHOUSE, LIGHTHOUSE,
TREASURY, TREASURY,
THIEVES_GUILD,
CUSTOM_VISITING_BONUS, CUSTOM_VISITING_BONUS,
CUSTOM_VISITING_REWARD CUSTOM_VISITING_REWARD
}; };
@ -59,7 +60,7 @@ enum class EMarketMode : int8_t
{ {
RESOURCE_RESOURCE, RESOURCE_PLAYER, CREATURE_RESOURCE, RESOURCE_ARTIFACT, RESOURCE_RESOURCE, RESOURCE_PLAYER, CREATURE_RESOURCE, RESOURCE_ARTIFACT,
ARTIFACT_RESOURCE, ARTIFACT_EXP, CREATURE_EXP, CREATURE_UNDEAD, RESOURCE_SKILL, ARTIFACT_RESOURCE, ARTIFACT_EXP, CREATURE_EXP, CREATURE_UNDEAD, RESOURCE_SKILL,
MARTKET_AFTER_LAST_PLACEHOLDER MARKET_AFTER_LAST_PLACEHOLDER
}; };
enum class EAiTactic : int8_t enum class EAiTactic : int8_t

3
lib/constants/StringConstants.h
View File

@ -198,7 +198,8 @@ namespace MappedKeys
{ "knowledgeVisitingBonus", BuildingSubID::KNOWLEDGE_VISITING_BONUS }, { "knowledgeVisitingBonus", BuildingSubID::KNOWLEDGE_VISITING_BONUS },
{ "experienceVisitingBonus", BuildingSubID::EXPERIENCE_VISITING_BONUS }, { "experienceVisitingBonus", BuildingSubID::EXPERIENCE_VISITING_BONUS },
{ "lighthouse", BuildingSubID::LIGHTHOUSE }, { "lighthouse", BuildingSubID::LIGHTHOUSE },
{ "treasury", BuildingSubID::TREASURY } { "treasury", BuildingSubID::TREASURY },
{ "thievesGuild", BuildingSubID::THIEVES_GUILD }
}; };
static const std::map<std::string, EMarketMode> MARKET_NAMES_TO_TYPES = static const std::map<std::string, EMarketMode> MARKET_NAMES_TO_TYPES =

2
lib/mapObjects/IMarket.cpp
View File

@ -161,7 +161,7 @@ IMarket::IMarket()
std::vector<EMarketMode> IMarket::availableModes() const std::vector<EMarketMode> IMarket::availableModes() const
{ {
std::vector<EMarketMode> ret; std::vector<EMarketMode> ret;
for (EMarketMode i = static_cast<EMarketMode>(0); i < EMarketMode::MARTKET_AFTER_LAST_PLACEHOLDER; i = vstd::next(i, 1)) for (EMarketMode i = static_cast<EMarketMode>(0); i < EMarketMode::MARKET_AFTER_LAST_PLACEHOLDER; i = vstd::next(i, 1))
if(allowsTrade(i)) if(allowsTrade(i))
ret.push_back(i); ret.push_back(i);