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

Partial solution to #2206

Browse Source 
TODO: add serialized field that contains custom guard config
This commit is contained in:
DjWarmonger
2015-06-05 11:28:14 +02:00
parent 3f1bc7e21c
commit 9e7b459882
4 changed files with 111 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/mapObjects/CommonConstructors.cpp
View File

@@ -196,17 +196,41 @@ void CDwellingInstanceConstructor::configureObject(CGObjectInstance * object, CR
dwelling->creatures.back().second.push_back(cre->idNumber);
}
if (guards.getType() == JsonNode::DATA_BOOL)
bool guarded = false; //TODO: serialize for sanity
if (guards.getType() == JsonNode::DATA_BOOL) //simple switch
{
if (guards.Bool())
{
const CCreature * crea = availableCreatures.at(0).at(0);
dwelling->putStack(SlotID(0), new CStackInstance(crea->idNumber, crea->growth * 3 ));
guarded = true;
}
}
else for (auto & stack : JsonRandom::loadCreatures(guards, rng))
else if (guards.getType() == JsonNode::DATA_VECTOR) //custom guards (eg. Elemental Conflux)
{
dwelling->putStack(SlotID(dwelling->stacksCount()), new CStackInstance(stack.type->idNumber, stack.count));
for (auto & stack : JsonRandom::loadCreatures(guards, rng))
{
dwelling->putStack(SlotID(dwelling->stacksCount()), new CStackInstance(stack.type->idNumber, stack.count));
}
}
else //default condition - creatures are of level 5 or higher
{
for (auto creatureEntry : availableCreatures)
{
if (creatureEntry.at(0)->level >= 5)
{
guarded = true;
break;
}
}
}
if (guarded)
{
for (auto creatureEntry : availableCreatures)
{
const CCreature * crea = creatureEntry.at(0);
dwelling->putStack (SlotID(dwelling->stacksCount()), new CStackInstance(crea->idNumber, crea->growth * 3));
}
}
}