games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-17 11:56:46 +02:00
Code Issues Releases Activity

third upgrade for 8th dwelling

Browse Source
This commit is contained in:
Laserlicht 2024-11-24 17:57:49 +01:00
parent a4417f3fc5
commit b29d7e8cfd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/constants/EntityIdentifiers.h
View File

@ -298,7 +298,7 @@ public:
HORDE_2_UPGR, GRAIL, EXTRA_TOWN_HALL, EXTRA_CITY_HALL, EXTRA_CAPITOL, HORDE_2_UPGR, GRAIL, EXTRA_TOWN_HALL, EXTRA_CITY_HALL, EXTRA_CAPITOL,
DWELL_FIRST=30, DWELL_LVL_2, DWELL_LVL_3, DWELL_LVL_4, DWELL_LVL_5, DWELL_LVL_6, DWELL_LAST=36, DWELL_FIRST=30, DWELL_LVL_2, DWELL_LVL_3, DWELL_LVL_4, DWELL_LVL_5, DWELL_LVL_6, DWELL_LAST=36,
DWELL_UP_FIRST=37, DWELL_LVL_2_UP, DWELL_LVL_3_UP, DWELL_LVL_4_UP, DWELL_LVL_5_UP, DWELL_UP_FIRST=37, DWELL_LVL_2_UP, DWELL_LVL_3_UP, DWELL_LVL_4_UP, DWELL_LVL_5_UP,
DWELL_LVL_6_UP, DWELL_UP_LAST=43, DWELL_LVL_8=150, DWELL_LVL_8_UP=151, DWELL_LVL_6_UP, DWELL_UP_LAST=43, DWELL_LVL_8=150, DWELL_LVL_8_UP=151, //150-154 reserved for 8. creature with potential upgrades
DWELL_LVL_1 = DWELL_FIRST, DWELL_LVL_1 = DWELL_FIRST,
DWELL_LVL_7 = DWELL_LAST, DWELL_LVL_7 = DWELL_LAST,
@ -337,7 +337,10 @@ public:
if (it != tmp.end()) if (it != tmp.end())
return std::distance(tmp.begin(), it); return std::distance(tmp.begin(), it);
} }
return (dwelling - DWELL_FIRST) % (GameConstants::CREATURES_PER_TOWN - 1); if(dwelling >= BuildingIDBase::DWELL_LVL_8 && dwelling < BuildingIDBase::DWELL_LVL_8 + 5)
return 7;
else
return (dwelling - DWELL_FIRST) % (GameConstants::CREATURES_PER_TOWN - 1);
} }
static int getUpgradedFromDwelling(BuildingIDBase dwelling) static int getUpgradedFromDwelling(BuildingIDBase dwelling)
@ -349,15 +352,18 @@ public:
if (it != tmp.end()) if (it != tmp.end())
return i; return i;
} }
return (dwelling - DWELL_FIRST) / (GameConstants::CREATURES_PER_TOWN - 1); if(dwelling >= BuildingIDBase::DWELL_LVL_8 && dwelling < BuildingIDBase::DWELL_LVL_8 + 5)
return dwelling - BuildingIDBase::DWELL_LVL_8;
else
return (dwelling - DWELL_FIRST) / (GameConstants::CREATURES_PER_TOWN - 1);
} }
static void advanceDwelling(BuildingIDBase & dwelling) static void advanceDwelling(BuildingIDBase & dwelling)
{ {
if(dwelling != BuildingIDBase::DWELL_LVL_8) if(dwelling >= BuildingIDBase::DWELL_LVL_8 && dwelling < BuildingIDBase::DWELL_LVL_8 + 5)
dwelling.advance(GameConstants::CREATURES_PER_TOWN - 1);
else
dwelling.advance(1); dwelling.advance(1);
else
dwelling.advance(GameConstants::CREATURES_PER_TOWN - 1);
} }
bool IsSpecialOrGrail() const bool IsSpecialOrGrail() const