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

Merge pull request #2123 from Warzyw647/rmg-split-enum-monster-strength

Browse Source 
Refactor enums and add zone monster strength "none" in rmg
This commit is contained in:
DjWarmonger 2023-06-06 20:40:35 +02:00 committed by GitHub
commit e98a50b45a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/rmg/CMapGenOptions.cpp
View File

@ -191,7 +191,7 @@ void CMapGenOptions::setStartingTownForPlayer(const PlayerColor & color, si32 to
it->second.setStartingTown(town); it->second.setStartingTown(town);
} }
void CMapGenOptions::setPlayerTypeForStandardPlayer(const PlayerColor & color, EPlayerType::EPlayerType playerType) void CMapGenOptions::setPlayerTypeForStandardPlayer(const PlayerColor & color, EPlayerType playerType)
{ {
assert(playerType != EPlayerType::COMP_ONLY); assert(playerType != EPlayerType::COMP_ONLY);
auto it = players.find(color); auto it = players.find(color);
@ -526,12 +526,12 @@ void CMapGenOptions::CPlayerSettings::setStartingTown(si32 value)
startingTown = value; startingTown = value;
} }
EPlayerType::EPlayerType CMapGenOptions::CPlayerSettings::getPlayerType() const EPlayerType CMapGenOptions::CPlayerSettings::getPlayerType() const
{ {
return playerType; return playerType;
} }
void CMapGenOptions::CPlayerSettings::setPlayerType(EPlayerType::EPlayerType value) void CMapGenOptions::CPlayerSettings::setPlayerType(EPlayerType value)
{ {
playerType = value; playerType = value;
} }

13
lib/rmg/CMapGenOptions.h
View File

@ -17,15 +17,12 @@ VCMI_LIB_NAMESPACE_BEGIN
class CRandomGenerator; class CRandomGenerator;
namespace EPlayerType enum class EPlayerType
{
enum EPlayerType
{ {
HUMAN, HUMAN,
AI, AI,
COMP_ONLY COMP_ONLY
}; };
}
/// The map gen options class holds values about general map generation settings /// The map gen options class holds values about general map generation settings
/// e.g. the size of the map, the count of players,... /// e.g. the size of the map, the count of players,...
@ -49,8 +46,8 @@ public:
void setStartingTown(si32 value); void setStartingTown(si32 value);
/// The default value is EPlayerType::AI. /// The default value is EPlayerType::AI.
EPlayerType::EPlayerType getPlayerType() const; EPlayerType getPlayerType() const;
void setPlayerType(EPlayerType::EPlayerType value); void setPlayerType(EPlayerType value);
/// Team id for this player. TeamID::NO_TEAM by default - team will be randomly assigned /// Team id for this player. TeamID::NO_TEAM by default - team will be randomly assigned
TeamID getTeam() const; TeamID getTeam() const;
@ -62,7 +59,7 @@ public:
private: private:
PlayerColor color; PlayerColor color;
si32 startingTown; si32 startingTown;
EPlayerType::EPlayerType playerType; EPlayerType playerType;
TeamID team; TeamID team;
public: public:
@ -122,7 +119,7 @@ public:
void setStartingTownForPlayer(const PlayerColor & color, si32 town); void setStartingTownForPlayer(const PlayerColor & color, si32 town);
/// Sets a player type for a standard player. A standard player is the opposite of a computer only player. The /// Sets a player type for a standard player. A standard player is the opposite of a computer only player. The
/// values which can be chosen for the player type are EPlayerType::AI or EPlayerType::HUMAN. /// values which can be chosen for the player type are EPlayerType::AI or EPlayerType::HUMAN.
void setPlayerTypeForStandardPlayer(const PlayerColor & color, EPlayerType::EPlayerType playerType); void setPlayerTypeForStandardPlayer(const PlayerColor & color, EPlayerType playerType);
void setPlayerTeam(const PlayerColor & color, const TeamID & team = TeamID::NO_TEAM); void setPlayerTeam(const PlayerColor & color, const TeamID & team = TeamID::NO_TEAM);

2
lib/rmg/CMapGenerator.cpp
View File

