Synchronization with trunk, elimination of some warnings

Global.h

@@ -275,6 +275,12 @@ namespace vstd
 		return c.find(i)!=c.end();
 	}
 
+	template <typename V, typename Item, typename Item2>
+	bool contains(const boost::unordered_map<Item,V> & c, const Item2 &i)
+	{
+		return c.find(i)!=c.end();
+	}
+
 	//returns position of first element in vector c equal to s, if there is no such element, -1 is returned
 	template <typename Container, typename T2>
 	int find_pos(const Container & c, const T2 &s)

client/GUIClasses.cpp

@@ -532,12 +532,12 @@ void CGarrisonInt::createSet(std::vector<CGarrisonSlot*> &ret, const CCreatureSe
 		}
 	}
 
-	for(int i=0; i<ret.size(); i++)
+	for(size_t i=0; i<ret.size(); ++i)
 		if(!ret[i])
 			ret[i] = new CGarrisonSlot(this, posX + (i*distance), posY, SlotID(i), Upg, NULL);
 
 	if (twoRows)
-		for (int i=4; i<ret.size(); i++)
+		for (size_t i=4; i<ret.size(); ++i)
 		{
 			ret[i]->pos.x -= 126;
 			ret[i]->pos.y += 37;
@@ -654,7 +654,7 @@ CInfoWindow::CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo
 
 	type |= BLOCK_ADV_HOTKEYS;
 	ID = -1;
-	for(int i=0;i<Buttons.size();i++)
+	for(size_t i=0; i<Buttons.size(); ++i)
 	{
 		CAdventureMapButton *button = new CAdventureMapButton("","",boost::bind(&CInfoWindow::close,this),0,0,Buttons[i].first);
 		button->borderColor = Colors::METALLIC_GOLD;
@@ -676,7 +676,7 @@ CInfoWindow::CInfoWindow(std::string Text, PlayerColor player, const TCompsInfo
 		buttons.back()->assignedKeys.insert(SDLK_ESCAPE); //last button - reacts on escape
 	}
 
-	for(int i=0;i<comps.size();i++)
+	for(size_t i=0; i<comps.size(); ++i)
 	{
 		comps[i]->recActions = 0xff;
 		addChild(comps[i]);
@@ -710,7 +710,7 @@ CInfoWindow::~CInfoWindow()
 {
 	if(!delComps)
 	{
-		for (int i=0;i<components.size();i++)
+		for (size_t i=0; i<components.size(); ++i)
 			removeChild(components[i]);
 	}
 }
@@ -728,9 +728,9 @@ void CInfoWindow::showYesNoDialog(const std::string & text, const std::vector<CC
 	pom.push_back(std::pair<std::string,CFunctionList<void()> >("IOKAY.DEF",0));
 	pom.push_back(std::pair<std::string,CFunctionList<void()> >("ICANCEL.DEF",0));
 	CInfoWindow * temp = new CInfoWindow(text, player, components ? *components : std::vector<CComponent*>(), pom, DelComps);
-	for(int i=0;i<onYes.funcs.size();i++)
+	for(size_t i=0; i<onYes.funcs.size(); ++i)
 		temp->buttons[0]->callback += onYes.funcs[i];
-	for(int i=0;i<onNo.funcs.size();i++)
+	for(size_t i=0; i<onNo.funcs.size(); ++i)
 		temp->buttons[1]->callback += onNo.funcs[i];
 
 	GH.pushInt(temp);
@@ -1266,7 +1266,7 @@ CSelWindow::CSelWindow(const std::string &Text, PlayerColor player, int charperl
 {
 	OBJ_CONSTRUCTION_CAPTURING_ALL;
 	ID = askID;
-	for(int i=0;i<Buttons.size();i++)
+	for(size_t i=0; i<Buttons.size(); ++i)
 	{
 		buttons.push_back(new CAdventureMapButton("","",Buttons[i].second,0,0,Buttons[i].first));
 		if(!i  &&  askID >= 0)
@@ -1282,7 +1282,7 @@ CSelWindow::CSelWindow(const std::string &Text, PlayerColor player, int charperl
 	if(buttons.size() > 1  &&  askID >= 0) //cancel button functionality
 		buttons.back()->callback += boost::bind(&CCallback::selectionMade,LOCPLINT->cb,0,askID);
 
-	for(int i=0;i<comps.size();i++)
+	for(size_t i=0; i<comps.size(); ++i)
 	{
 		comps[i]->recActions = 255;
 		addChild(comps[i]);
@@ -1299,7 +1299,7 @@ void CSelWindow::madeChoice()
 	if(ID < 0)
 		return;
 	int ret = -1;
-	for (int i=0;i<components.size();i++)
+	for (size_t i=0; i<components.size(); ++i)
 	{
 		if(dynamic_cast<CSelectableComponent*>(components[i])->selected)
 		{
@@ -1561,7 +1561,7 @@ void CRecruitmentWindow::availableCreaturesChanged()
 		delete card;
 	cards.clear();
 
-	for(int i=0; i<dwelling->creatures.size(); i++)
+	for(size_t i=0; i<dwelling->creatures.size(); ++i)
 	{
 		//find appropriate level
 		if(level >= 0 && i != level)
@@ -2678,9 +2678,9 @@ CMarketplaceWindow::CMarketplaceWindow(const IMarket *Market, const CGHeroInstan
 CMarketplaceWindow::~CMarketplaceWindow()
 {
 	hLeft = hRight = NULL;
-	for(int i=0;i<items[1].size();i++)
+	for(size_t i=0; i<items[1].size(); ++i)
 		delete items[1][i];
-	for(int i=0;i<items[0].size();i++)
+	for(size_t i=0; i<items[0].size(); ++i)
 		delete items[0][i];
 
 	items[1].clear();
@@ -3108,7 +3108,7 @@ void CAltarWindow::makeDeal()
 		slider->value = 0;
 
 		std::vector<int> toSacrifice = sacrificedUnits;
-		for (int i = 0; i < toSacrifice.size(); i++)
+		for (size_t i = 0; i < toSacrifice.size(); ++i)
 		{
 			if(toSacrifice[i])
 				LOCPLINT->cb->trade(market->o, mode, i, 0, toSacrifice[i], hero);
@@ -3268,7 +3268,7 @@ void CAltarWindow::calcTotalExp()
 	int val = 0;
 	if(mode == EMarketMode::CREATURE_EXP)
 	{
-		for (int i = 0; i < sacrificedUnits.size(); i++)
+		for (size_t i=0; i<sacrificedUnits.size(); ++i)
 		{
 			val += expPerUnit[i] * sacrificedUnits[i];
 		}
@@ -3321,7 +3321,7 @@ void CAltarWindow::SacrificeBackpack()
 {
 	std::multiset<const CArtifactInstance *> toOmmit = arts->artifactsOnAltar;
 
-	for (int i = 0; i < hero->artifactsInBackpack.size(); i++)
+	for (size_t i = 0; i < hero->artifactsInBackpack.size(); ++i)
 	{
 
 		if(vstd::contains(toOmmit, hero->artifactsInBackpack[i].artifact))
@@ -3815,7 +3815,7 @@ void CInGameConsole::show(SDL_Surface * to)
 		}
 	}
 
-	for(int it=0; it<toDel.size(); ++it)
+	for(size_t it=0; it<toDel.size(); ++it)
 	{
 		texts.erase(toDel[it]);
 	}
@@ -3837,7 +3837,7 @@ void CInGameConsole::print(const std::string &txt)
 	else
 	{
 		assert(lineLen);
-		for(int g=0; g<txt.size() / lineLen + 1; ++g)
+		for(size_t g=0; g<txt.size() / lineLen + 1; ++g)
 		{
 			std::string part = txt.substr(g * lineLen, lineLen);
 			if(part.size() == 0)
@@ -4590,7 +4590,7 @@ void CArtifactsOfHero::setHero(const CGHeroInstance * hero)
 		backpackPos = 0;
 
 	// Fill the slots for worn artifacts and backpack.
-	for (int g = 0; g < artWorn.size() ; g++)
+	for (size_t g=0; g<artWorn.size(); ++g)
 		setSlotData(artWorn[g], ArtifactPosition(g));
 	scrollBackpack(0);
 }
@@ -4604,7 +4604,7 @@ void CArtifactsOfHero::dispose()
 
 void CArtifactsOfHero::scrollBackpack(int dir)
 {
-	int artsInBackpack = curHero->artifactsInBackpack.size();
+	size_t artsInBackpack = curHero->artifactsInBackpack.size();
 	backpackPos += dir;
 	if(backpackPos < 0)// No guarantee of modulus behavior with negative operands -> we keep it positive
 		backpackPos += artsInBackpack;
@@ -4641,13 +4641,13 @@ void CArtifactsOfHero::scrollBackpack(int dir)
 			}
 		}
 	}
-	for( ; s - omitedSoFar < backpack.size(); s++)
+	for( ; s - omitedSoFar < backpack.size(); ++s)
 		eraseSlotData(backpack[s-omitedSoFar], ArtifactPosition(GameConstants::BACKPACK_START + s));
 
 	//in artifact merchant selling artifacts we may have highlight on one of backpack artifacts -> market needs update, cause artifact under highlight changed
 	if(highlightModeCallback)
 	{
-		for(int i = 0; i < backpack.size(); i++)
+		for(size_t i=0; i<backpack.size(); ++i)
 		{
 			if(backpack[i]->marked)
 			{
@@ -5000,7 +5000,7 @@ void CArtifactsOfHero::artifactDisassembled(const ArtifactLocation &al)
 
 void CArtifactsOfHero::updateWornSlots(bool redrawParent /*= true*/)
 {
-	for(int i = 0; i < artWorn.size(); i++)
+	for(size_t i = 0; i < artWorn.size(); ++i)
 		updateSlot(ArtifactPosition(i));
 
 
@@ -5049,7 +5049,7 @@ void CExchangeWindow::prepareBackground()
 		               boost::lexical_cast<std::string>(heroWArt.getPrimSkillLevel(static_cast<PrimarySkill::PrimarySkill>(m))));
 
 		//printing secondary skills
-		for(int m=0; m<heroInst[b]->secSkills.size(); ++m)
+		for(size_t m=0; m<heroInst[b]->secSkills.size(); ++m)
 		{
 			int id = heroInst[b]->secSkills[m].first;
 			int level = heroInst[b]->secSkills[m].second;
@@ -5332,14 +5332,14 @@ CTransformerWindow::CItem::CItem(CTransformerWindow * parent, int size, int id):
 
 void CTransformerWindow::makeDeal()
 {
-	for (int i=0; i<items.size(); i++)
+	for (size_t i=0; i<items.size(); ++i)
 		if (!items[i]->left)
 			LOCPLINT->cb->trade(town, EMarketMode::CREATURE_UNDEAD, items[i]->id, 0, 0, hero);
 }
 
 void CTransformerWindow::addAll()
 {
-	for (int i=0; i<items.size(); i++)
+	for (size_t i=0; i<items.size(); ++i)
 		if (items[i]->left)
 			items[i]->move();
 	showAll();
@@ -5485,7 +5485,7 @@ CUniversityWindow::CUniversityWindow(const CGHeroInstance * _hero, const IMarket
 
 	assert(list.size() == 4);
 
-	for (int i=0; i<list.size(); i++)//prepare clickable items
+	for (size_t i=0; i<list.size(); ++i)//prepare clickable items
 		items.push_back(new CItem(this, list[i], 54+i*104, 234));
 
 	cancel = new CAdventureMapButton(CGI->generaltexth->zelp[632],
@@ -5760,16 +5760,16 @@ CThievesGuildWindow::CThievesGuildWindow(const CGObjectInstance * _owner):
 		new CLabel(135, y, FONT_MEDIUM, CENTER, Colors::YELLOW, text);
 	}
 
-	for(int g=1; g<tgi.playerColors.size(); ++g)
+	for(size_t g=1; g<tgi.playerColors.size(); ++g)
 		new CAnimImage("PRSTRIPS", g-1, 0, 250 + 66*g, 7);
 
-	for(int g=0; g<tgi.playerColors.size(); ++g)
+	for(size_t g=0; g<tgi.playerColors.size(); ++g)
 		new CLabel(283 + 66*g, 24, FONT_BIG, CENTER, Colors::YELLOW, CGI->generaltexth->jktexts[16+g]);
 
 	//printing flags
-	for(int g = 0; g < ARRAY_COUNT(fields); ++g) //by lines
+	for(size_t g=0; g < ARRAY_COUNT(fields); ++g) //by lines
 	{
-		for(int b=0; b<(tgi .* fields[g]).size(); ++b) //by places (1st, 2nd, ...)
+		for(size_t b=0; b<(tgi .* fields[g]).size(); ++b) //by places (1st, 2nd, ...)
 		{
 			std::vector<PlayerColor> &players = (tgi .* fields[g])[b]; //get players with this place in this line
 
@@ -5813,7 +5813,7 @@ CThievesGuildWindow::CThievesGuildWindow(const CGObjectInstance * _owner):
 			{
 				new CTextBox(CGI->generaltexth->allTexts[184], Rect(260 + 66*counter, 396, 52, 64),
 				             0, FONT_TINY, TOPLEFT, Colors::WHITE);
-				for (int i=0; i<iter.second.details->primskills.size(); ++i)
+				for (size_t i=0; i<iter.second.details->primskills.size(); ++i)
 				{
 					new CLabel(310 + 66 * counter, 407 + 11*i, FONT_TINY, BOTTOMRIGHT, Colors::WHITE,
 					           boost::lexical_cast<std::string>(iter.second.details->primskills[i]));
@@ -5889,7 +5889,7 @@ void MoraleLuckBox::set(const IBonusBearer *node)
 		}
 		else
 		{
-			for(int it=0; it < mrl.size(); it++)
+			for(size_t it=0; it < mrl.size(); ++it)
 				text += "\n" + mrl[it].second;
 		}
 	}

config/bonusnames.json

@@ -58,6 +58,8 @@
 			{ "id": "SPELLCASTER", "name": "Spellcaster (%s)", "description": "Can cast spells" },
 			{ "id": "ENCHANTER", "name": "Enchanter (%s)", "description": "Casts mass spell every turn" },
 			{ "id": "ENCHANTED", "name": "Enchanted (%s)", "description": "Affected by permanent spell" },
+			{ "id": "FIRE_SHIELD", "name": "Fire Shield (%d%)", "description": "Reflects melee damage" },
+			{ "id": "MAGIC_MIRROR", "name": "Magic Mirror (%d%)", "description": "Chance to reflect hostile spell" },
 			{ "id": "RANDOM_SPELLCASTER", "name": "Random spellcaster", "description": "Can cast random spell" },
 			{ "id": "DAEMON_SUMMONING", "name": "Summoner (%s)", "description": "Can rise creatures from corpses" }
 		]

config/creatures/conflux.json

@@ -298,6 +298,7 @@
 		"level": 7,
 		"faction": "conflux",
 		"upgrades": ["phoenix"],
+		"abilities": [ ["FIRE_IMMUNITY", 0, 0, 0] ],
 		"graphics" :
 		{
 			"animation": "CFBIRD.DEF"
@@ -317,6 +318,7 @@
 		"level": 7,
 		"faction": "conflux",
 		"abilities": [ [ "CASTS", 1, 0, 0 ],	//Phoenix rebirths once
+						["FIRE_IMMUNITY", 0, 0, 0],
 						[ "REBIRTH", 20, 0, 0 ] ],	//20% of stack is resurrected
 		"graphics" :
 		{

config/creatures/neutral.json

@@ -42,6 +42,7 @@
 	},
 	"azureDragon" :
 	{
+		"special" : true,
 		"id": 132,
 		"level": 10,
 		"faction": "neutral",
@@ -65,8 +66,9 @@
 	},
 	"crystalDragon" :
 	{
+		"special" : true,
 		"id": 133,
-		"level": 10,
+		"level": 9,
 		"faction": "neutral",
 		"abilities": [ [ "DRAGON_NATURE", 0, 0, 0 ] ],			//crystal dragon is a dragon
 		"ability_remove": [ "FLYING" ],							//Crystal Dragons do not fly
@@ -85,10 +87,12 @@
 	},
 	"fairieDragon" :
 	{
+		"special" : true,
 		"id": 134,
 		"level": 8,
 		"faction": "neutral",
 		"abilities": [ [ "DRAGON_NATURE", 0, 0, 0 ],			//faerie dragon is a dragon
+						[ "MAGIC_MIRROR", 30, 0, 0 ]
 						[ "CASTS", 5, 0, 0 ],
 						[ "CREATURE_SPELL_POWER", 500, 0, 0], 	//5 spell power per dragon
 						[ "SPELLCASTER", 2, "spell.magicArrow", 10 ],			
@@ -115,8 +119,9 @@
 	},
 	"rustDragon" :
 	{
+		"special" : true,
 		"id": 135,
-		"level": 10,
+		"level": 9,
 		"faction": "neutral",
 		"abilities": [ [ "SPELL_AFTER_ATTACK", 100, 80, 0 ],			//always reduce defense
 						 [ "ACID_BREATH", 25, 0, 20 ],			//20% chance to do 25 damage
@@ -136,6 +141,7 @@
 	},
 	"enchanter" :
 	{
+		"special" : true,
 		"id": 136,
 		"level": 6,
 		"extraNames": [ "enchanters" ],
@@ -169,6 +175,7 @@
 	},
 	"sharpshooter" :
 	{
+		"special" : true,
 		"id": 137,
 		"level": 4,
 		"extraNames": [ "sharpshooters" ],

config/gameConfig.json

@@ -30,5 +30,19 @@
 		"config/creatures/neutral.json",
 		"config/creatures/special.json",
 		"config/creatures/wog.json"
-	]
+	],
+
+	"heroes" :
+	[
+		"config/heroes/castle.json",
+		"config/heroes/rampart.json",
+		"config/heroes/tower.json",
+		"config/heroes/necropolis.json",
+		"config/heroes/inferno.json",
+		"config/heroes/dungeon.json",
+		"config/heroes/stronghold.json",
+		"config/heroes/fortress.json",
+		"config/heroes/conflux.json",
+		"config/heroes/special.json"
+	],
 }

config/heroes/castle.json

@@ -0,0 +1,250 @@
+{
+	"orrin":
+	{
+		"id": 0,
+		"class" : "knight",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "archery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 1, "info": 0 }
+		]
+	},
+	"valeska":
+	{
+		"id": 1,
+		"class" : "knight",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "archery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 2 }
+		]
+	},
+	"edric":
+	{
+		"id": 2,
+		"class" : "knight",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "armorer", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 4 }
+		]
+	},
+	"sylvia":
+	{
+		"id": 3,
+		"class" : "knight",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "navigation", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 2, "subtype": 5, "info": 1 }
+		]
+	},
+	"lordHaart":
+	{
+		"id": 4,
+		"class" : "knight",
+		"female": false,
+		"special" : true, // Lord Haart in his living form. Disabled in H3 expansions
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "estates", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 13, "info": 0 }
+		]
+	},
+	"sorsha":
+	{
+		"id": 5,
+		"class" : "knight",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 6 }
+		]
+	},
+	"christian":
+	{
+		"id": 6,
+		"class" : "knight",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "artillery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"tyris":
+	{
+		"id": 7,
+		"class" : "knight",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 10 }
+		]
+	},
+	"rion":
+	{
+		"id": 8,
+		"class" : "cleric",
+		"female": false,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "firstAid", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 27, "info": 0 }
+		]
+	},
+	"adela":
+	{
+		"id": 9,
+		"class" : "cleric",
+		"female": true,
+		"spellbook": [ "bless" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "diplomacy", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":6, "val": 3, "subtype": 41, "info": 0 }
+		]
+	},
+	"cuthbert":
+	{
+		"id": 10,
+		"class" : "cleric",
+		"female": false,
+		"spellbook": [ "weakness" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "estates", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 45, "info": 0 }
+		]
+	},
+	"adelaide":
+	{
+		"id": 11,
+		"class" : "cleric",
+		"female": true,
+		"spellbook": [ "frostRing" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 20, "info": 0 }
+		]
+	},
+	"ingham":
+	{
+		"id": 12,
+		"class" : "cleric",
+		"female": false,
+		"spellbook": [ "curse" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 8 }
+		]
+	},
+	"sanya":
+	{
+		"id": 13,
+		"class" : "cleric",
+		"female": true,
+		"spellbook": [ "dispel" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 0 }
+		]
+	},
+	"loynis":
+	{
+		"id": 14,
+		"class" : "cleric",
+		"spellbook": [ "prayer" ],
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 48, "info": 0 }
+		]
+	},
+	"caitlin":
+	{
+		"id": 15,
+		"class" : "cleric",
+		"female": true,
+		"spellbook": [ "cure" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	}
+}

config/heroes/conflux.json

@@ -0,0 +1,258 @@
+{
+	"pasis":
+	{
+		"id": 128,
+		"class" : "planeswalker",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "artillery", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 3, "subtype": 1, "info": 120 },
+			{ "type":4, "val": 3, "subtype": 2, "info": 120 }
+		]
+	},
+	"thunar":
+	{
+		"id": 129,
+		"class" : "planeswalker",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "estates", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 2, "subtype": 1, "info": 113 },
+			{ "type":4, "val": 1, "subtype": 2, "info": 113 },
+			{ "type":4, "val": 5, "subtype": 4, "info": 113 }
+		]
+	},
+	"ignissa":
+	{
+		"id": 130,
+		"class" : "planeswalker",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "artillery", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 1, "subtype": 1, "info": 114 },
+			{ "type":4, "val": 2, "subtype": 1, "info": 114 },
+			{ "type":4, "val": 2, "subtype": 3, "info": 114 }
+		]
+	},
+	"lacus":
+	{
+		"id": 131,
+		"class" : "planeswalker",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 2, "subtype": 1, "info": 115 }
+		]
+	},
+	"monere":
+	{
+		"id": 132,
+		"class" : "planeswalker",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "logistics", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 3, "subtype": 1, "info": 120 },
+			{ "type":4, "val": 3, "subtype": 2, "info": 120 }
+		]
+	},
+	"erdamon":
+	{
+		"id": 133,
+		"class" : "planeswalker",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "estates", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 2, "subtype": 1, "info": 113 },
+			{ "type":4, "val": 1, "subtype": 2, "info": 113 },
+			{ "type":4, "val": 5, "subtype": 4, "info": 113 }
+		]
+	},
+	"fiur":
+	{
+		"id": 134,
+		"class" : "planeswalker",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 1, "subtype": 1, "info": 114 },
+			{ "type":4, "val": 2, "subtype": 1, "info": 114 },
+			{ "type":4, "val": 2, "subtype": 3, "info": 114 }
+		]
+	},
+	"kalt":
+	{
+		"id": 135,
+		"class" : "planeswalker",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 2, "subtype": 1, "info": 115 }
+		]
+	},
+	"luna":
+	{
+		"id": 136,
+		"class" : "elementalist",
+		"spellbook": [ "fireWall" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "fireMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":5, "val": 100, "subtype": 13, "info": 0 }
+		]
+	},
+	"brissa":
+	{
+		"id": 137,
+		"class" : "elementalist",
+		"female": true,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "airMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 53, "info": 0 }
+		]
+	},
+	"ciele":
+	{
+		"id": 138,
+		"class" : "elementalist",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "waterMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":5, "val": 50, "subtype": 15, "info": 0 }
+		]
+	},
+	"labetha":
+	{
+		"id": 139,
+		"class" : "elementalist",
+		"female": true,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "earthMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 46, "info": 0 }
+		]
+	},
+	"inteus":
+	{
+		"id": 140,
+		"class" : "elementalist",
+		"female": false,
+		"spellbook": [ "bloodlust" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "fireMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 43, "info": 0 }
+		]
+	},
+	"aenain":
+	{
+		"id": 141,
+		"class" : "elementalist",
+		"female": false,
+		"spellbook": [ "disruptingRay" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "airMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 47, "info": 0 }
+		]
+	},
+	"gelare":
+	{
+		"id": 142,
+		"class" : "elementalist",
+		"female": false,
+		"spellbook": [ "dispel" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "waterMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	},
+	"grindan":
+	{
+		"id": 143,
+		"class" : "elementalist",
+		"female": false,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "earthMagic", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	}
+}

config/heroes/dungeon.json

@@ -0,0 +1,248 @@
+{
+	"lorelei":
+	{
+		"id": 80,
+		"class" : "warlock",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "scouting", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 72 }
+		]
+	},
+	"arlach":
+	{
+		"id": 81,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "artillery", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"dace":
+	{
+		"id": 82,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 78 }
+		]
+	},
+	"ajit":
+	{
+		"id": 83,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 74 }
+		]
+	},
+	"damacon":
+	{
+		"id": 84,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	},
+	"gunnar":
+	{
+		"id": 85,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "logistics", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 2, "info": 0 }
+		]
+	},
+	"synca":
+	{
+		"id": 86,
+		"class" : "warlock",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 80 }
+		]
+	},
+	"shakti":
+	{
+		"id": 87,
+		"class" : "warlock",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 70 }
+		]
+	},
+	"alamar":
+	{
+		"id": 88,
+		"class" : "overlord",
+		"spellbook": [ "resurrection" ],
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 38, "info": 0 }
+		]
+	},
+	"jaegar":
+	{
+		"id": 89,
+		"class" : "overlord",
+		"female": false,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 8, "info": 1 }
+		]
+	},
+	"malekith":
+	{
+		"id": 90,
+		"class" : "overlord",
+		"female": false,
+		"spellbook": [ "bloodlust" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"jeddite":
+	{
+		"id": 91,
+		"class" : "overlord",
+		"female": true,
+		"spellbook": [ "resurrection" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 38, "info": 0 }
+		]
+	},
+	"geon":
+	{
+		"id": 92,
+		"class" : "overlord",
+		"female": false,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 1 }
+		]
+	},
+	"deemer":
+	{
+		"id": 93,
+		"class" : "overlord",
+		"female": false,
+		"spellbook": [ "meteorShower" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scouting", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 23, "info": 0 }
+		]
+	},
+	"sephinroth":
+	{
+		"id": 94,
+		"class" : "overlord",
+		"female": true,
+		"spellbook": [ "protectAir" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 1, "subtype": 4, "info": 0 }
+		]
+	},
+	"darkstorn":
+	{
+		"id": 95,
+		"class" : "overlord",
+		"female": false,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 46, "info": 0 }
+		]
+	}
+}

