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

Remove allowed artifacts list from arthandler

Browse Source 
1. Handlers should not contain non-const game state data
2. This field was duplicating same field in CMap
3. Due to removal of VLC serialization, this field is not updated on map
load leading to issues with artifact randomization
This commit is contained in:
Ivan Savenko
2023-12-11 15:06:04 +02:00
parent 6fe8ed7a03
commit 7ffe014d6b
4 changed files with 11 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CArtHandler.cpp
View File

@ -625,7 +625,7 @@ void CArtHandler::makeItCommanderArt(CArtifact * a, bool onlyCommander)
a->possibleSlots[ArtBearer::COMMANDER].push_back(ArtifactPosition(slot)); a->possibleSlots[ArtBearer::COMMANDER].push_back(ArtifactPosition(slot));
} }
bool CArtHandler::legalArtifact(const ArtifactID & id) bool CArtHandler::legalArtifact(const ArtifactID & id) const
{ {
auto art = id.toArtifact(); auto art = id.toArtifact();
//assert ( (!art->constituents) || art->constituents->size() ); //artifacts is not combined or has some components //assert ( (!art->constituents) || art->constituents->size() ); //artifacts is not combined or has some components
@ -648,18 +648,6 @@ bool CArtHandler::legalArtifact(const ArtifactID & id)
return false; return false;
} }
void CArtHandler::initAllowedArtifactsList(const std::set<ArtifactID> & allowed)
{
allowedArtifacts.clear();
for (ArtifactID i : allowed)
{
if (legalArtifact(ArtifactID(i)))
allowedArtifacts.push_back(i.toArtifact());
//keep im mind that artifact can be worn by more than one type of bearer
}
}
std::set<ArtifactID> CArtHandler::getDefaultAllowed() const std::set<ArtifactID> CArtHandler::getDefaultAllowed() const
{ {
std::set<ArtifactID> allowedArtifacts; std::set<ArtifactID> allowedArtifacts;

6
lib/CArtHandler.h
View File

@ -141,15 +141,11 @@ public:
class DLL_LINKAGE CArtHandler : public CHandlerBase<ArtifactID, Artifact, CArtifact, ArtifactService> class DLL_LINKAGE CArtHandler : public CHandlerBase<ArtifactID, Artifact, CArtifact, ArtifactService>
{ {
public: public:
/// List of artifacts allowed on the map
std::vector<const CArtifact *> allowedArtifacts;
void addBonuses(CArtifact *art, const JsonNode &bonusList); void addBonuses(CArtifact *art, const JsonNode &bonusList);
static CArtifact::EartClass stringToClass(const std::string & className); //TODO: rework EartClass to make this a constructor static CArtifact::EartClass stringToClass(const std::string & className); //TODO: rework EartClass to make this a constructor
bool legalArtifact(const ArtifactID & id); bool legalArtifact(const ArtifactID & id) const;
void initAllowedArtifactsList(const std::set<ArtifactID> & allowed);
static void makeItCreatureArt(CArtifact * a, bool onlyCreature = true); static void makeItCreatureArt(CArtifact * a, bool onlyCreature = true);
static void makeItCommanderArt(CArtifact * a, bool onlyCommander = true); static void makeItCommanderArt(CArtifact * a, bool onlyCommander = true);

5
lib/JsonRandom.cpp
View File

@ -384,8 +384,9 @@ namespace JsonRandom
ArtifactID loadArtifact(const JsonNode & value, CRandomGenerator & rng, const Variables & variables) ArtifactID loadArtifact(const JsonNode & value, CRandomGenerator & rng, const Variables & variables)
{ {
std::set<ArtifactID> allowedArts; std::set<ArtifactID> allowedArts;
for (auto const * artifact : VLC->arth->allowedArtifacts) for(const auto & artifact : VLC->arth->objects)
allowedArts.insert(artifact->getId()); if (IObjectInterface::cb->isAllowed(artifact->getId()) && VLC->arth->legalArtifact(artifact->getId()))
allowedArts.insert(artifact->getId());
std::set<ArtifactID> potentialPicks = filterKeys(value, allowedArts, variables); std::set<ArtifactID> potentialPicks = filterKeys(value, allowedArts, variables);

8
lib/gameState/CGameState.cpp
View File

@ -195,7 +195,6 @@ void CGameState::init(const IMapService * mapService, StartInfo * si, Load::Prog
logGlobal->error("Wrong mode: %d", static_cast<int>(scenarioOps->mode)); logGlobal->error("Wrong mode: %d", static_cast<int>(scenarioOps->mode));
return; return;
} }
VLC->arth->initAllowedArtifactsList(map->allowedArtifact);
logGlobal->info("Map loaded!"); logGlobal->info("Map loaded!");
checkMapChecksum(); checkMapChecksum();
@ -1947,8 +1946,13 @@ ArtifactID CGameState::pickRandomArtifact(CRandomGenerator & rand, int flags, st
std::set<ArtifactID> potentialPicks; std::set<ArtifactID> potentialPicks;
// Select artifacts that satisfy provided criterias // Select artifacts that satisfy provided criterias
for (auto const * artifact : VLC->arth->allowedArtifacts) for (auto const & artifactID : map->allowedArtifact)
{ {
if (!VLC->arth->legalArtifact(artifactID))
continue;
auto const * artifact = artifactID.toArtifact();
assert(artifact->aClass != CArtifact::ART_SPECIAL); // should be filtered out when allowedArtifacts is initialized assert(artifact->aClass != CArtifact::ART_SPECIAL); // should be filtered out when allowedArtifacts is initialized
if ((flags & CArtifact::ART_TREASURE) == 0 && artifact->aClass == CArtifact::ART_TREASURE) if ((flags & CArtifact::ART_TREASURE) == 0 && artifact->aClass == CArtifact::ART_TREASURE)