@ -192,7 +192,7 @@ void CMapGenerator::addPlayerInfo()
{ {
// Calculate which team numbers exist // Calculate which team numbers exist
enum ETeams {CPHUMAN = 0, CPUONLY = 1, AFTER_LAST = 2}; enum ETeams {CPHUMAN = 0, CPUONLY = 1, AFTER_LAST = 2}; // Used as a kind of a local named array index, so left as enum, not enum class
std::array<std::list<int>, 2> teamNumbers; std::array<std::list<int>, 2> teamNumbers;
std::set<int> teamsTotal; std::set<int> teamsTotal;

47
lib/rmg/CRmgTemplate.cpp
View File

@ -139,7 +139,7 @@ ZoneOptions::ZoneOptions():
owner(std::nullopt), owner(std::nullopt),
matchTerrainToTown(true), matchTerrainToTown(true),
townsAreSameType(false), townsAreSameType(false),
zoneMonsterStrength(EMonsterStrength::ZONE_NORMAL), monsterStrength(EMonsterStrength::ZONE_NORMAL),
minesLikeZone(NO_ZONE), minesLikeZone(NO_ZONE),
terrainTypeLikeZone(NO_ZONE), terrainTypeLikeZone(NO_ZONE),
treasureLikeZone(NO_ZONE) treasureLikeZone(NO_ZONE)
@ -161,12 +161,12 @@ void ZoneOptions::setId(TRmgTemplateZoneId value)
id = value; id = value;
} }
ETemplateZoneType::ETemplateZoneType ZoneOptions::getType() const ETemplateZoneType ZoneOptions::getType() const
{ {
return type; return type;
} }
void ZoneOptions::setType(ETemplateZoneType::ETemplateZoneType value) void ZoneOptions::setType(ETemplateZoneType value)
{ {
type = value; type = value;
} }
@ -377,24 +377,31 @@ void ZoneOptions::serializeJson(JsonSerializeFormat & handler)
{ {
//TODO: add support for std::map to serializeEnum //TODO: add support for std::map to serializeEnum
static const std::vector<std::string> STRENGTH = static const std::vector<std::string> zoneMonsterStrengths =
{ {
"none",
"weak", "weak",
"normal", "normal",
"strong" "strong"
}; };
si32 rawStrength = 0; int temporaryZoneMonsterStrengthIndex = monsterStrength == EMonsterStrength::ZONE_NONE ? 0 : monsterStrength - EMonsterStrength::ZONE_WEAK + 1 ; // temporary until serializeEnum starts supporting std::map
if(handler.saving) // temporaryZoneMonsterStrengthIndex = 0, 1, 2 and 3 for monsterStrength = ZONE_NONE, ZONE_WEAK, ZONE_NORMAL and ZONE_STRONG respectively
handler.serializeEnum("monsters", temporaryZoneMonsterStrengthIndex, 2, zoneMonsterStrengths); // default is normal monsters
switch (temporaryZoneMonsterStrengthIndex)
{ {
rawStrength = static_cast<decltype(rawStrength)>(zoneMonsterStrength); case 0:
rawStrength++; monsterStrength = EMonsterStrength::ZONE_NONE;
} break;
handler.serializeEnum("monsters", rawStrength, EMonsterStrength::ZONE_NORMAL + 1, STRENGTH); case 1:
if(!handler.saving) monsterStrength = EMonsterStrength::ZONE_WEAK;
{ break;
rawStrength--; case 2:
zoneMonsterStrength = static_cast<decltype(zoneMonsterStrength)>(rawStrength); monsterStrength = EMonsterStrength::ZONE_NORMAL;
break;
case 3:
monsterStrength = EMonsterStrength::ZONE_STRONG;
break;
} }
} }
@ -476,7 +483,7 @@ bool CRmgTemplate::matchesSize(const int3 & value) const
bool CRmgTemplate::isWaterContentAllowed(EWaterContent::EWaterContent waterContent) const bool CRmgTemplate::isWaterContentAllowed(EWaterContent::EWaterContent waterContent) const
{ {
return waterContent == EWaterContent::EWaterContent::RANDOM || allowedWaterContent.count(waterContent); return waterContent == EWaterContent::RANDOM || allowedWaterContent.count(waterContent);
} }
const std::set<EWaterContent::EWaterContent> & CRmgTemplate::getWaterContentAllowed() const const std::set<EWaterContent::EWaterContent> & CRmgTemplate::getWaterContentAllowed() const
@ -764,13 +771,13 @@ void CRmgTemplate::afterLoad()
zone2->addConnection(id1); zone2->addConnection(id1);
} }
if(allowedWaterContent.empty() || allowedWaterContent.count(EWaterContent::EWaterContent::RANDOM)) if(allowedWaterContent.empty() || allowedWaterContent.count(EWaterContent::RANDOM))
{ {
allowedWaterContent.insert(EWaterContent::EWaterContent::NONE); allowedWaterContent.insert(EWaterContent::NONE);
allowedWaterContent.insert(EWaterContent::EWaterContent::NORMAL); allowedWaterContent.insert(EWaterContent::NORMAL);
allowedWaterContent.insert(EWaterContent::EWaterContent::ISLANDS); allowedWaterContent.insert(EWaterContent::ISLANDS);
} }
allowedWaterContent.erase(EWaterContent::EWaterContent::RANDOM); allowedWaterContent.erase(EWaterContent::RANDOM);
} }
void CRmgTemplate::serializeSize(JsonSerializeFormat & handler, int3 & value, const std::string & fieldName) void CRmgTemplate::serializeSize(JsonSerializeFormat & handler, int3 & value, const std::string & fieldName)