config/heroes/fortress.json

@@ -0,0 +1,248 @@
+{
+	"bron":
+	{
+		"id": 112,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 1, "subtype": 5, "info": 0 }
+		]
+	},
+	"drakon":
+	{
+		"id": 113,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 106 }
+		]
+	},
+	"wystan":
+	{
+		"id": 114,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "archery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 98 }
+		]
+	},
+	"tazar":
+	{
+		"id": 115,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 100 }
+		]
+	},
+	"alkin":
+	{
+		"id": 116,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 23, "info": 0 }
+		]
+	},
+	"korbac":
+	{
+		"id": 117,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "pathfinding", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 102 }
+		]
+	},
+	"gerwulf":
+	{
+		"id": 118,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "artillery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 104 }
+		]
+	},
+	"broghild":
+	{
+		"id": 119,
+		"class" : "beastmaster",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "basic" },
+			{ "skill" : "scouting", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"mirlanda":
+	{
+		"id": 120,
+		"class" : "witch",
+		"spellbook": [ "weakness" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 108 }
+		]
+	},
+	"rosic":
+	{
+		"id": 121,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 8, "info": 1 }
+		]
+	},
+	"voy":
+	{
+		"id": 122,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "navigation", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 2, "subtype": 5, "info": 1 }
+		]
+	},
+	"verdish":
+	{
+		"id": 123,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "protectFire" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "firstAid", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 27, "info": 1 }
+		]
+	},
+	"merist":
+	{
+		"id": 124,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 46, "info": 0 }
+		]
+	},
+	"styg":
+	{
+		"id": 125,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"andra":
+	{
+		"id": 126,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "dispel" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 24, "info": 0 }
+		]
+	},
+	"tiva":
+	{
+		"id": 127,
+		"class" : "witch",
+		"female": true,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 1 }
+		]
+	}
+}

