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

Parsing for stack experience and all other properties specified by creature format. Functionality untested due to other bugs in engine :(

Browse Source
This commit is contained in:
DjWarmonger 2012-09-25 12:41:48 +00:00
parent f16a3a4527
commit 8e78c86fe9
1 changed files with 56 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
lib/CModHandler.cpp
View File

@ -86,7 +86,7 @@ void CModHandler::loadConfigFromFile (std::string name)
const JsonNode *value = &config["creatures"]; const JsonNode *value = &config["creatures"];
BOOST_FOREACH (auto creature, value->Vector()) BOOST_FOREACH (auto creature, value->Vector())
{ {
auto cre = loadCreature (creature); //FIXME: unused variable 'cre' //create and push back creature loadCreature (creature);//create and push back creature
} }
} }
} }
@ -114,7 +114,11 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
const JsonNode & name = node["name"]; const JsonNode & name = node["name"];
cre->nameSing = name["singular"].String(); cre->nameSing = name["singular"].String();
cre->namePl = name["plural"].String(); cre->namePl = name["plural"].String();
cre->nameRef = cre->nameSing; value = &name["reference"];
if (!value->isNull())
cre->nameRef = value->String();
else
cre->nameRef = cre->nameSing;
cre->cost = Res::ResourceSet(node["cost"]); cre->cost = Res::ResourceSet(node["cost"]);
@ -157,6 +161,40 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
{ {
cre->addNewBonus(ParseBonus(bonus)); cre->addNewBonus(ParseBonus(bonus));
} }
BOOST_FOREACH (const JsonNode &exp, node["stackExperience"].Vector())
{
auto bonus = ParseBonus (exp["bonus"]);
const JsonVector &values = exp["values"].Vector();
int lowerLimit = 1, upperLimit = 255;
if (values[0].getType() == JsonNode::JsonType::DATA_BOOL)
{
BOOST_FOREACH (const JsonNode &val, values)
{
if (val.Bool() == true)
{
bonus->limiter.reset (new RankRangeLimiter(lowerLimit));
cre->addNewBonus (new Bonus(*bonus)); //bonuses must be unique objects
break; //TODO: allow bonuses to turn off?
}
++lowerLimit;
}
}
else
{
int lastVal = 0;
BOOST_FOREACH (const JsonNode &val, values)
{
if (val.Float() != lastVal)
{
bonus->val = val.Float() - lastVal;
bonus->limiter.reset (new RankRangeLimiter(lowerLimit));
cre->addNewBonus (new Bonus(*bonus));
}
lastVal = val.Float();
++lowerLimit;
}
}
}
//graphics //graphics
const JsonNode & graphics = node["graphics"]; const JsonNode & graphics = node["graphics"];
@ -171,6 +209,19 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
cre->flightAnimationDistance = animationTime["flight"].Float(); //? cre->flightAnimationDistance = animationTime["flight"].Float(); //?
//TODO: background? //TODO: background?
const JsonNode & missle = graphics["missle"]; const JsonNode & missle = graphics["missle"];
//TODO: parse
value = &missle["projectile"];
if (value->isNull())
cre->projectile = "PLCBOWX.DEF";
else
cre->projectile = value->String();
value = &missle["spinning"];
if (value->isNull())
cre->projectileSpin = false; //no animation by default to avoid crash
else
cre->projectileSpin = value->Bool();
const JsonNode & offsets = missle["offset"]; const JsonNode & offsets = missle["offset"];
cre->upperRightMissleOffsetX = offsets["upperX"].Float(); cre->upperRightMissleOffsetX = offsets["upperX"].Float();
cre->upperRightMissleOffsetY = offsets["upperY"].Float(); cre->upperRightMissleOffsetY = offsets["upperY"].Float();
@ -186,10 +237,6 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
cre->advMapDef = graphics["map"].String(); cre->advMapDef = graphics["map"].String();
cre->iconIndex = graphics["iconIndex"].Float(); cre->iconIndex = graphics["iconIndex"].Float();
//TODO: parse
cre->projectile = "PLCBOWX.DEF";
cre->projectileSpin = false;
const JsonNode & sounds = node["sound"]; const JsonNode & sounds = node["sound"];
#define GET_SOUND_VALUE(value_name) do { cre->sounds.value_name = sounds[#value_name].String(); } while(0) #define GET_SOUND_VALUE(value_name) do { cre->sounds.value_name = sounds[#value_name].String(); } while(0)
@ -206,6 +253,9 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
#undef GET_SOUND_VALUE #undef GET_SOUND_VALUE
creatures.push_back(cre); creatures.push_back(cre);
tlog3 << "Added new creature " << cre->nameRef << "\n";
return cre; return cre;
} }
void CModHandler::recreateAdvMapDefs() void CModHandler::recreateAdvMapDefs()