|
|
@@ -4,7 +4,175 @@
|
|
|
#include "CLodHandler.h"
|
|
|
#include "../lib/VCMI_Lib.h"
|
|
|
#include <boost/algorithm/string/replace.hpp>
|
|
|
+#include <cctype>
|
|
|
+
|
|
|
+
|
|
|
extern CLodHandler *bitmaph;
|
|
|
+
|
|
|
+namespace SRSLPraserHelpers
|
|
|
+{
|
|
|
+ int XYToHex(int x, int y)
|
|
|
+ {
|
|
|
+ return x + 17 * y;
|
|
|
+ }
|
|
|
+
|
|
|
+ int XYToHex(std::pair<int, int> xy)
|
|
|
+ {
|
|
|
+ return XYToHex(xy.first, xy.second);
|
|
|
+ }
|
|
|
+
|
|
|
+ int hexToY(int battleFieldPosition)
|
|
|
+ {
|
|
|
+ return battleFieldPosition/17;
|
|
|
+ }
|
|
|
+
|
|
|
+ int hexToX(int battleFieldPosition)
|
|
|
+ {
|
|
|
+ int pos = battleFieldPosition - hexToY(battleFieldPosition) * 17;
|
|
|
+ return pos;
|
|
|
+ }
|
|
|
+
|
|
|
+ std::pair<int, int> hexToPair(int battleFieldPosition)
|
|
|
+ {
|
|
|
+ return std::make_pair(hexToX(battleFieldPosition), hexToY(battleFieldPosition));
|
|
|
+ }
|
|
|
+
|
|
|
+ //moves hex by one hex in given direction
|
|
|
+ //0 - left top, 1 - right top, 2 - right, 3 - right bottom, 4 - left bottom, 5 - left
|
|
|
+ std::pair<int, int> gotoDir(int x, int y, int direction)
|
|
|
+ {
|
|
|
+ switch(direction)
|
|
|
+ {
|
|
|
+ case 0: //top left
|
|
|
+ return std::make_pair(y%2 ? x-1 : x, y-1);
|
|
|
+ case 1: //top right
|
|
|
+ return std::make_pair(y%2 ? x : x+1, y-1);
|
|
|
+ case 2: //right
|
|
|
+ return std::make_pair(x+1, y);
|
|
|
+ case 3: //right bottom
|
|
|
+ return std::make_pair(y%2 ? x : x+1, y+1);
|
|
|
+ case 4: //left bottom
|
|
|
+ return std::make_pair(y%2 ? x-1 : x, y+1);
|
|
|
+ case 5: //left
|
|
|
+ return std::make_pair(x-1, y);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ std::pair<int, int> gotoDir(std::pair<int, int> xy, int direction)
|
|
|
+ {
|
|
|
+ return gotoDir(xy.first, xy.second, direction);
|
|
|
+ }
|
|
|
+
|
|
|
+ bool isGoodHex(std::pair<int, int> xy)
|
|
|
+ {
|
|
|
+ return xy.first >=0 && xy.first < 17 && xy.second >= 0 && xy.second < 11;
|
|
|
+ }
|
|
|
+
|
|
|
+ //helper fonction for std::set<ui16> CSpell::rangeInHexes(unsigned int centralHex, ui8 schoolLvl ) const
|
|
|
+ std::set<ui16> getInRange(unsigned int center, int low, int high)
|
|
|
+ {
|
|
|
+ std::set<ui16> ret;
|
|
|
+ if(low == 0)
|
|
|
+ {
|
|
|
+ ret.insert(center);
|
|
|
+ }
|
|
|
+
|
|
|
+ std::pair<int, int> mainPointForLayer[6]; //A, B, C, D, E, F points
|
|
|
+ for(int b=0; b<6; ++b)
|
|
|
+ mainPointForLayer[b] = hexToPair(center);
|
|
|
+
|
|
|
+ for(int it=1; it<=high; ++it) //it - distance to the center
|
|
|
+ {
|
|
|
+ for(int b=0; b<6; ++b)
|
|
|
+ mainPointForLayer[b] = gotoDir(mainPointForLayer[b], b);
|
|
|
+
|
|
|
+ if(it>=low)
|
|
|
+ {
|
|
|
+ std::pair<int, int> curHex;
|
|
|
+
|
|
|
+ //adding lines (A-b, B-c, C-d, etc)
|
|
|
+ for(int v=0; v<6; ++v)
|
|
|
+ {
|
|
|
+ curHex = mainPointForLayer[v];
|
|
|
+ for(int h=0; h<it; ++h)
|
|
|
+ {
|
|
|
+ if(isGoodHex(curHex))
|
|
|
+ ret.insert(XYToHex(curHex));
|
|
|
+ curHex = gotoDir(curHex, (v+2)%6);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ } //if(it>=low)
|
|
|
+ }
|
|
|
+
|
|
|
+ return ret;
|
|
|
+ }
|
|
|
+}
|
|
|
+using namespace SRSLPraserHelpers;
|
|
|
+
|
|
|
+std::set<ui16> CSpell::rangeInHexes(unsigned int centralHex, ui8 schoolLvl ) const
|
|
|
+{
|
|
|
+ std::set<ui16> ret;
|
|
|
+
|
|
|
+ std::string rng = range[schoolLvl] + ','; //copy + artificial comma for easier handling
|
|
|
+
|
|
|
+ if(rng.size() >= 1 && rng[0] != 'X') //there is at lest one hex in range
|
|
|
+ {
|
|
|
+ std::string number1, number2;
|
|
|
+ int beg, end;
|
|
|
+ bool readingFirst = true;
|
|
|
+ for(int it=0; it<rng.size(); ++it)
|
|
|
+ {
|
|
|
+ if( std::isdigit(rng[it]) ) //reading numer
|
|
|
+ {
|
|
|
+ if(readingFirst)
|
|
|
+ number1 += rng[it];
|
|
|
+ else
|
|
|
+ number2 += rng[it];
|
|
|
+ }
|
|
|
+ else if(rng[it] == ',') //comma
|
|
|
+ {
|
|
|
+ //calculating variables
|
|
|
+ if(readingFirst)
|
|
|
+ {
|
|
|
+ beg = atoi(number1.c_str());
|
|
|
+ number1 = "";
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ end = atoi(number2.c_str());
|
|
|
+ number2 = "";
|
|
|
+ }
|
|
|
+ //obtaining new hexes
|
|
|
+ std::set<ui16> curLayer;
|
|
|
+ if(readingFirst)
|
|
|
+ {
|
|
|
+ curLayer = getInRange(centralHex, beg, beg);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ curLayer = getInRange(centralHex, beg, end);
|
|
|
+ readingFirst = true;
|
|
|
+ }
|
|
|
+ //adding abtained hexes
|
|
|
+ for(std::set<ui16>::iterator it = curLayer.begin(); it != curLayer.end(); ++it)
|
|
|
+ {
|
|
|
+ ret.insert(*it);
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ else if(rng[it] == '-') //dash
|
|
|
+ {
|
|
|
+ beg = atoi(number1.c_str());
|
|
|
+ number1 = "";
|
|
|
+ readingFirst = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return ret;
|
|
|
+}
|
|
|
+
|
|
|
void CSpellHandler::loadSpells()
|
|
|
{
|
|
|
std::string buf = bitmaph->getTextFile("SPTRAITS.TXT"), pom;
|
|
|
@@ -90,7 +258,7 @@ void CSpellHandler::loadSpells()
|
|
|
{
|
|
|
//reading header
|
|
|
std::string dump;
|
|
|
- for(int i=0; i<42; ++i) ast>>dump;
|
|
|
+ for(int i=0; i<52; ++i) ast>>dump;
|
|
|
//reading exact info
|
|
|
int spellID;
|
|
|
ast>>spellID;
|
|
|
@@ -99,6 +267,9 @@ void CSpellHandler::loadSpells()
|
|
|
int buf;
|
|
|
ast>>buf;
|
|
|
spells[spellID].positiveness = buf;
|
|
|
+ spells[spellID].range.resize(4);
|
|
|
+ for(int g=0; g<4; ++g)
|
|
|
+ ast>>spells[spellID].range[g];
|
|
|
ast>>spellID;
|
|
|
}
|
|
|
}
|
mateuszb