config/heroes/inferno.json

@@ -0,0 +1,247 @@
+{
+	"fiona":
+	{
+		"id": 48,
+		"class" : "demoniac",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "scouting", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 46 }
+		]
+	},
+	"rashka":
+	{
+		"id": 49,
+		"class" : "demoniac",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 52 }
+		]
+	},
+	"marius":
+	{
+		"id": 50,
+		"class" : "demoniac",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "armorer", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 48 }
+		]
+	},
+	"ignatius":
+	{
+		"id": 51,
+		"class" : "demoniac",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 42 }
+		]
+	},
+	"octavia":
+	{
+		"id": 52,
+		"class" : "demoniac",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "scholar", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	},
+	"calh":
+	{
+		"id": 53,
+		"class" : "demoniac",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "archery", "level": "basic" },
+			{ "skill" : "scouting", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 42 }
+		]
+	},
+	"pyre":
+	{
+		"id": 54,
+		"class" : "demoniac",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "artillery", "level": "basic" },
+			{ "skill" : "logistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"nymus":
+	{
+		"id": 55,
+		"class" : "demoniac",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 50 }
+		]
+	},
+	"ayden":
+	{
+		"id": 56,
+		"class" : "heretic",
+		"spellbook": [ "viewEarth" ],
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 24, "info": 0 }
+		]
+	},
+	"xyron":
+	{
+		"id": 57,
+		"class" : "heretic",
+		"female": false,
+		"spellbook": [ "inferno" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 22, "info": 0 }
+		]
+	},
+	"axsis":
+	{
+		"id": 58,
+		"class" : "heretic",
+		"female": false,
+		"spellbook": [ "protectAir" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 8, "info": 1 }
+		]
+	},
+	"olema":
+	{
+		"id": 59,
+		"class" : "heretic",
+		"female": true,
+		"spellbook": [ "weakness" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "ballistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 45, "info": 0 }
+		]
+	},
+	"calid":
+	{
+		"id": 60,
+		"class" : "heretic",
+		"female": false,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 1, "subtype": 3, "info": 0 }
+		]
+	},
+	"ash":
+	{
+		"id": 61,
+		"class" : "heretic",
+		"female": true,
+		"spellbook": [ "bloodlust" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 43, "info": 0 }
+		]
+	},
+	"zydar":
+	{
+		"id": 62,
+		"class" : "heretic",
+		"female": false,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"xarfax":
+	{
+		"id": 63,
+		"class" : "heretic",
+		"female": false,
+		"spellbook": [ "fireball" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 21, "info": 0 }
+		]
+	}
+}

