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

Renamed LibClasses * VLC to GameLibrary * LIBRARY

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-14 16:23:37 +00:00
parent 156de5b17e
commit 645b95ba02
287 changed files with 2032 additions and 2032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/json/JsonRandom.cpp
View File

@@ -19,7 +19,7 @@
#include "JsonBonus.h"
#include "../constants/StringConstants.h"
#include "../VCMI_Lib.h"
#include "../GameLibrary.h"
#include "../CArtHandler.h"
#include "../CCreatureHandler.h"
#include "../CCreatureSet.h"
@@ -99,7 +99,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
IdentifierType JsonRandom::decodeKey(const std::string & modScope, const std::string & value, const Variables & variables)
{
if (value.empty() || value[0] != '@')
return IdentifierType(VLC->identifiers()->getIdentifier(modScope, IdentifierType::entityType(), value).value_or(-1));
return IdentifierType(LIBRARY->identifiers()->getIdentifier(modScope, IdentifierType::entityType(), value).value_or(-1));
else
return loadVariable(IdentifierType::entityType(), value, variables, IdentifierType::NONE);
}
@@ -108,7 +108,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
IdentifierType JsonRandom::decodeKey(const JsonNode & value, const Variables & variables)
{
if (value.String().empty() || value.String()[0] != '@')
return IdentifierType(VLC->identifiers()->getIdentifier(IdentifierType::entityType(), value).value_or(-1));
return IdentifierType(LIBRARY->identifiers()->getIdentifier(IdentifierType::entityType(), value).value_or(-1));
else
return loadVariable(IdentifierType::entityType(), value.String(), variables, IdentifierType::NONE);
}
@@ -116,20 +116,20 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
template<>
PlayerColor JsonRandom::decodeKey(const JsonNode & value, const Variables & variables)
{
return PlayerColor(*VLC->identifiers()->getIdentifier("playerColor", value));
return PlayerColor(*LIBRARY->identifiers()->getIdentifier("playerColor", value));
}
template<>
PrimarySkill JsonRandom::decodeKey(const JsonNode & value, const Variables & variables)
{
return PrimarySkill(*VLC->identifiers()->getIdentifier("primarySkill", value));
return PrimarySkill(*LIBRARY->identifiers()->getIdentifier("primarySkill", value));
}
template<>
PrimarySkill JsonRandom::decodeKey(const std::string & modScope, const std::string & value, const Variables & variables)
{
if (value.empty() || value[0] != '@')
return PrimarySkill(*VLC->identifiers()->getIdentifier(modScope, "primarySkill", value));
return PrimarySkill(*LIBRARY->identifiers()->getIdentifier(modScope, "primarySkill", value));
else
return PrimarySkill(loadVariable("primarySkill", value, variables, PrimarySkill::NONE.getNum()));
}
@@ -213,17 +213,17 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
vstd::erase_if(result, [=](const SpellID & spell)
{
return VLC->spellh->getById(spell)->getLevel() != spellLevel;
return LIBRARY->spellh->getById(spell)->getLevel() != spellLevel;
});
}
if (!value["school"].isNull())
{
int32_t schoolID = VLC->identifiers()->getIdentifier("spellSchool", value["school"]).value();
int32_t schoolID = LIBRARY->identifiers()->getIdentifier("spellSchool", value["school"]).value();
vstd::erase_if(result, [=](const SpellID & spell)
{
return !VLC->spellh->getById(spell)->hasSchool(SpellSchool(schoolID));
return !LIBRARY->spellh->getById(spell)->hasSchool(SpellSchool(schoolID));
});
}
return result;
@@ -360,7 +360,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
SecondarySkill JsonRandom::loadSecondary(const JsonNode & value, vstd::RNG & rng, const Variables & variables)
{
std::set<SecondarySkill> defaultSkills;
for(const auto & skill : VLC->skillh->objects)
for(const auto & skill : LIBRARY->skillh->objects)
if (cb->isAllowed(skill->getId()))
defaultSkills.insert(skill->getId());
@@ -382,7 +382,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
if(value.isVector())
{
std::set<SecondarySkill> defaultSkills;
for(const auto & skill : VLC->skillh->objects)
for(const auto & skill : LIBRARY->skillh->objects)
if (cb->isAllowed(skill->getId()))
defaultSkills.insert(skill->getId());
@@ -401,8 +401,8 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
ArtifactID JsonRandom::loadArtifact(const JsonNode & value, vstd::RNG & rng, const Variables & variables)
{
std::set<ArtifactID> allowedArts;
for(const auto & artifact : VLC->arth->objects)
if (cb->isAllowed(artifact->getId()) && VLC->arth->legalArtifact(artifact->getId()))
for(const auto & artifact : LIBRARY->arth->objects)
if (cb->isAllowed(artifact->getId()) && LIBRARY->arth->legalArtifact(artifact->getId()))
allowedArts.insert(artifact->getId());
std::set<ArtifactID> potentialPicks = filterKeys(value, allowedArts, variables);
@@ -423,7 +423,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
SpellID JsonRandom::loadSpell(const JsonNode & value, vstd::RNG & rng, const Variables & variables)
{
std::set<SpellID> defaultSpells;
for(const auto & spell : VLC->spellh->objects)
for(const auto & spell : LIBRARY->spellh->objects)
if (cb->isAllowed(spell->getId()) && !spell->isSpecial())
defaultSpells.insert(spell->getId());
@@ -468,7 +468,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
std::vector<HeroTypeID> ret;
for(auto & entry : value.Vector())
{
ret.push_back(VLC->heroTypes()->getByIndex(VLC->identifiers()->getIdentifier("hero", entry.String()).value())->getId());
ret.push_back(LIBRARY->heroTypes()->getByIndex(LIBRARY->identifiers()->getIdentifier("hero", entry.String()).value())->getId());
}
return ret;
}
@@ -478,7 +478,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
std::vector<HeroClassID> ret;
for(auto & entry : value.Vector())
{
ret.push_back(VLC->heroClasses()->getByIndex(VLC->identifiers()->getIdentifier("heroClass", entry.String()).value())->getId());
ret.push_back(LIBRARY->heroClasses()->getByIndex(LIBRARY->identifiers()->getIdentifier("heroClass", entry.String()).value())->getId());
}
return ret;
}
@@ -488,7 +488,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
CStackBasicDescriptor stack;
std::set<CreatureID> defaultCreatures;
for(const auto & creature : VLC->creh->objects)
for(const auto & creature : LIBRARY->creh->objects)
if (!creature->special)
defaultCreatures.insert(creature->getId());
@@ -539,7 +539,7 @@ JsonRandomizationException::JsonRandomizationException(const std::string & messa
info.minAmount = static_cast<si32>(node["min"].Float());
info.maxAmount = static_cast<si32>(node["max"].Float());
}
CreatureID creatureID(VLC->identifiers()->getIdentifier("creature", node["type"]).value());
CreatureID creatureID(LIBRARY->identifiers()->getIdentifier("creature", node["type"]).value());
const CCreature * crea = creatureID.toCreature();
info.allowedCreatures.push_back(crea);
if (node["upgradeChance"].Float() > 0)