22
lib/rmg/CRmgTemplate.h
View File

@ -18,9 +18,7 @@ VCMI_LIB_NAMESPACE_BEGIN
class JsonSerializeFormat; class JsonSerializeFormat;
namespace ETemplateZoneType enum class ETemplateZoneType
{
enum ETemplateZoneType
{ {
PLAYER_START, PLAYER_START,
CPU_START, CPU_START,
@ -28,11 +26,10 @@ namespace ETemplateZoneType
JUNCTION, JUNCTION,
WATER WATER
}; };
}
namespace EWaterContent namespace EWaterContent // Not enum class, because it's used in method RandomMapTab::setMapGenOptions
{ { // defined in client\lobby\RandomMapTab.cpp and probably in other similar places
enum EWaterContent enum EWaterContent // as an argument of CToggleGroup::setSelected(int id) from \client\widgets\Buttons.cpp
{ {
RANDOM = -1, RANDOM = -1,
NONE, NONE,
@ -41,10 +38,11 @@ namespace EWaterContent
}; };
} }
namespace EMonsterStrength namespace EMonsterStrength // used as int in monster generation procedure and in map description for the generated random map
{ {
enum EMonsterStrength enum EMonsterStrength
{ {
ZONE_NONE = -3,
RANDOM = -2, RANDOM = -2,
ZONE_WEAK = -1, ZONE_WEAK = -1,
ZONE_NORMAL = 0, ZONE_NORMAL = 0,
@ -119,8 +117,8 @@ public:
TRmgTemplateZoneId getId() const; TRmgTemplateZoneId getId() const;
void setId(TRmgTemplateZoneId value); void setId(TRmgTemplateZoneId value);
ETemplateZoneType::ETemplateZoneType getType() const; ETemplateZoneType getType() const;
void setType(ETemplateZoneType::ETemplateZoneType value); void setType(ETemplateZoneType value);
int getSize() const; int getSize() const;
void setSize(int value); void setSize(int value);
@ -156,14 +154,14 @@ public:
void serializeJson(JsonSerializeFormat & handler); void serializeJson(JsonSerializeFormat & handler);
EMonsterStrength::EMonsterStrength zoneMonsterStrength; EMonsterStrength::EMonsterStrength monsterStrength;
bool areTownsSameType() const; bool areTownsSameType() const;
bool isMatchTerrainToTown() const; bool isMatchTerrainToTown() const;
protected: protected:
TRmgTemplateZoneId id; TRmgTemplateZoneId id;
ETemplateZoneType::ETemplateZoneType type; ETemplateZoneType type;
int size; int size;
ui32 maxTreasureValue; ui32 maxTreasureValue;
std::optional<int> owner; std::optional<int> owner;

3
lib/rmg/RmgMap.cpp
View File

@ -111,6 +111,9 @@ void RmgMap::initTiles(CMapGenerator & generator, CRandomGenerator & rand)
options.setType(ETemplateZoneType::WATER); options.setType(ETemplateZoneType::WATER);
auto zone = std::make_shared<Zone>(*this, generator, rand); auto zone = std::make_shared<Zone>(*this, generator, rand);
zone->setOptions(options); zone->setOptions(options);
//std::set<FactionID> allowedMonsterFactions({FactionID::CASTLE, FactionID::INFERNO}); // example of filling allowed monster factions
//zone->setMonsterTypes(allowedMonsterFactions); // can be set here, probably from template json, along with the treasure ranges and densities
zone->monsterStrength = EMonsterStrength::ZONE_NONE; // can be set to other value, probably from a new field in the template json
zones[zone->getId()] = zone; zones[zone->getId()] = zone;
break; break;
} }

5
lib/rmg/modificators/ObjectManager.cpp
View File

@ -449,8 +449,11 @@ CGCreature * ObjectManager::chooseGuard(si32 strength, bool zoneGuard)
//precalculate actual (randomized) monster strength based on this post //precalculate actual (randomized) monster strength based on this post
//http://forum.vcmi.eu/viewtopic.php?p=12426#12426 //http://forum.vcmi.eu/viewtopic.php?p=12426#12426
if(!zoneGuard && zone.monsterStrength == EMonsterStrength::ZONE_NONE)
return nullptr; //no guards inside this zone except for zone guards
int mapMonsterStrength = map.getMapGenOptions().getMonsterStrength(); int mapMonsterStrength = map.getMapGenOptions().getMonsterStrength();
int monsterStrength = (zoneGuard ? 0 : zone.zoneMonsterStrength) + mapMonsterStrength - 1; //array index from 0 to 4 int monsterStrength = (zoneGuard ? 0 : zone.monsterStrength - EMonsterStrength::ZONE_NORMAL) + mapMonsterStrength - 1; //array index from 0 to 4
static const std::array<int, 5> value1{2500, 1500, 1000, 500, 0}; static const std::array<int, 5> value1{2500, 1500, 1000, 500, 0};
static const std::array<int, 5> value2{7500, 7500, 7500, 5000, 5000}; static const std::array<int, 5> value2{7500, 7500, 7500, 5000, 5000};
static const std::array<float, 5> multiplier1{0.5, 0.75, 1.0, 1.5, 1.5}; static const std::array<float, 5> multiplier1{0.5, 0.75, 1.0, 1.5, 1.5};

7
lib/rmg/modificators/TreasurePlacer.cpp
View File

@ -546,8 +546,8 @@ size_t TreasurePlacer::getMaxPrisons() const
} }
bool TreasurePlacer::isGuardNeededForTreasure(int value) bool TreasurePlacer::isGuardNeededForTreasure(int value)
{ {// no guard in a zone with "monsters: none" and for small treasures; water zones cen get monster strength ZONE_NONE elsewhere if needed
return zone.getType() != ETemplateZoneType::WATER && value > minGuardedValue; return zone.monsterStrength != EMonsterStrength::ZONE_NONE && value > minGuardedValue;
} }
std::vector<ObjectInfo*> TreasurePlacer::prepareTreasurePile(const CTreasureInfo& treasureInfo) std::vector<ObjectInfo*> TreasurePlacer::prepareTreasurePile(const CTreasureInfo& treasureInfo)
@ -706,8 +706,7 @@ void TreasurePlacer::createTreasures(ObjectManager & manager)
const int maxAttempts = 2; const int maxAttempts = 2;
int mapMonsterStrength = map.getMapGenOptions().getMonsterStrength(); int mapMonsterStrength = map.getMapGenOptions().getMonsterStrength();
int monsterStrength = zone.zoneMonsterStrength + mapMonsterStrength - 1; //array index from 0 to 4 int monsterStrength = (zone.monsterStrength == EMonsterStrength::ZONE_NONE ? 0 : zone.monsterStrength + mapMonsterStrength - 1); //array index from 0 to 4; pick any correct value for ZONE_NONE, minGuardedValue won't be used in this case anyway
static int minGuardedValues[] = { 6500, 4167, 3000, 1833, 1333 }; static int minGuardedValues[] = { 6500, 4167, 3000, 1833, 1333 };
minGuardedValue = minGuardedValues[monsterStrength]; minGuardedValue = minGuardedValues[monsterStrength];