config/heroes/necropolis.json

@@ -0,0 +1,256 @@
+{
+	"straker":
+	{
+		"id": 64,
+		"class" : "deathknight",
+		"female": false,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 58 }
+		]
+	},
+	"vokial":
+	{
+		"id": 65,
+		"class" : "deathknight",
+		"female": false,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "artillery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 62 }
+		]
+	},
+	"moandor":
+	{
+		"id": 66,
+		"class" : "deathknight",
+		"female": false,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 64 }
+		]
+	},
+	"charna":
+	{
+		"id": 67,
+		"class" : "deathknight",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 60 }
+		]
+	},
+	"tamika":
+	{
+		"id": 68,
+		"class" : "deathknight",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 66 }
+		]
+	},
+	"isra":
+	{
+		"id": 69,
+		"class" : "deathknight",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 12, "info": 0 }
+		]
+	},
+	"clavius":
+	{
+		"id": 70,
+		"class" : "deathknight",
+		"female": false,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	},
+	"galthran":
+	{
+		"id": 71,
+		"class" : "deathknight",
+		"female": false,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "armorer", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 56 }
+		]
+	},
+	"septienna":
+	{
+		"id": 72,
+		"class" : "necromancer",
+		"female": true,
+		"spellbook": [ "deathRipple" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 24, "info": 0 }
+		]
+	},
+	"aislinn":
+	{
+		"id": 73,
+		"class" : "necromancer",
+		"female": true,
+		"spellbook": [ "meteorShower" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "wisdom", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 23, "info": 0 }
+		]
+	},
+	"sandro":
+	{
+		"id": 74,
+		"class" : "necromancer",
+		"female": false,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"nimbus":
+	{
+		"id": 75,
+		"class" : "necromancer",
+		"female": false,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 1 }
+		]
+	},
+	"thant":
+	{
+		"id": 76,
+		"class" : "necromancer",
+		"female": false,
+		"spellbook": [ "animateDead" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 39, "subtype": 0, "info": 3 }
+		]
+	},
+	"xsi":
+	{
+		"id": 77,
+		"class" : "necromancer",
+		"female": true,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "learning", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 46, "info": 0 }
+		]
+	},
+	"vidomina":
+	{
+		"id": 78,
+		"class" : "necromancer",
+		"female": true,
+		"spellbook": [ "curse" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 12, "info": 0 }
+		]
+	},
+	"nagash":
+	{
+		"id": 79,
+		"class" : "necromancer",
+		"female": false,
+		"spellbook": [ "protectAir" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	}
+}

