Browse Source

Created heroes.json from heroes_sec_skills.txt.

Frank Zago 14 years ago
parent
commit
fc9282fd50
3 changed files with 177 additions and 188 deletions
  1. 165 0
      config/heroes.json
  2. 0 158
      config/heroes_sec_skills.txt
  3. 12 30
      lib/CHeroHandler.cpp

+ 165 - 0
config/heroes.json

@@ -0,0 +1,165 @@
+{
+	// heroes' information.
+	//   id: hero id
+	//   sex: male/female
+	//   skill_set: initial set of secondary abilities (skill ID, initial skil level)
+
+	"heroes": [
+		{ "id": 0, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 1, "level": 1 } ] },
+		{ "id": 1, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 1, "level": 1 } ] },
+		{ "id": 2, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 23, "level": 1 } ] },
+		{ "id": 3, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 5, "level": 1 } ] },
+		{ "id": 4, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 13, "level": 1 } ] },
+		{ "id": 5, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 6, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 20, "level": 1 } ] },
+		{ "id": 7, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 8, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ] },
+		{ "id": 9, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 4, "level": 1 } ] },
+		{ "id": 10, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 13, "level": 1 } ] },
+		{ "id": 11, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ] },
+		{ "id": 12, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 13, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 14, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 15, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 16, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 23, "level": 1 } ] },
+		{ "id": 17, "sex": 0, "skill_set": [ { "skill": 9, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 18, "sex": 1, "skill_set": [ { "skill": 1, "level": 2 } ] },
+		{ "id": 19, "sex": 0, "skill_set": [ { "skill": 4, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 20, "sex": 0, "skill_set": [ { "skill": 26, "level": 2 } ] },
+		{ "id": 21, "sex": 0, "skill_set": [ { "skill": 1, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 22, "sex": 0, "skill_set": [ { "skill": 0, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 23, "sex": 1, "skill_set": [ { "skill": 1, "level": 1 }, { "skill": 2, "level": 1 } ] },
+		{ "id": 24, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 25, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 }, { "skill": 10, "level": 1 } ] },
+		{ "id": 26, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 27, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ] },
+		{ "id": 28, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 29, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 9, "level": 1 } ] },
+		{ "id": 30, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 31, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 3, "level": 1 } ] },
+		{ "id": 32, "sex": 0, "skill_set": [ { "skill": 3, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 33, "sex": 0, "skill_set": [ { "skill": 18, "level": 2 } ] },
+		{ "id": 34, "sex": 1, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 35, "sex": 1, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 23, "level": 1 } ] },
+		{ "id": 36, "sex": 0, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 37, "sex": 0, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 38, "sex": 1, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 39, "sex": 1, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 40, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 } ] },
+		{ "id": 41, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 42, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 43, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 44, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 10, "level": 1 } ] },
+		{ "id": 45, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 46, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 4, "level": 1 } ] },
+		{ "id": 47, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 48, "sex": 1, "skill_set": [ { "skill": 3, "level": 2 } ] },
+		{ "id": 49, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 50, "sex": 1, "skill_set": [ { "skill": 23, "level": 2 } ] },
+		{ "id": 51, "sex": 0, "skill_set": [ { "skill": 19, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 52, "sex": 1, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 53, "sex": 0, "skill_set": [ { "skill": 1, "level": 1 }, { "skill": 3, "level": 1 } ] },
+		{ "id": 54, "sex": 1, "skill_set": [ { "skill": 20, "level": 1 }, { "skill": 2, "level": 1 } ] },
+		{ "id": 55, "sex": 1, "skill_set": [ { "skill": 22, "level": 2 } ] },
+		{ "id": 56, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 57, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 58, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 59, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 10, "level": 1 } ] },
+		{ "id": 60, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 61, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 62, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 63, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 64, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 65, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 20, "level": 1 } ] },
+		{ "id": 66, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 67, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 68, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 69, "sex": 1, "skill_set": [ { "skill": 12, "level": 2 } ] },
+		{ "id": 70, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 71, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 23, "level": 1 } ] },
+		{ "id": 72, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 73, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 7, "level": 1 } ] },
+		{ "id": 74, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 75, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 76, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 77, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 78, "sex": 1, "skill_set": [ { "skill": 12, "level": 2 } ] },
+		{ "id": 79, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 80, "sex": 1, "skill_set": [ { "skill": 3, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 81, "sex": 0, "skill_set": [ { "skill": 20, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 82, "sex": 0, "skill_set": [ { "skill": 19, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 83, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 84, "sex": 0, "skill_set": [ { "skill": 22, "level": 2 } ] },
+		{ "id": 85, "sex": 0, "skill_set": [ { "skill": 2, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 86, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 87, "sex": 0, "skill_set": [ { "skill": 19, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 88, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ] },
+		{ "id": 89, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 90, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 91, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ] },
+		{ "id": 92, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 93, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 3, "level": 2 } ] },
+		{ "id": 94, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 95, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 96, "sex": 0, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 10, "level": 1 } ] },
+		{ "id": 97, "sex": 0, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 20, "level": 1 } ] },
+		{ "id": 98, "sex": 0, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 1, "level": 1 } ] },
+		{ "id": 99, "sex": 1, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 3, "level": 1 } ] },
+		{ "id": 100, "sex": 1, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 0, "level": 1 } ] },
+		{ "id": 101, "sex": 0, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 102, "sex": 0, "skill_set": [ { "skill": 22, "level": 2 } ] },
+		{ "id": 103, "sex": 0, "skill_set": [ { "skill": 22, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 104, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 105, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 106, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 2, "level": 1 } ] },
+		{ "id": 107, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 108, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 20, "level": 1 } ] },
+		{ "id": 109, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 110, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 111, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 112, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 26, "level": 1 } ] },
+		{ "id": 113, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 114, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 1, "level": 1 } ] },
+		{ "id": 115, "sex": 0, "skill_set": [ { "skill": 23, "level": 2 } ] },
+		{ "id": 116, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 117, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 0, "level": 1 } ] },
+		{ "id": 118, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 20, "level": 1 } ] },
+		{ "id": 119, "sex": 0, "skill_set": [ { "skill": 23, "level": 1 }, { "skill": 3, "level": 1 } ] },
+		{ "id": 120, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ] },
+		{ "id": 121, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ] },
+		{ "id": 122, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 5, "level": 1 } ] },
+		{ "id": 123, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ] },
+		{ "id": 124, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 125, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ] },
+		{ "id": 126, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ] },
+		{ "id": 127, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ] },
+		{ "id": 128, "sex": 1, "skill_set": [ { "skill": 20, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 129, "sex": 1, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 130, "sex": 1, "skill_set": [ { "skill": 20, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 131, "sex": 1, "skill_set": [ { "skill": 19, "level": 2 } ] },
+		{ "id": 132, "sex": 0, "skill_set": [ { "skill": 2, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 133, "sex": 0, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 134, "sex": 0, "skill_set": [ { "skill": 22, "level": 2 } ] },
+		{ "id": 135, "sex": 0, "skill_set": [ { "skill": 19, "level": 1 }, { "skill": 21, "level": 1 } ] },
+		{ "id": 136, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 1 } ] },
+		{ "id": 137, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 15, "level": 1 } ] },
+		{ "id": 138, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 16, "level": 1 } ] },
+		{ "id": 139, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 17, "level": 1 } ] },
+		{ "id": 140, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 1 } ] },
+		{ "id": 141, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 15, "level": 1 } ] },
+		{ "id": 142, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 16, "level": 1 } ] },
+		{ "id": 143, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 17, "level": 1 } ] },
+		{ "id": 144, "sex": 0, "skill_set": [ { "skill": 6, "level": 2 } ] },
+		{ "id": 145, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 3 } ] },
+		{ "id": 146, "sex": 1, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 147, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 } ] },
+		{ "id": 148, "sex": 0, "skill_set": [ { "skill": 1, "level": 1 }, { "skill": 6, "level": 1 } ] },
+		{ "id": 149, "sex": 0, "skill_set": [ { "skill": 22, "level": 2 } ] },
+		{ "id": 150, "sex": 0, "skill_set": [ { "skill": 12, "level": 2 } ] },
+		{ "id": 151, "sex": 1, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 152, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 23, "level": 1 } ] },
+		{ "id": 153, "sex": 1, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ] },
+		{ "id": 154, "sex": 0, "skill_set": [ { "skill": 19, "level": 1 }, { "skill": 22, "level": 1 } ] },
+		{ "id": 155, "sex": 0, "skill_set": [ { "skill": 6, "level": 1 }, { "skill": 19, "level": 1 } ] }
+	]
+}

