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

use ArtifactID

Browse Source
This commit is contained in:
SoundSSGood
2022-11-29 00:11:46 +02:00
parent 3b072b80d5
commit 909dcb82fa
12 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AI/Nullkiller/AIGateway.cpp
View File

@ -1140,7 +1140,7 @@ HeroPtr AIGateway::getHeroWithGrail() const
{ {
for(const CGHeroInstance * h : cb->getHeroesInfo()) for(const CGHeroInstance * h : cb->getHeroesInfo())
{ {
if(h->hasArt(2)) //grail if(h->hasArt(ArtifactID::GRAIL))
return h; return h;
} }
return nullptr; return nullptr;

2
AI/VCAI/VCAI.cpp
View File

@ -1755,7 +1755,7 @@ HeroPtr VCAI::getHeroWithGrail() const
{ {
for(const CGHeroInstance * h : cb->getHeroesInfo()) for(const CGHeroInstance * h : cb->getHeroesInfo())
{ {
if(h->hasArt(2)) //grail if(h->hasArt(ArtifactID::GRAIL))
return h; return h;
} }
return nullptr; return nullptr;

2
client/battle/CBattleInterface.cpp
View File

@ -914,7 +914,7 @@ void CBattleInterface::bSpellf()
if (blockingBonus->source == Bonus::ARTIFACT) if (blockingBonus->source == Bonus::ARTIFACT)
{ {
const int32_t artID = blockingBonus->sid; const auto artID = ArtifactID(blockingBonus->sid);
//If we have artifact, put name of our hero. Otherwise assume it's the enemy. //If we have artifact, put name of our hero. Otherwise assume it's the enemy.
//TODO check who *really* is source of bonus //TODO check who *really* is source of bonus
std::string heroName = myHero->hasArt(artID) ? myHero->name : enemyHero().name; std::string heroName = myHero->hasArt(artID) ? myHero->name : enemyHero().name;

5
client/widgets/CComponent.cpp
View File

@ -155,10 +155,11 @@ std::string CComponent::getDescription()
case creature: return ""; case creature: return "";
case artifact: case artifact:
{ {
auto artID = ArtifactID(subtype);
std::unique_ptr<CArtifactInstance> art; std::unique_ptr<CArtifactInstance> art;
if (subtype != ArtifactID::SPELL_SCROLL) if (artID != ArtifactID::SPELL_SCROLL)
{ {
art.reset(CArtifactInstance::createNewArtifactInstance(subtype)); art.reset(CArtifactInstance::createNewArtifactInstance(artID));
} }
else else
{ {

2
client/windows/CCastleInterface.cpp
View File

@ -935,7 +935,7 @@ void CCastleBuildings::enterMagesGuild()
void CCastleBuildings::enterTownHall() void CCastleBuildings::enterTownHall()
{ {
if(town->visitingHero && town->visitingHero->hasArt(2) && if(town->visitingHero && town->visitingHero->hasArt(ArtifactID::GRAIL) &&
!vstd::contains(town->builtBuildings, BuildingID::GRAIL)) //hero has grail, but town does not have it !vstd::contains(town->builtBuildings, BuildingID::GRAIL)) //hero has grail, but town does not have it
{ {
if(!vstd::contains(town->forbiddenBuildings, BuildingID::GRAIL)) if(!vstd::contains(town->forbiddenBuildings, BuildingID::GRAIL))

24
lib/CArtHandler.cpp
View File

@ -938,12 +938,12 @@ CArtifactInstance * CArtifactInstance::createNewArtifactInstance(CArtifact *Art)
} }
} }
CArtifactInstance * CArtifactInstance::createNewArtifactInstance(int aid) CArtifactInstance * CArtifactInstance::createNewArtifactInstance(ArtifactID aid)
{ {
return createNewArtifactInstance(VLC->arth->objects[aid]); return createNewArtifactInstance(VLC->arth->objects[aid]);
} }
CArtifactInstance * CArtifactInstance::createArtifact(CMap * map, int aid, int spellID) CArtifactInstance * CArtifactInstance::createArtifact(CMap * map, ArtifactID aid, int spellID)
{ {
CArtifactInstance * a = nullptr; CArtifactInstance * a = nullptr;
if(aid >= 0) if(aid >= 0)
@ -1199,19 +1199,19 @@ CArtifactInstance* CArtifactSet::getArt(ArtifactPosition pos, bool excludeLocked
return const_cast<CArtifactInstance*>((const_cast<const CArtifactSet*>(this))->getArt(pos, excludeLocked)); return const_cast<CArtifactInstance*>((const_cast<const CArtifactSet*>(this))->getArt(pos, excludeLocked));
} }
ArtifactPosition CArtifactSet::getArtPos(int aid, bool onlyWorn, bool allowLocked) const ArtifactPosition CArtifactSet::getArtPos(ArtifactID aid, bool onlyWorn, bool allowLocked) const
{ {
const auto result = getAllArtPositions(aid, onlyWorn, allowLocked, false); const auto result = getAllArtPositions(aid, onlyWorn, allowLocked, false);
return result.empty() ? ArtifactPosition{ArtifactPosition::PRE_FIRST} : result[0]; return result.empty() ? ArtifactPosition{ArtifactPosition::PRE_FIRST} : result[0];
} }
ArtifactPosition CArtifactSet::getArtBackpackPos(int aid) const ArtifactPosition CArtifactSet::getArtBackpackPos(ArtifactID aid) const
{ {
const auto result = getBackpackArtPositions(aid); const auto result = getBackpackArtPositions(aid);
return result.empty() ? ArtifactPosition{ArtifactPosition::PRE_FIRST} : result[0]; return result.empty() ? ArtifactPosition{ArtifactPosition::PRE_FIRST} : result[0];
} }
std::vector<ArtifactPosition> CArtifactSet::getAllArtPositions(int aid, bool onlyWorn, bool allowLocked, bool getAll) const std::vector<ArtifactPosition> CArtifactSet::getAllArtPositions(ArtifactID aid, bool onlyWorn, bool allowLocked, bool getAll) const
{ {
std::vector<ArtifactPosition> result; std::vector<ArtifactPosition> result;
for(auto & slotInfo : artifactsWorn) for(auto & slotInfo : artifactsWorn)
@ -1228,7 +1228,7 @@ std::vector<ArtifactPosition> CArtifactSet::getAllArtPositions(int aid, bool onl
return result; return result;
} }
std::vector<ArtifactPosition> CArtifactSet::getBackpackArtPositions(int aid) const std::vector<ArtifactPosition> CArtifactSet::getBackpackArtPositions(ArtifactID aid) const
{ {
std::vector<ArtifactPosition> result; std::vector<ArtifactPosition> result;
@ -1270,7 +1270,7 @@ const CArtifactInstance * CArtifactSet::getArtByInstanceId( ArtifactInstanceID a
} }
bool CArtifactSet::hasArt( bool CArtifactSet::hasArt(
ui32 aid, ArtifactID aid,
bool onlyWorn, bool onlyWorn,
bool searchBackpackAssemblies, bool searchBackpackAssemblies,
bool allowLocked) const bool allowLocked) const
@ -1278,12 +1278,12 @@ bool CArtifactSet::hasArt(
return getArtPosCount(aid, onlyWorn, searchBackpackAssemblies, allowLocked) > 0; return getArtPosCount(aid, onlyWorn, searchBackpackAssemblies, allowLocked) > 0;
} }
bool CArtifactSet::hasArtBackpack(ui32 aid) const bool CArtifactSet::hasArtBackpack(ArtifactID aid) const
{ {
return getBackpackArtPositions(aid).size() > 0; return getBackpackArtPositions(aid).size() > 0;
} }
unsigned CArtifactSet::getArtPosCount(int aid, bool onlyWorn, bool searchBackpackAssemblies, bool allowLocked) const unsigned CArtifactSet::getArtPosCount(ArtifactID aid, bool onlyWorn, bool searchBackpackAssemblies, bool allowLocked) const
{ {
const auto allPositions = getAllArtPositions(aid, onlyWorn, allowLocked, true); const auto allPositions = getAllArtPositions(aid, onlyWorn, allowLocked, true);
if(!allPositions.empty()) if(!allPositions.empty())
@ -1296,7 +1296,7 @@ unsigned CArtifactSet::getArtPosCount(int aid, bool onlyWorn, bool searchBackpac
} }
std::pair<const CCombinedArtifactInstance *, const CArtifactInstance *> std::pair<const CCombinedArtifactInstance *, const CArtifactInstance *>
CArtifactSet::searchForConstituent(int aid) const CArtifactSet::searchForConstituent(ArtifactID aid) const
{ {
for(auto & slot : artifactsInBackpack) for(auto & slot : artifactsInBackpack)
{ {
@ -1316,12 +1316,12 @@ CArtifactSet::searchForConstituent(int aid) const
return {nullptr, nullptr}; return {nullptr, nullptr};
} }
const CArtifactInstance *CArtifactSet::getHiddenArt(int aid) const const CArtifactInstance *CArtifactSet::getHiddenArt(ArtifactID aid) const
{ {
return searchForConstituent(aid).second; return searchForConstituent(aid).second;
} }
const CCombinedArtifactInstance *CArtifactSet::getAssemblyByConstituent(int aid) const const CCombinedArtifactInstance *CArtifactSet::getAssemblyByConstituent(ArtifactID aid) const
{ {
return searchForConstituent(aid).first; return searchForConstituent(aid).first;
} }

24
lib/CArtHandler.h
View File

@ -176,7 +176,7 @@ public:
static CArtifactInstance *createScroll(SpellID sid); static CArtifactInstance *createScroll(SpellID sid);
static CArtifactInstance *createNewArtifactInstance(CArtifact *Art); static CArtifactInstance *createNewArtifactInstance(CArtifact *Art);
static CArtifactInstance *createNewArtifactInstance(int aid); static CArtifactInstance *createNewArtifactInstance(ArtifactID aid);
/** /**
* Creates an artifact instance. * Creates an artifact instance.
@ -185,7 +185,7 @@ public:
* @param spellID optional. the id of a spell if a spell scroll object should be created * @param spellID optional. the id of a spell if a spell scroll object should be created
* @return the created artifact instance * @return the created artifact instance
*/ */
static CArtifactInstance * createArtifact(CMap * map, int aid, int spellID = -1); static CArtifactInstance * createArtifact(CMap * map, ArtifactID aid, int spellID = -1);
}; };
class DLL_LINKAGE CCombinedArtifactInstance : public CArtifactInstance class DLL_LINKAGE CCombinedArtifactInstance : public CArtifactInstance
@ -327,20 +327,20 @@ public:
CArtifactInstance* getArt(ArtifactPosition pos, bool excludeLocked = true); //nullptr - no artifact CArtifactInstance* getArt(ArtifactPosition pos, bool excludeLocked = true); //nullptr - no artifact
/// Looks for equipped artifact with given ID and returns its slot ID or -1 if none /// Looks for equipped artifact with given ID and returns its slot ID or -1 if none
/// (if more than one such artifact lower ID is returned) /// (if more than one such artifact lower ID is returned)
ArtifactPosition getArtPos(int aid, bool onlyWorn = true, bool allowLocked = true) const; ArtifactPosition getArtPos(ArtifactID aid, bool onlyWorn = true, bool allowLocked = true) const;
ArtifactPosition getArtPos(const CArtifactInstance *art) const; ArtifactPosition getArtPos(const CArtifactInstance *art) const;
ArtifactPosition getArtBackpackPos(int aid) const; ArtifactPosition getArtBackpackPos(ArtifactID aid) const;
std::vector<ArtifactPosition> getAllArtPositions(int aid, bool onlyWorn, bool allowLocked, bool getAll) const; std::vector<ArtifactPosition> getAllArtPositions(ArtifactID aid, bool onlyWorn, bool allowLocked, bool getAll) const;
std::vector<ArtifactPosition> getBackpackArtPositions(int aid) const; std::vector<ArtifactPosition> getBackpackArtPositions(ArtifactID aid) const;
const CArtifactInstance *getArtByInstanceId(ArtifactInstanceID artInstId) const; const CArtifactInstance *getArtByInstanceId(ArtifactInstanceID artInstId) const;
/// Search for constituents of assemblies in backpack which do not have an ArtifactPosition /// Search for constituents of assemblies in backpack which do not have an ArtifactPosition
const CArtifactInstance *getHiddenArt(int aid) const; const CArtifactInstance *getHiddenArt(ArtifactID aid) const;
const CCombinedArtifactInstance *getAssemblyByConstituent(int aid) const; const CCombinedArtifactInstance *getAssemblyByConstituent(ArtifactID aid) const;
/// Checks if hero possess artifact of given id (either in backack or worn) /// Checks if hero possess artifact of given id (either in backack or worn)
bool hasArt(ui32 aid, bool onlyWorn = false, bool searchBackpackAssemblies = false, bool allowLocked = true) const; bool hasArt(ArtifactID aid, bool onlyWorn = false, bool searchBackpackAssemblies = false, bool allowLocked = true) const;
bool hasArtBackpack(ui32 aid) const; bool hasArtBackpack(ArtifactID aid) const;
bool isPositionFree(ArtifactPosition pos, bool onlyLockCheck = false) const; bool isPositionFree(ArtifactPosition pos, bool onlyLockCheck = false) const;
unsigned getArtPosCount(int aid, bool onlyWorn = true, bool searchBackpackAssemblies = true, bool allowLocked = true) const; unsigned getArtPosCount(ArtifactID aid, bool onlyWorn = true, bool searchBackpackAssemblies = true, bool allowLocked = true) const;
virtual ArtBearer::ArtBearer bearerType() const = 0; virtual ArtBearer::ArtBearer bearerType() const = 0;
virtual void putArtifact(ArtifactPosition pos, CArtifactInstance * art) = 0; virtual void putArtifact(ArtifactPosition pos, CArtifactInstance * art) = 0;
@ -358,7 +358,7 @@ public:
protected: protected:
std::pair<const CCombinedArtifactInstance *, const CArtifactInstance *> searchForConstituent(int aid) const; std::pair<const CCombinedArtifactInstance *, const CArtifactInstance *> searchForConstituent(ArtifactID aid) const;
private: private:
void serializeJsonHero(JsonSerializeFormat & handler, CMap * map); void serializeJsonHero(JsonSerializeFormat & handler, CMap * map);
void serializeJsonCreature(JsonSerializeFormat & handler, CMap * map); void serializeJsonCreature(JsonSerializeFormat & handler, CMap * map);

6
lib/CGameState.cpp
View File

@ -2256,7 +2256,7 @@ bool CGameState::checkForVictory(PlayerColor player, const EventCondition & cond
case EventCondition::HAVE_ARTIFACT: //check if any hero has winning artifact case EventCondition::HAVE_ARTIFACT: //check if any hero has winning artifact
{ {
for(auto & elem : p->heroes) for(auto & elem : p->heroes)
if(elem->hasArt(condition.objectType)) if(elem->hasArt(ArtifactID(condition.objectType)))
return true; return true;
return false; return false;
} }
@ -2342,8 +2342,8 @@ bool CGameState::checkForVictory(PlayerColor player, const EventCondition & cond
case EventCondition::TRANSPORT: case EventCondition::TRANSPORT:
{ {
const CGTownInstance *t = static_cast<const CGTownInstance *>(condition.object); const CGTownInstance *t = static_cast<const CGTownInstance *>(condition.object);
if((t->visitingHero && t->visitingHero->hasArt(condition.objectType)) if((t->visitingHero && t->visitingHero->hasArt(ArtifactID(condition.objectType)))
|| (t->garrisonHero && t->garrisonHero->hasArt(condition.objectType))) || (t->garrisonHero && t->garrisonHero->hasArt(ArtifactID(condition.objectType))))
{ {
return true; return true;
} }

4
lib/mapObjects/CQuest.cpp
View File

@ -422,7 +422,7 @@ void CQuest::getCompletionText(MetaString &iwText, std::vector<Component> &compo
} }
} }
void CQuest::addArtifactID(ui16 id) void CQuest::addArtifactID(ArtifactID id)
{ {
m5arts.push_back(id); m5arts.push_back(id);
++artifactsRequirements[id]; ++artifactsRequirements[id];
@ -474,7 +474,7 @@ void CQuest::serializeJson(JsonSerializeFormat & handler, const std::string & fi
break; break;
case MISSION_ART: case MISSION_ART:
//todo: ban artifacts //todo: ban artifacts
handler.serializeIdArray<ui16, ArtifactID>("artifacts", m5arts); handler.serializeIdArray<ArtifactID>("artifacts", m5arts);
break; break;
case MISSION_ARMY: case MISSION_ARMY:
{ {

15
lib/mapObjects/CQuest.h
View File

@ -19,9 +19,18 @@ VCMI_LIB_NAMESPACE_BEGIN
class CGCreature; class CGCreature;
// Used in std::unordered_map
template<> struct std::hash<ArtifactID>
{
std::size_t operator()(const ArtifactID & aid) const
{
return std::hash<int>{}(aid.num);
}
};
class DLL_LINKAGE CQuest final class DLL_LINKAGE CQuest final
{ {
mutable std::unordered_map<ui16, unsigned> artifactsRequirements; // artifact ID -> required count mutable std::unordered_map<ArtifactID, unsigned> artifactsRequirements; // artifact ID -> required count
public: public:
enum Emission {MISSION_NONE = 0, MISSION_LEVEL = 1, MISSION_PRIMARY_STAT = 2, MISSION_KILL_HERO = 3, MISSION_KILL_CREATURE = 4, enum Emission {MISSION_NONE = 0, MISSION_LEVEL = 1, MISSION_PRIMARY_STAT = 2, MISSION_KILL_HERO = 3, MISSION_KILL_CREATURE = 4,
@ -36,7 +45,7 @@ public:
ui32 m13489val; ui32 m13489val;
std::vector<ui32> m2stats; std::vector<ui32> m2stats;
std::vector<ui16> m5arts; // artifact IDs. Add IDs through addArtifactID(), not directly to the field. std::vector<ArtifactID> m5arts; // artifact IDs. Add IDs through addArtifactID(), not directly to the field.
std::vector<CStackBasicDescriptor> m6creatures; //pair[cre id, cre count], CreatureSet info irrelevant std::vector<CStackBasicDescriptor> m6creatures; //pair[cre id, cre count], CreatureSet info irrelevant
std::vector<ui32> m7resources; //TODO: use resourceset? std::vector<ui32> m7resources; //TODO: use resourceset?
@ -62,7 +71,7 @@ public:
virtual void getRolloverText (MetaString &text, bool onHover) const; //hover or quest log entry virtual void getRolloverText (MetaString &text, bool onHover) const; //hover or quest log entry
virtual void completeQuest (const CGHeroInstance * h) const {}; virtual void completeQuest (const CGHeroInstance * h) const {};
virtual void addReplacements(MetaString &out, const std::string &base) const; virtual void addReplacements(MetaString &out, const std::string &base) const;
void addArtifactID(ui16 id); void addArtifactID(ArtifactID id);
bool operator== (const CQuest & quest) const bool operator== (const CQuest & quest) const
{ {

14
lib/mapping/MapFormatH3M.cpp
View File

@ -870,15 +870,15 @@ void CMapLoaderH3M::loadArtifactsOfHero(CGHeroInstance * hero)
bool CMapLoaderH3M::loadArtifactToSlot(CGHeroInstance * hero, int slot) bool CMapLoaderH3M::loadArtifactToSlot(CGHeroInstance * hero, int slot)
{ {
const int artmask = map->version == EMapFormat::ROE ? 0xff : 0xffff; const int artmask = map->version == EMapFormat::ROE ? 0xff : 0xffff;
int aid; ArtifactID aid;
if(map->version == EMapFormat::ROE) if(map->version == EMapFormat::ROE)
{ {
aid = reader.readUInt8(); aid = ArtifactID(reader.readUInt8());
} }
else else
{ {
aid = reader.readUInt16(); aid = ArtifactID(reader.readUInt16());
} }
bool isArt = aid != artmask; bool isArt = aid != artmask;
@ -1207,7 +1207,7 @@ void CMapLoaderH3M::readObjects()
case Obj::RANDOM_RELIC_ART: case Obj::RANDOM_RELIC_ART:
case Obj::SPELL_SCROLL: case Obj::SPELL_SCROLL:
{ {
int artID = ArtifactID::NONE; //random, set later auto artID = ArtifactID::NONE; //random, set later
int spellID = -1; int spellID = -1;
auto art = new CGArtifact(); auto art = new CGArtifact();
nobj = art; nobj = art;
@ -1222,7 +1222,7 @@ void CMapLoaderH3M::readObjects()
else if(objTempl->id == Obj::ARTIFACT) else if(objTempl->id == Obj::ARTIFACT)
{ {
//specific artifact //specific artifact
artID = objTempl->subid; artID = ArtifactID(objTempl->subid);
} }
art->storedArtifact = CArtifactInstance::createArtifact(map, artID, spellID); art->storedArtifact = CArtifactInstance::createArtifact(map, artID, spellID);
@ -1754,7 +1754,7 @@ CGSeerHut * CMapLoaderH3M::readSeerHut()
else else
{ {
//RoE //RoE
int artID = reader.readUInt8(); auto artID = ArtifactID(reader.readUInt8());
if (artID != 255) if (artID != 255)
{ {
//not none quest //not none quest
@ -1886,7 +1886,7 @@ void CMapLoaderH3M::readQuest(IQuestObject * guard)
int artNumber = reader.readUInt8(); int artNumber = reader.readUInt8();
for(int yy = 0; yy < artNumber; ++yy) for(int yy = 0; yy < artNumber; ++yy)
{ {
int artid = reader.readUInt16(); auto artid = ArtifactID(reader.readUInt16());
guard->quest->addArtifactID(artid); guard->quest->addArtifactID(artid);
map->allowedArtifact[artid] = false; //these are unavailable for random generation map->allowedArtifact[artid] = false; //these are unavailable for random generation
} }

4
lib/mapping/MapFormatJson.cpp
View File

@ -1152,7 +1152,7 @@ void CMapLoaderJson::MapObjectLoader::configure()
if(auto art = dynamic_cast<CGArtifact *>(instance)) if(auto art = dynamic_cast<CGArtifact *>(instance))
{ {
int artID = ArtifactID::NONE; auto artID = ArtifactID::NONE;
int spellID = -1; int spellID = -1;
if(art->ID == Obj::SPELL_SCROLL) if(art->ID == Obj::SPELL_SCROLL)
@ -1168,7 +1168,7 @@ void CMapLoaderJson::MapObjectLoader::configure()
else if(art->ID == Obj::ARTIFACT) else if(art->ID == Obj::ARTIFACT)
{ {
//specific artifact //specific artifact
artID = art->subID; artID = ArtifactID(art->subID);
} }
art->storedArtifact = CArtifactInstance::createArtifact(owner->map, artID, spellID); art->storedArtifact = CArtifactInstance::createArtifact(owner->map, artID, spellID);