config/heroes/rampart.json

@@ -0,0 +1,248 @@
+{
+	"mephala":
+	{
+		"id": 16,
+		"class" : "ranger",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "armorer", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 23, "info": 0 }
+		]
+	},
+	"ufretin":
+	{
+		"id": 17,
+		"class" : "ranger",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "luck", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 16 }
+		]
+	},
+	"jenova":
+	{
+		"id": 18,
+		"class" : "ranger",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "archery", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	},
+	"ryland":
+	{
+		"id": 19,
+		"class" : "ranger",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "diplomacy", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 22 }
+		]
+	},
+	"thorgrim":
+	{
+		"id": 20,
+		"class" : "ranger",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "resistance", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 26, "info": 0 }
+		]
+	},
+	"ivor":
+	{
+		"id": 21,
+		"class" : "ranger",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "archery", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 18 }
+		]
+	},
+	"clancy":
+	{
+		"id": 22,
+		"class" : "ranger",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "pathfinding", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 24 }
+		]
+	},
+	"kyrre":
+	{
+		"id": 23,
+		"class" : "ranger",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "archery", "level": "basic" },
+			{ "skill" : "logistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 2, "info": 0 }
+		]
+	},
+	"coronius":
+	{
+		"id": 24,
+		"class" : "druid",
+		"spellbook": [ "slayer" ],
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 55, "info": 1 }
+		]
+	},
+	"uland":
+	{
+		"id": 25,
+		"class" : "druid",
+		"female": false,
+		"spellbook": [ "cure" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" },
+			{ "skill" : "ballistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 37, "info": 0 }
+		]
+	},
+	"elleshar":
+	{
+		"id": 26,
+		"class" : "druid",
+		"female": false,
+		"spellbook": [ "curse" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 24, "info": 0 }
+		]
+	},
+	"gem":
+	{
+		"id": 27,
+		"class" : "druid",
+		"female": true,
+		"spellbook": [ "summonBoat" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "firstAid", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 27, "info": 0 }
+		]
+	},
+	"malcom":
+	{
+		"id": 28,
+		"class" : "druid",
+		"female": false,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 0 }
+		]
+	},
+	"melodia":
+	{
+		"id": 29,
+		"class" : "druid",
+		"spellbook": [ "fortune" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "luck", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":7, "val": 0, "subtype": 51, "info": 0 }
+		]
+	},
+	"alagar":
+	{
+		"id": 30,
+		"class" : "druid",
+		"female": false,
+		"spellbook": [ "iceBolt" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 16, "info": 0 }
+		]
+	},
+	"aeris":
+	{
+		"id": 31,
+		"class" : "druid",
+		"female": false,
+		"spellbook": [ "protectAir" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scouting", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 20 }
+		]
+	}
+}

config/heroes/special.json

