games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

- string ID's for spells (not configurable due to hardcode)

Browse Source 
- spell chances in new towns guilds can be specified in config
This commit is contained in:
Ivan Savenko
2012-12-18 10:32:11 +00:00
parent 62e99a1ae5
commit 94c55e2632
8 changed files with 127 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/CSpellHandler.cpp
View File

@@ -8,6 +8,7 @@
#include <cctype>
#include "GameConstants.h"
#include "BattleHex.h"
#include "CModHandler.h"
/*
* CSpellHandler.cpp, part of VCMI engine
@@ -281,18 +282,15 @@ CSpell * CSpellHandler::loadSpell(CLegacyConfigParser & parser)
spell->fire = parser.readString() == "x";
spell->air = parser.readString() == "x";
for (int i = 0; i < 4 ; i++)
spell->costs.push_back(parser.readNumber());
spell->costs = parser.readNumArray<si32>(4);
spell->power = parser.readNumber();
for (int i = 0; i < 4 ; i++)
spell->powers.push_back(parser.readNumber());
spell->powers = parser.readNumArray<si32>(4);
for (int i = 0; i < 9 ; i++)
spell->probabilities.push_back(parser.readNumber());
spell->probabilities[i] = parser.readNumber();
for (int i = 0; i < 4 ; i++)
spell->AIVals.push_back(parser.readNumber());
spell->AIVals = parser.readNumArray<si32>(4);
for (int i = 0; i < 4 ; i++)
spell->descriptions.push_back(parser.readString());
@@ -350,21 +348,25 @@ void CSpellHandler::loadSpells()
//loading of additional spell traits
const JsonNode config(ResourceID("config/spell_info.json"));
BOOST_FOREACH(const JsonNode &spell, config["spells"].Vector())
BOOST_FOREACH(auto &spell, config["spells"].Struct())
{
//reading exact info
int spellID = spell["id"].Float();
int spellID = spell.second["id"].Float();
CSpell *s = spells[spellID];
s->positiveness = spell["effect"].Float();
s->mainEffectAnim = spell["anim"].Float();
s->positiveness = spell.second["effect"].Float();
s->mainEffectAnim = spell.second["anim"].Float();
s->range.resize(4);
int idx = 0;
BOOST_FOREACH(const JsonNode &range, spell["ranges"].Vector())
BOOST_FOREACH(const JsonNode &range, spell.second["ranges"].Vector())
s->range[idx++] = range.String();
s->counteredSpells = spell["counters"].convertTo<std::vector<TSpell> >();
s->counteredSpells = spell.second["counters"].convertTo<std::vector<TSpell> >();
s->identifier = spell.first;
VLC->modh->identifiers.registerObject("spell." + spell.first, spellID);
}
//spell fixes