+ 0 - 158
config/heroes_sec_skills.txt

@@ -1,158 +0,0 @@
-//heroes'_inintial_set_of_secondary_abilities_format:_heroID,_sex_numberOfInitialSecSkills_(Skill_ID,_skill_lvl_for_every_skill)
-0	0	2	6	1	1	1
-1	1	2	6	1	1	1
-2	0	2	6	1	23	1
-3	1	2	6	1	5	1
-4	0	2	6	1	13	1
-5	1	2	6	1	22	1
-6	0	2	6	1	20	1
-7	1	2	6	1	19	1
-8	0	2	7	1	27	1
-9	1	2	7	1	4	1
-10	0	2	7	1	13	1
-11	1	1	7	2		
-12	0	2	7	1	8	1
-13	1	2	7	1	11	1
-14	0	2	7	1	21	1
-15	1	2	7	1	24	1
-16	1	2	6	1	23	1
-17	0	2	9	1	26	1
-18	1	1	1	2		
-19	0	2	4	1	6	1
-20	0	1	26	2		
-21	0	2	1	1	22	1
-22	0	2	0	1	26	1
-23	1	2	1	1	2	1
-24	0	2	7	1	18	1
-25	0	2	7	2	10	1
-26	0	2	7	1	24	1
-27	1	2	7	1	27	1
-28	0	2	7	1	11	1
-29	1	2	7	1	9	1
-30	0	2	7	1	25	1
-31	0	2	7	1	3	1
-32	0	2	3	1	8	1
-33	0	1	18	2		
-34	1	2	8	1	25	1
-35	1	2	18	1	23	1
-36	0	2	8	1	19	1
-37	0	2	18	1	26	1
-38	1	2	8	1	22	1
-39	1	2	18	1	24	1
-40	0	1	7	2		
-41	0	2	7	1	8	1
-42	1	2	7	1	11	1
-43	1	2	7	1	24	1
-44	0	2	7	1	10	1
-45	0	2	7	1	25	1
-46	1	2	7	1	4	1
-47	1	2	7	1	18	1
-48	1	1	3	2		
-49	0	2	7	1	18	1
-50	1	1	23	2		
-51	0	2	19	1	26	1
-52	1	2	18	1	22	1
-53	0	2	1	1	3	1
-54	1	2	20	1	2	1
-55	1	1	22	2		
-56	0	2	7	1	24	1
-57	0	2	7	1	18	1
-58	0	2	7	1	8	1
-59	1	2	7	1	10	1
-60	0	2	7	1	21	1
-61	1	2	7	1	11	1
-62	0	2	7	1	25	1
-63	0	2	7	1	6	1
-64	0	2	12	1	26	1
-65	0	2	12	1	20	1
-66	0	2	12	1	21	1
-67	1	2	12	1	19	1
-68	1	2	12	1	22	1
-69	1	1	12	2		
-70	0	2	12	1	22	1
-71	0	2	12	1	23	1
-72	1	2	12	1	18	1
-73	1	2	12	1	7	1
-74	0	2	12	1	25	1
-75	0	2	12	1	11	1
-76	0	2	12	1	8	1
-77	1	2	12	1	21	1
-78	1	1	12	2		
-79	0	2	12	1	24	1
-80	1	2	3	1	6	1
-81	0	2	20	1	22	1
-82	0	2	19	1	22	1
-83	0	2	6	1	26	1
-84	0	1	22	2		
-85	0	2	2	1	19	1
-86	1	2	6	1	18	1
-87	0	2	19	1	22	1
-88	0	2	7	1	18	1
-89	0	2	7	1	8	1
-90	0	2	7	1	25	1
-91	1	1	7	2		
-92	0	2	7	1	11	1
-93	0	2	7	1	3	2
-94	1	2	7	1	24	1
-95	0	2	7	1	21	1
-96	0	2	22	1	10	1
-97	0	2	22	1	20	1
-98	0	2	22	1	1	1
-99	1	2	22	1	3	1
-100	1	2	22	1	0	1
-101	0	2	22	1	26	1
-102	0	1	22	2		
-103	0	2	22	1	19	1
-104	1	2	7	1	25	1
-105	0	2	7	1	6	1
-106	1	2	7	1	2	1
-107	0	2	7	1	19	1
-108	0	2	7	1	20	1
-109	1	2	7	1	22	1
-110	1	2	7	1	11	1
-111	0	2	7	1	26	1
-112	0	2	23	1	26	1
-113	0	2	23	1	6	1
-114	0	2	23	1	1	1
-115	0	1	23	2		
-116	0	2	23	1	22	1
-117	0	2	23	1	0	1
-118	0	2	23	1	20	1
-119	0	2	23	1	3	1
-120	1	1	7	2		
-121	1	2	7	1	8	1
-122	1	2	7	1	5	1
-123	1	2	7	1	27	1
-124	1	2	7	1	21	1
-125	1	2	7	1	25	1
-126	1	2	7	1	24	1
-127	1	2	7	1	11	1
-128	1	2	20	1	22	1
-129	1	2	13	1	19	1
-130	1	2	20	1	22	1
-131	1	1	19	2		
-132	0	2	2	1	22	1
-133	0	2	13	1	19	1
-134	0	1	22	2		
-135	0	2	19	1	21	1
-136	1	2	7	1	14	1
-137	1	2	7	1	15	1
-138	1	2	7	1	16	1
-139	1	2	7	1	17	1
-140	0	2	7	1	14	1
-141	0	2	7	1	15	1
-142	0	2	7	1	16	1
-143	0	2	7	1	17	1
-144	0	1	6	2		
-145	1	2	7	1	14	3
-146	1	2	6	1	22	1
-147	0	1	7	2		
-148	0	2	1	1	6	1
-149	0	1	22	2		
-150	0	1	12	2		
-151	1	2	13	1	19	1
-152	0	2	6	1	23	1
-153	1	2	13	1	19	1
-154	0	2	19	1	22	1
-155	0	2	6	1	19	1
--1