@@ -0,0 +1,241 @@
+{
+// "special" heroes for campaigns
+	"sirMullich":
+	{
+		"id": 144,
+		"class" : "knight",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":12, "val": 2, "subtype": 0, "info": 0 }
+		]
+	},
+	"adrienne":
+	{
+		"id": 145,
+		"class" : "witch",
+		"female": true,
+		"special" : true,
+		"spellbook": [ "inferno" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "fireMagic", "level": "expert" } ],
+		"specialties":
+		[
+			{ "type":11, "val": 14, "subtype": 0, "info": 0 }
+		]
+	},
+	"catherine":
+	{
+		"id": 146,
+		"class" : "knight",
+		"female": true,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 4 }
+		]
+	},
+	"dracon":
+	{
+		"id": 147,
+		"class" : "wizard",
+		"female": false,
+		"special" : true,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":9, "val": 0, "subtype": 8, "info": 136 },
+			{ "type":9, "val": 0, "subtype": 34, "info": 136 }
+		]
+	},
+	"gelu":
+	{
+		"id": 148,
+		"class" : "ranger",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "archery", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":9, "val": 0, "subtype": 2, "info": 137 },
+			{ "type":9, "val": 0, "subtype": 18, "info": 137 }
+		]
+	},
+	"kilgor":
+	{
+		"id": 149,
+		"class" : "barbarian",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 5,  "subtype": 1, "info": 96 },
+			{ "type":4, "val": 5,  "subtype": 2, "info": 96 },
+			{ "type":4, "val": 10, "subtype": 3, "info": 96 }
+		]
+	},
+	"undeadHaart": // undead version of Lord Haart
+	{
+		"id": 150,
+		"class" : "deathknight",
+		"female": false,
+		"special" : true,
+		"spellbook": [ "slow" ],
+		"skills":
+		[
+			{ "skill" : "necromancy", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 5,  "subtype": 1, "info": 66 },
+			{ "type":4, "val": 5,  "subtype": 2, "info": 66 },
+			{ "type":4, "val": 10, "subtype": 3, "info": 66 }
+		]
+	},
+	"mutare":
+	{
+		"id": 151,
+		"class" : "warlock",
+		"female": true,
+		"special" : true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "estates", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":13, "val": 5, "subtype": 1, "info": 0 },
+			{ "type":13, "val": 5, "subtype": 2, "info": 0 }
+		]
+	},
+	"roland":
+	{
+		"id": 152,
+		"class" : "knight",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "armorer", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 4 }
+		]
+	},
+	"mutareDrake":
+	{
+		"id": 153,
+		"class" : "warlock",
+		"female": true,
+		"special" : true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "estates", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":13, "val": 1, "subtype": 1, "info": 5 },
+			{ "type":13, "val": 1, "subtype": 1, "info": 5 }
+		],
+		"army" :
+		[
+			{
+				"creature" : "troglodyte"
+			},
+			{
+				"creature" : "harpy"
+			},
+			{
+				"creature" : "evilEye"
+			}
+		]
+	},
+	"boragus":
+	{
+		"id": 154,
+		"class" : "barbarian",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "tactics", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 90 }
+		],
+		"army" :
+		[
+			{
+				"creature" : "goblin"
+			},
+			{
+				"creature" : "goblinWolfRider"
+			},
+			{
+				"creature" : "orc"
+			}
+		]
+	},
+	"xeron":
+	{
+		"id": 155,
+		"class" : "demoniac",
+		"female": false,
+		"special" : true,
+		"skills":
+		[
+			{ "skill" : "leadership", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":4, "val": 4, "subtype": 1, "info": 54 },
+			{ "type":4, "val": 2, "subtype": 2, "info": 54 },
+			{ "type":4, "val": 1, "subtype": 5, "info": 54 }
+		],
+		"army" :
+		[
+			{
+				"creature" : "imp"
+			},
+			{
+				"creature" : "hellHound"
+			},
+			{
+				"creature" : "hellHound"
+			}
+		]
+	}
+}

config/heroes/stronghold.json

@@ -0,0 +1,245 @@
+{
+	"yog":
+	{
+		"id": 96,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "ballistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 94 }
+		]
+	},
+	"gurnisson":
+	{
+		"id": 97,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "artillery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"jabarkas":
+	{
+		"id": 98,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "archery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 88 }
+		]
+	},
+	"shiva":
+	{
+		"id": 99,
+		"class" : "barbarian",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "scouting", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 92 }
+		]
+	},
+	"gretchin":
+	{
+		"id": 100,
+		"class" : "barbarian",
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "pathfinding", "level": "basic" }
+		]
+	},
+	"krellion":
+	{
+		"id": 101,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 84 }
+		]
+	},
+	"cragHack":
+	{
+		"id": 102,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 90 }
+		]
+	},
+	"tyraxor":
+	{
+		"id": 103,
+		"class" : "barbarian",
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "offence", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 22, "info": 0 }
+		]
+	},
+	"gird":
+	{
+		"id": 104,
+		"class" : "battlemage",
+		"spellbook": [ "bloodlust" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 86 }
+		]
+	},
+	"vey":
+	{
+		"id": 105,
+		"class" : "battlemage",
+		"female": false,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "leadership", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"dessa":
+	{
+		"id": 106,
+		"class" : "battlemage",
+		"female": true,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "logistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 90 }
+		]
+	},
+	"terek":
+	{
+		"id": 107,
+		"class" : "battlemage",
+		"female": false,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 2, "info": 0 }
+		]
+	},
+	"zubin":
+	{
+		"id": 108,
+		"class" : "battlemage",
+		"female": false,
+		"spellbook": [ "precision" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "artillery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 53, "info": 0 }
+		]
+	},
+	"gundula":
+	{
+		"id": 109,
+		"class" : "battlemage",
+		"spellbook": [ "slow" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 44, "info": 0 }
+		]
+	},
+	"oris":
+	{
+		"id": 110,
+		"class" : "battlemage",
+		"female": true,
+		"spellbook": [ "protectAir" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 25, "info": 0 }
+		]
+	},
+	"saurug":
+	{
+		"id": 111,
+		"class" : "battlemage",
+		"female": false,
+		"spellbook": [ "bloodlust" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 1 }
+		]
+	}
+}

config/heroes/tower.json

