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

Merged specials.txt into heroes.json.

Browse Source
This commit is contained in:
Frank Zago
2011-08-27 17:33:07 +00:00
parent 9594058157
commit 2a0fef0e4d
3 changed files with 888 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/CHeroHandler.cpp
View File

@ -288,6 +288,7 @@ void CHeroHandler::loadHeroes()
const JsonNode config(DATA_DIR "/config/heroes.json");
BOOST_FOREACH(const JsonNode &hero, config["heroes"].Vector()) {
int hid = hero["id"].Float();
const JsonNode *value;
heroes[hid]->sex = hero["sex"].Float();
@ -295,10 +296,24 @@ void CHeroHandler::loadHeroes()
heroes[hid]->secSkillsInit.push_back(std::make_pair(set["skill"].Float(), set["level"].Float()));
}
const JsonNode *value = &hero["spell"];
value = &hero["spell"];
if (!value->isNull()) {
heroes[hid]->startingSpell = value->Float();
}
value = &hero["specialties"];
if (!value->isNull()) {
BOOST_FOREACH(const JsonNode &specialty, value->Vector()) {
SSpecialtyInfo dummy;
dummy.type = specialty["type"].Float();
dummy.val = specialty["val"].Float();
dummy.subtype = specialty["subtype"].Float();
dummy.additionalinfo = specialty["info"].Float();
heroes[hid]->spec.push_back(dummy); //put a copy of dummy
}
}
}
loadHeroClasses();
@ -360,26 +375,8 @@ void CHeroHandler::loadHeroes()
}
ballistics.push_back(bli);
}
{
std::ifstream inp;
dump.clear();
inp.open(DATA_DIR "/config/specials.txt"); //loading hero specials
assert(inp);
SSpecialtyInfo dummy;
si32 hid;
inp.ignore(100, '\n');
for (int i = 0; i < 175; ++i)
{
inp >> hid;
inp >> dummy.type;
inp >> dummy.val;
inp >> dummy.subtype;
inp >> dummy.additionalinfo;
heroes[hid]->spec.push_back(dummy); //put a copy of dummy
}
inp.close();
}
}
void CHeroHandler::loadHeroClasses()
{
std::istringstream str(bitmaph->getTextFile("HCTRAITS.TXT")); //we'll be reading from it