+ 12 - 30
lib/CHeroHandler.cpp

@@ -3,6 +3,7 @@
 #include "CHeroHandler.h"
 #include "CLodHandler.h"
 #include "../lib/VCMI_Lib.h"
+#include "../lib/JsonNode.h"
 #include <iomanip>
 #include <sstream>
 #include <fstream>
@@ -12,6 +13,7 @@
 #else
 #include <boost/spirit.hpp>
 #endif
+#include <boost/foreach.hpp>
 
 using namespace boost::spirit;
 
@@ -281,38 +283,18 @@ void CHeroHandler::loadHeroes()
 		nher->ID = heroes.size();
 		heroes.push_back(nher);
 	}
-	//loading initial secondary skills
-	{
-		std::ifstream inp;
-		inp.open(DATA_DIR "/config/heroes_sec_skills.txt", std::ios_base::in|std::ios_base::binary);
-		if(!inp.is_open())
-		{
-			tlog1<<"missing file: config/heroes_sec_skills.txt"<<std::endl;
-		}
-		else
-		{
-			inp>>dump;
-			int hid; //ID of currently read hero
-			int secQ; //number of secondary abilities
-			while(true)
-			{
-				inp>>hid;
-				if(hid == -1)
-					break;
-				inp>>secQ;
-				heroes[hid]->sex = secQ;
-				inp>>secQ;
-				for(int g=0; g<secQ; ++g)
-				{
-					int a, b;
-					inp>>a; inp>>b;
-					heroes[hid]->secSkillsInit.push_back(std::make_pair(a, b));
-				}
-			}
-			inp.close();
+
+	// Load heroes information
+	const JsonNode config(DATA_DIR "/config/heroes.json");
+	BOOST_FOREACH(const JsonNode &hero, config["heroes"].Vector()) {
+		int hid = hero["id"].Float();
+
+		heroes[hid]->sex = hero["sex"].Float();
+
+		BOOST_FOREACH(const JsonNode &set, hero["skill_set"].Vector()) {
+			heroes[hid]->secSkillsInit.push_back(std::make_pair(set["skill"].Float(), set["level"].Float()));
 		}
 	}
-	//initial skills loaded
 
 	{
 		std::ifstream inp;