@@ -0,0 +1,256 @@
+{
+	"piquedram":
+	{
+		"id": 32,
+		"class" : "alchemist",
+		"female": false,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "scouting", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 30 }
+		]
+	},
+	"thane":
+	{
+		"id": 33,
+		"class" : "alchemist",
+		"female": false,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "scholar", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 36 }
+		]
+	},
+	"josephine":
+	{
+		"id": 34,
+		"class" : "alchemist",
+		"spellbook": [ "haste" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "mysticism", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 32 }
+		]
+	},
+	"neela":
+	{
+		"id": 35,
+		"class" : "alchemist",
+		"female": true,
+		"spellbook": [ "shield" ],
+		"skills":
+		[
+			{ "skill" : "scholar", "level": "basic" },
+			{ "skill" : "armorer", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 23, "info": 0 }
+		]
+	},
+	"torosar ":
+	{
+		"id": 36,
+		"class" : "alchemist",
+		"female": false,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "mysticism", "level": "basic" },
+			{ "skill" : "tactics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 146 }
+		]
+	},
+	"fafner":
+	{
+		"id": 37,
+		"class" : "alchemist",
+		"female": false,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "scholar", "level": "basic" },
+			{ "skill" : "resistance", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 38 }
+		]
+	},
+	"rissa":
+	{
+		"id": 38,
+		"class" : "alchemist",
+		"female": true,
+		"spellbook": [ "magicArrow" ],
+		"skills":
+		[
+			{ "skill" : "mysticism", "level": "basic" },
+			{ "skill" : "offence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 1, "subtype": 1, "info": 0 }
+		]
+	},
+	"iona":
+	{
+		"id": 39,
+		"class" : "alchemist",
+		"spellbook": [ "magicArrow" ],
+		"female": true,
+		"skills":
+		[
+			{ "skill" : "scholar", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 36 }
+		]
+	},
+	"astral":
+	{
+		"id": 40,
+		"class" : "wizard",
+		"female": false,
+		"spellbook": [ "hypnotize" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "advanced" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 60, "info": 0 }
+		]
+	},
+	"halon":
+	{
+		"id": 41,
+		"class" : "wizard",
+		"female": false,
+		"spellbook": [ "stoneSkin" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "mysticism", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 8, "info": 1 }
+		]
+	},
+	"serena":
+	{
+		"id": 42,
+		"class" : "wizard",
+		"female": true,
+		"spellbook": [ "dispel" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "eagleEye", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":2, "val": 5, "subtype": 11, "info": 0 }
+		]
+	},
+	"daremyth":
+	{
+		"id": 43,
+		"class" : "wizard",
+		"female": true,
+		"spellbook": [ "fortune" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "intelligence", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":7, "val": 0, "subtype": 51, "info": 0 }
+		]
+	},
+	"theodorus":
+	{
+		"id": 44,
+		"class" : "wizard",
+		"spellbook": [ "shield" ],
+		"female": false,
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "ballistics", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":1, "val": 0, "subtype": 0, "info": 34 }
+		]
+	},
+	"solmyr":
+	{
+		"id": 45,
+		"class" : "wizard",
+		"female": false,
+		"spellbook": [ "chainLightning" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "sorcery", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":3, "val": 3, "subtype": 19, "info": 0 }
+		]
+	},
+	"cyra":
+	{
+		"id": 46,
+		"class" : "wizard",
+		"female": true,
+		"spellbook": [ "haste" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "diplomacy", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":8, "val": 0, "subtype": 53, "info": 0 }
+		]
+	},
+	"aine":
+	{
+		"id": 47,
+		"class" : "wizard",
+		"female": true,
+		"spellbook": [ "curse" ],
+		"skills":
+		[
+			{ "skill" : "wisdom", "level": "basic" },
+			{ "skill" : "scholar", "level": "basic" }
+		],
+		"specialties":
+		[
+			{ "type":10, "val": 350, "subtype": 6, "info": 0 }
+		]
+	}
+}

lib/CCreatureHandler.cpp

@@ -226,7 +226,6 @@ void CCreatureHandler::loadBonuses(CCreature & ncre, std::string bonuses)
 		("CATAPULT",Bonus::CATAPULT)
 		("MULTI_HEADED",Bonus::ATTACKS_ALL_ADJACENT)
 		("IMMUNE_TO_MIND_SPELLS",Bonus::MIND_IMMUNITY)
-		("IMMUNE_TO_FIRE_SPELLS",Bonus::FIRE_IMMUNITY)
 		("HAS_EXTENDED_ATTACK",Bonus::TWO_HEX_ATTACK_BREATH);
 
 	auto hasAbility = [&](const std::string name) -> bool
@@ -709,7 +708,7 @@ void CCreatureHandler::loadStackExperience(CCreature * creature, const JsonNode
 {
 	BOOST_FOREACH (const JsonNode &exp, input.Vector())
 	{
-		auto bonus = JsonUtils::parseBonus (exp["bonus"]);
+		auto bonus = JsonUtils::parseBonus (exp["bonus"]); // FIXME: memory leak? Only copies of bonus is added to creature
 		bonus->source = Bonus::STACK_EXPERIENCE;
 		bonus->duration = Bonus::PERMANENT;
 		const JsonVector &values = exp["values"].Vector();

lib/CCreatureSet.cpp

@@ -661,6 +661,7 @@ std::string CStackInstance::bonusToString(Bonus *bonus, bool description) const
 				case Bonus::REBIRTH:
 				case Bonus::DEATH_STARE:
 				case Bonus::LIFE_DRAIN:
+				case Bonus::FIRE_SHIELD:
 					boost::algorithm::replace_first(text, "%d", boost::lexical_cast<std::string>(valOfBonuses(Selector::typeSubtype(bonus->type, bonus->subtype))));
 					break;
 				case Bonus::HATE:
@@ -883,6 +884,14 @@ std::string CStackInstance::bonusToGraphics(Bonus *bonus) const
 			fileName = "ManaDrain.bmp"; break;
 		case Bonus::LIFE_DRAIN:
 			fileName = "DrainLife.bmp"; break;
+		case Bonus::FIRE_SHIELD:
+			fileName = "FireShield.bmp"; break;
+		case Bonus::MAGIC_MIRROR:
+			fileName = "MagicMirror.bmp"; break;
+		case Bonus::NON_LIVING:
+			fileName = "NonLiving.bmp"; break;
+		case Bonus::SPELL_LIKE_ATTACK:
+			fileName = "SpellLikeAttack.bmp"; break;
 	}
 	if(!fileName.empty() && !fullPath)
 		fileName = "zvs/Lib1.res/" + fileName;

lib/CGameState.cpp

@@ -536,7 +536,7 @@ std::pair<Obj,int> CGameState::pickObject (CGObjectInstance *obj)
 	case Obj::RANDOM_TOWN:
 		{
 			PlayerColor align = PlayerColor((static_cast<CGTownInstance*>(obj))->alignment);
-			ui32 f;
+			si32 f; // can be negative (for random)
 			if(align >= PlayerColor::PLAYER_LIMIT)//same as owner / random
 			{
 				if(obj->tempOwner >= PlayerColor::PLAYER_LIMIT)

lib/CHeroHandler.cpp

@@ -217,6 +217,9 @@ CHero * CHeroHandler::loadHero(const JsonNode & node)
 {
 	CHero * hero = new CHero;
 
+	hero->sex = node["female"].Bool();
+	hero->special = node["special"].Bool();
+
 	hero->name        = node["texts"]["name"].String();
 	hero->biography   = node["texts"]["biography"].String();
 	hero->specName    = node["texts"]["specialty"]["name"].String();
@@ -229,7 +232,23 @@ CHero * CHeroHandler::loadHero(const JsonNode & node)
 	hero->portraitSmall = node["images"]["small"].String();
 	hero->portraitLarge = node["images"]["large"].String();
 
+	loadHeroArmy(hero, node);
+	loadHeroSkills(hero, node);
+	loadHeroSpecialty(hero, node);
+
+	VLC->modh->identifiers.requestIdentifier("heroClass." + node["class"].String(),
+	[=](si32 classID)
+	{
+		hero->heroClass = classes.heroClasses[classID];
+	});
+
+	return hero;
+}
+
+void CHeroHandler::loadHeroArmy(CHero * hero, const JsonNode & node)
+{
 	assert(node["army"].Vector().size() <= 3); // anything bigger is useless - army initialization uses up to 3 slots
+
 	hero->initialArmy.resize(node["army"].Vector().size());
 
 	for (size_t i=0; i< hero->initialArmy.size(); i++)
@@ -241,22 +260,15 @@ CHero * CHeroHandler::loadHero(const JsonNode & node)
 
 		assert(hero->initialArmy[i].minAmount <= hero->initialArmy[i].maxAmount);
 
-		VLC->modh->identifiers.requestIdentifier(std::string("creature.") + source["creature"].String(), [=](si32 creature)
+		VLC->modh->identifiers.requestIdentifier("creature." + source["creature"].String(), [=](si32 creature)
 		{
 			hero->initialArmy[i].creature = CreatureID(creature);
 		});
 	}
-
-	loadHeroJson(hero, node);
-	return hero;
 }
 
-void CHeroHandler::loadHeroJson(CHero * hero, const JsonNode & node)
+void CHeroHandler::loadHeroSkills(CHero * hero, const JsonNode & node)
 {
-	// sex: 0=male, 1=female
-	hero->sex = node["female"].Bool();
-	hero->special = node["special"].Bool();
-
 	BOOST_FOREACH(const JsonNode &set, node["skills"].Vector())
 	{
 		SecondarySkill skillID = SecondarySkill(
@@ -267,7 +279,7 @@ void CHeroHandler::loadHeroJson(CHero * hero, const JsonNode & node)
 	}
 
 	// spellbook is considered present if hero have "spellbook" entry even when this is an empty set (0 spells)
-	hero->haveSpellBook = node["spellbook"].isNull();
+	hero->haveSpellBook = !node["spellbook"].isNull();
 
 	BOOST_FOREACH(const JsonNode & spell, node["spellbook"].Vector())
 	{
@@ -284,7 +296,10 @@ void CHeroHandler::loadHeroJson(CHero * hero, const JsonNode & node)
 			});
 		}
 	}
+}
 
+void CHeroHandler::loadHeroSpecialty(CHero * hero, const JsonNode & node)
+{
 	//deprecated, used only for original spciealties
 	BOOST_FOREACH(const JsonNode &specialty, node["specialties"].Vector())
 	{
@@ -309,12 +324,6 @@ void CHeroHandler::loadHeroJson(CHero * hero, const JsonNode & node)
 		}
 		hero->specialty.push_back (hs); //now, how to get CGHeroInstance from it?
 	}
-
-	VLC->modh->identifiers.requestIdentifier("heroClass." + node["class"].String(),
-	[=](si32 classID)
-	{
-		hero->heroClass = classes.heroClasses[classID];
-	});
 }
 
 void CHeroHandler::load()
@@ -383,6 +392,14 @@ void CHeroHandler::loadObstacles()
 	//loadObstacles(config["moats"], true, moats);
 }
 
