Browse Source

Merged hero_spells.txt into heroes.json.

Frank Zago 14 years ago
parent
commit
9594058157
3 changed files with 98 additions and 224 deletions
  1. 0 113
      config/hero_spells.txt
  2. 94 94
      config/heroes.json
  3. 4 17
      lib/CHeroHandler.cpp

+ 0 - 113
config/hero_spells.txt

@@ -1,113 +0,0 @@
-------------------------------
---Starting spells for heroes-- 
---        File format:      --
---      HERO_ID SPELL_ID    --
-------------------------------
------ Death Knights
-67 15
-70 15
-71 27
-69 15
-66 54
-64 53
-68 15
-65 46
------ Necromancers
-73 23
-79 30
-75 27
-74 54
-72 24
-76 39
-78 42
-77 46
------ Battle Mages
-106 46
-104 43
-109 54
-110 30
-111 43
-107 53
-105 15
-108 44
------ Druids
-31 30
-30 16
-25 37
-24 55
-26 42
-27 0
-28 15
-29 51
------ Alchemists
-37 53
-39 15
-35 27
-32 27
-34 53
-38 15
-33 15
-36 15
------ Wizards
-47 42
-40 60
-46 53
-43 51
-41 46
-42 35
-45 19
-44 27
------ Witches
-126 35
-124 46
-120 45
-121 15
-125 27
-127 46
-123 31
-122 54
------ Clerics
-9 41
-10 45
-15 37
-11 20
-12 42
-14 48
-8 46
-13 35
------ Warlocks
-88 38
-95 46
-93 23
-92 54
-89 27
-91 38
-90 43
-94 30
------ Heretics
-61 43
-58 30
-56 3
-60 53
-59 45
-57 22
-63 21
-62 46
------ Elementalists
-136 13
-137 53
-138 15
-139 46
-140 43
-141 47
-142 35
-143 54
------ Extension Heroes
-145 22
-147 53
-150 54
-151 15
-153 15
-
-
------ The End;)

+ 94 - 94
config/heroes.json

@@ -3,7 +3,7 @@
 	//   id: hero id
 	//   sex: male/female
 	//   skill_set: initial set of secondary abilities (skill ID, initial skil level)
-
+	//   spell: hero starts with that initial spell
 	"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 } ] },
@@ -13,14 +13,14 @@
 		{ "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": 8, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ], "spell": 46 },
+		{ "id": 9, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 4, "level": 1 } ], "spell": 41 },
+		{ "id": 10, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 13, "level": 1 } ], "spell": 45 },
+		{ "id": 11, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ], "spell": 20 },
+		{ "id": 12, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 42 },
+		{ "id": 13, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 35 },
+		{ "id": 14, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 48 },
+		{ "id": 15, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 37 },
 		{ "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 } ] },
@@ -29,30 +29,30 @@
 		{ "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": 24, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ], "spell": 55 },
