games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Removed WoG dependency for random artifacts. WoG version in repository updated.

Browse Source
This commit is contained in:
DjWarmonger 2015-09-23 21:14:41 +02:00
parent e2165a33a0
commit 971f6d1c1f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CArtHandler.cpp
View File

@ -578,9 +578,11 @@ bool CArtHandler::legalArtifact(ArtifactID id)
auto art = artifacts[id]; auto art = artifacts[id];
//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
return (art->possibleSlots[ArtBearer::HERO].size() || return (art->possibleSlots[ArtBearer::HERO].size() ||
(art->possibleSlots[ArtBearer::COMMANDER].size() && VLC->modh->modules.COMMANDERS) || (art->possibleSlots[ArtBearer::COMMANDER].size() && VLC->modh->modules.COMMANDERS) ||
(art->possibleSlots[ArtBearer::CREATURE].size() && VLC->modh->modules.STACK_ARTIFACT)) && (art->possibleSlots[ArtBearer::CREATURE].size() && VLC->modh->modules.STACK_ARTIFACT) &&
!(art->constituents); //no combo artifacts spawning !(art->constituents) && //no combo artifacts spawning
art->aClass >= CArtifact::ART_TREASURE &&
art->aClass <= CArtifact::ART_RELIC);
} }
bool CArtHandler::isTradableArtifact(ArtifactID id) const bool CArtHandler::isTradableArtifact(ArtifactID id) const

1
lib/GameConstants.h
View File

@ -823,6 +823,7 @@ public:
//BLACKSHARD_OF_THE_DEAD_KNIGHT = 8, //BLACKSHARD_OF_THE_DEAD_KNIGHT = 8,
TITANS_THUNDER = 135, TITANS_THUNDER = 135,
//CORNUCOPIA = 140, //CORNUCOPIA = 140,
//FIXME: the following is only true if WoG is enabled. Otherwise other mod artifacts will take these slots.
ART_SELECTION = 144, ART_SELECTION = 144,
ART_LOCK = 145, ART_LOCK = 145,
AXE_OF_SMASHING = 146, AXE_OF_SMASHING = 146,