+/// convert h3-style ID (e.g. Gobin Wolf Rider) to vcmi (e.g. goblinWolfRider)
+static std::string genRefName(std::string input)
+{
+	boost::algorithm::replace_all(input, " ", ""); //remove spaces
+	input[0] = std::tolower(input[0]); // to camelCase
+	return input;
+}
+
 void CHeroHandler::loadHeroes()
 {
 	CLegacyConfigParser specParser("DATA/HEROSPEC.TXT");
@@ -395,44 +412,57 @@ void CHeroHandler::loadHeroes()
 	specParser.endLine(); //ignore header
 	specParser.endLine();
 
+	std::vector<JsonNode> h3Data;
+
 	for (int i=0; i<GameConstants::HEROES_QUANTITY; i++)
 	{
-		CHero * hero = new CHero;
+		JsonNode heroData;
-		hero->name = parser.readString();
 
-		hero->specName    = specParser.readString();
+		heroData["texts"]["name"].String() = parser.readString();
-		hero->specTooltip = specParser.readString();
+		heroData["texts"]["biography"].String() = bioParser.readString();
-		hero->specDescr   = specParser.readString();
+		heroData["texts"]["specialty"]["name"].String() = specParser.readString();
-		hero->biography   = bioParser.readString();
+		heroData["texts"]["specialty"]["tooltip"].String() = specParser.readString();
+		heroData["texts"]["specialty"]["description"].String() = specParser.readString();
+
+		heroData["images"]["index"].Float() = i;
 
-		hero->initialArmy.resize(3);
 		for(int x=0;x<3;x++)
 		{
-			hero->initialArmy[x].minAmount = parser.readNumber();
+			JsonNode armySlot;
-			hero->initialArmy[x].maxAmount = parser.readNumber();
+			armySlot["min"].Float() = parser.readNumber();
+			armySlot["max"].Float() = parser.readNumber();
+			armySlot["creature"].String() = genRefName(parser.readString());
 
-			std::string refName = parser.readString();
+			heroData["army"].Vector().push_back(armySlot);
-			boost::algorithm::replace_all(refName, " ", ""); //remove spaces
-			refName[0] = std::tolower(refName[0]); // to camelCase
-			VLC->modh->identifiers.requestIdentifier(std::string("creature.") + refName, [=](si32 creature)
-			{
-				hero->initialArmy[x].creature = CreatureID(creature);
-			});
 		}
 		parser.endLine();
 		specParser.endLine();
 		bioParser.endLine();
 
-		hero->ID = heroes.size();
+		h3Data.push_back(heroData);
-		hero->imageIndex = hero->ID;
-		heroes.push_back(hero);
 	}
 
 	// Load heroes information
-	const JsonNode config(ResourceID("config/heroes.json"));
+	heroes.resize(GameConstants::HEROES_QUANTITY);
-	BOOST_FOREACH(const JsonNode &hero, config["heroes"].Vector())
+
+	const JsonNode gameConf(ResourceID("config/gameConfig.json"));
+	JsonNode config(JsonUtils::assembleFromFiles(gameConf["heroes"].convertTo<std::vector<std::string> >()));
+
+	BOOST_FOREACH(auto &entry, config.Struct())
 	{
-		loadHeroJson(heroes[hero["id"].Float()], hero);
+		ui32 identifier = entry.second["id"].Float();
+		JsonUtils::merge(h3Data[identifier], entry.second);
+		CHero * hero = loadHero(h3Data[identifier]);
+		hero->ID = identifier;
+		heroes[identifier] = hero;
+
+		VLC->modh->identifiers.registerObject("hero." + entry.first, identifier);
+	}
+
+	for (size_t i=0; i < heroes.size(); i++)
+	{
+		if (heroes[i] == nullptr)
+			tlog0 << "Warning: hero with id " << i << " is missing!\n";
 	}
 }
 

lib/CHeroHandler.h

@@ -177,8 +177,10 @@ class DLL_LINKAGE CHeroHandler
 	/// consists of 201 values. Any higher levels require experience larger that ui64 can hold
 	std::vector<ui64> expPerLevel;
 
-	/// common function for loading heroes from mods and from H3
+	/// helpers for loading to avoid huge load functions
-	void loadHeroJson(CHero * hero, const JsonNode & node);
+	void loadHeroArmy(CHero * hero, const JsonNode & node);
+	void loadHeroSkills(CHero * hero, const JsonNode & node);
+	void loadHeroSpecialty(CHero * hero, const JsonNode & node);
 public:
 	CHeroClassHandler classes;
 

lib/GameConstants.h

@@ -741,7 +741,7 @@ public:
 		PENDANT_OF_SORCERY = 150,
 		BOOTS_OF_HASTE = 151,
 		BOW_OF_SEEKING = 152,
-		DRAGON_EYE_RING = 153,
+		DRAGON_EYE_RING = 153
 		//HARDENED_SHIELD = 154,
 		//SLAVAS_RING_OF_POWER = 155
 	};

server/CVCMIServer.cpp

@@ -499,7 +499,7 @@ void CVCMIServer::loadGame()
 	gh.run(true);
 }
 
-#ifndef __GNUC__
+#ifdef _WIN32
 int _tmain(int argc, _TCHAR* argv[])
 #else
 int main(int argc, char** argv)