+		{ "id": 25, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 }, { "skill": 10, "level": 1 } ], "spell": 37 },
+		{ "id": 26, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 42 },
+		{ "id": 27, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ], "spell": 0 },
+		{ "id": 28, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 15 },
+		{ "id": 29, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 9, "level": 1 } ], "spell": 51 },
+		{ "id": 30, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 16 },
+		{ "id": 31, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 3, "level": 1 } ], "spell": 30 },
+		{ "id": 32, "sex": 0, "skill_set": [ { "skill": 3, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 27 },
+		{ "id": 33, "sex": 0, "skill_set": [ { "skill": 18, "level": 2 } ], "spell": 15 },
+		{ "id": 34, "sex": 1, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 53 },
+		{ "id": 35, "sex": 1, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 23, "level": 1 } ], "spell": 27 },
+		{ "id": 36, "sex": 0, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 19, "level": 1 } ], "spell": 15 },
+		{ "id": 37, "sex": 0, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 26, "level": 1 } ], "spell": 53 },
+		{ "id": 38, "sex": 1, "skill_set": [ { "skill": 8, "level": 1 }, { "skill": 22, "level": 1 } ], "spell": 15 },
+		{ "id": 39, "sex": 1, "skill_set": [ { "skill": 18, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 15 },
+		{ "id": 40, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 } ], "spell": 60 },
+		{ "id": 41, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 46 },
+		{ "id": 42, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 35 },
+		{ "id": 43, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 51 },
+		{ "id": 44, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 10, "level": 1 } ], "spell": 27 },
+		{ "id": 45, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 19 },
+		{ "id": 46, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 4, "level": 1 } ], "spell": 53 },
+		{ "id": 47, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ], "spell": 42 },
 		{ "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 } ] },
@@ -61,30 +61,30 @@
 		{ "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": 56, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 3 },
+		{ "id": 57, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ], "spell": 22 },
+		{ "id": 58, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 30 },
+		{ "id": 59, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 10, "level": 1 } ], "spell": 45 },
+		{ "id": 60, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 53 },
+		{ "id": 61, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 43 },
+		{ "id": 62, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 46 },
+		{ "id": 63, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 6, "level": 1 } ], "spell": 21 },
+		{ "id": 64, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 26, "level": 1 } ], "spell": 53 },
+		{ "id": 65, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 20, "level": 1 } ], "spell": 46 },
+		{ "id": 66, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 54 },
+		{ "id": 67, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 19, "level": 1 } ], "spell": 15 },
+		{ "id": 68, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 22, "level": 1 } ], "spell": 15 },
+		{ "id": 69, "sex": 1, "skill_set": [ { "skill": 12, "level": 2 } ], "spell": 15 },
+		{ "id": 70, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 22, "level": 1 } ], "spell": 15 },
+		{ "id": 71, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 23, "level": 1 } ], "spell": 27 },
+		{ "id": 72, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 18, "level": 1 } ], "spell": 24 },
+		{ "id": 73, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 7, "level": 1 } ], "spell": 23 },
+		{ "id": 74, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 54 },
+		{ "id": 75, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 27 },
+		{ "id": 76, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 39 },
+		{ "id": 77, "sex": 1, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 46 },
+		{ "id": 78, "sex": 1, "skill_set": [ { "skill": 12, "level": 2 } ], "spell": 42 },
+		{ "id": 79, "sex": 0, "skill_set": [ { "skill": 12, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 30 },
 		{ "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 } ] },
@@ -93,14 +93,14 @@
 		{ "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": 88, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 18, "level": 1 } ], "spell": 38 },
+		{ "id": 89, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 27 },
+		{ "id": 90, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 43 },
+		{ "id": 91, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ], "spell": 38 },
+		{ "id": 92, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 54 },
+		{ "id": 93, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 3, "level": 2 } ], "spell": 23 },
+		{ "id": 94, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 30 },
+		{ "id": 95, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 46 },
 		{ "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 } ] },
@@ -109,14 +109,14 @@
 		{ "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": 104, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 43 },
+		{ "id": 105, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 6, "level": 1 } ], "spell": 15 },
+		{ "id": 106, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 2, "level": 1 } ], "spell": 46 },
+		{ "id": 107, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 19, "level": 1 } ], "spell": 53 },
+		{ "id": 108, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 20, "level": 1 } ], "spell": 44 },
+		{ "id": 109, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 22, "level": 1 } ], "spell": 54 },
+		{ "id": 110, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 30 },
+		{ "id": 111, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 26, "level": 1 } ], "spell": 43 },
 		{ "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 } ] },
@@ -125,14 +125,14 @@
 		{ "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": 120, "sex": 1, "skill_set": [ { "skill": 7, "level": 2 } ], "spell": 45 },
+		{ "id": 121, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 8, "level": 1 } ], "spell": 15 },
+		{ "id": 122, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 5, "level": 1 } ], "spell": 54 },
+		{ "id": 123, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 27, "level": 1 } ], "spell": 31 },
+		{ "id": 124, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 21, "level": 1 } ], "spell": 46 },
+		{ "id": 125, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 25, "level": 1 } ], "spell": 27 },
+		{ "id": 126, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 24, "level": 1 } ], "spell": 35 },
+		{ "id": 127, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 11, "level": 1 } ], "spell": 46 },
 		{ "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 } ] },
@@ -141,24 +141,24 @@
 		{ "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": 136, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 1 } ], "spell": 13 },
+		{ "id": 137, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 15, "level": 1 } ], "spell": 53 },
+		{ "id": 138, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 16, "level": 1 } ], "spell": 15 },
+		{ "id": 139, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 17, "level": 1 } ], "spell": 46 },
+		{ "id": 140, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 1 } ], "spell": 43 },
+		{ "id": 141, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 15, "level": 1 } ], "spell": 47 },
+		{ "id": 142, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 16, "level": 1 } ], "spell": 35 },
+		{ "id": 143, "sex": 0, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 17, "level": 1 } ], "spell": 54 },
 		{ "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": 145, "sex": 1, "skill_set": [ { "skill": 7, "level": 1 }, { "skill": 14, "level": 3 } ], "spell": 22 },
 		{ "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": 147, "sex": 0, "skill_set": [ { "skill": 7, "level": 2 } ], "spell": 53 },
 		{ "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": 150, "sex": 0, "skill_set": [ { "skill": 12, "level": 2 } ], "spell": 54 },
+		{ "id": 151, "sex": 1, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ], "spell": 15 },
 		{ "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": 153, "sex": 1, "skill_set": [ { "skill": 13, "level": 1 }, { "skill": 19, "level": 1 } ], "spell": 15 },
 		{ "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 } ] }
 	]

+ 4 - 17
lib/CHeroHandler.cpp

@@ -294,26 +294,13 @@ void CHeroHandler::loadHeroes()
 		BOOST_FOREACH(const JsonNode &set, hero["skill_set"].Vector()) {
 			heroes[hid]->secSkillsInit.push_back(std::make_pair(set["skill"].Float(), set["level"].Float()));
 		}
-	}
 
-	{
-		std::ifstream inp;
-		std::istringstream iss;
-		dump.clear();
-		inp.open(DATA_DIR "/config/hero_spells.txt");
-		while(inp)
-		{
-			getline(inp, dump);
-			if(!dump.size()  ||  dump[0] == '-')
-				continue;
-			iss.clear();
-			iss.str(dump);
-			int hid, sid;
-			iss >> hid >> sid;
-			heroes[hid]->startingSpell = sid;
+		const JsonNode *value = &hero["spell"];
+		if (!value->isNull()) {
+			heroes[hid]->startingSpell = value->Float();
 		}
-		inp.close();
 	}
+
 	loadHeroClasses();
 	initHeroClasses();
 	expPerLevel.push_back(0);