浏览代码

Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG

Conflicts:
	Mods/WoG/mod.json
DjWarmonger 11 年之前
父节点
当前提交
a076277e2b

+ 1 - 1
CMakeLists.txt

@@ -14,7 +14,7 @@ endif()
 
 
 # VCMI version
 # VCMI version
 set(VCMI_VERSION_MAJOR 0)
 set(VCMI_VERSION_MAJOR 0)
-set(VCMI_VERSION_MINOR 95)
+set(VCMI_VERSION_MINOR 96)
 set(VCMI_VERSION_PATCH 0)
 set(VCMI_VERSION_PATCH 0)
 
 
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)

+ 817 - 0
Mods/WoG/config/wog/creatureBanks.json

@@ -0,0 +1,817 @@
+{
+	"core:creatureBank" : {
+		"types" : {
+			"huntingLodge" : {
+				"name" : "Hunting Lodge",
+				"index" : 11,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 3, "type" : "dendroidGuard" },
+							{ "amount": 4, "type" : "woodElf" },
+							{ "amount": 3, "type" : "dendroidGuard" },
+							{ "amount": 4, "type" : "woodElf" }
+						],
+						"combat_value": 100,
+						"reward" : {
+							"resources":
+							{
+								"wood" : 15,
+								"gold" : 500
+							}
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 4, "type" : "dendroidGuard" },
+							{ "amount": 6, "type" : "woodElf" },
+							{ "amount": 4, "type" : "dendroidGuard" },
+							{ "amount": 6, "type" : "woodElf" }
+						],
+						"combat_value": 150,
+						"reward" : {
+							"resources":
+							{
+								"wood" : 20,
+								"gold" : 500
+							},
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 5, "type" : "dendroidGuard" },
+							{ "amount": 8, "type" : "woodElf" },
+							{ "amount": 5, "type" : "dendroidGuard" },
+							{ "amount": 8, "type" : "woodElf" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"wood" : 25,
+								"gold" : 500
+							},
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 6,  "type" : "dendroidGuard" },
+							{ "amount": 10, "type" : "woodElf" },
+							{ "amount": 6,  "type" : "dendroidGuard" },
+							{ "amount": 10, "type" : "woodElf" }
+						],
+						"combat_value": 300,
+						"reward" : {
+							"resources":
+							{
+								"wood" : 40,
+								"gold" : 1000
+							},
+							"value": 6000
+						}
+					}
+				]
+			},
+			"snowGrotto" : 
+			{
+				"name" : "Snow-covered Grotto",
+				"index" : 12,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 5,  "type" :  "ironGolem" },
+							{ "amount": 20, "type" :  "masterGremlin" },
+							{ "amount": 5,  "type" :  "ironGolem" },
+							{ "amount": 20, "type" :  "masterGremlin" }
+						],
+						"combat_value": 100,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 15,
+								"gold" : 500
+							}
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 6,  "type" :  "ironGolem" },
+							{ "amount": 30, "type" :  "masterGremlin" },
+							{ "amount": 6,  "type" :  "ironGolem" },
+							{ "amount": 30, "type" :  "masterGremlin" }
+						],
+						"combat_value": 150,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 20,
+								"gold" : 500
+							},
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 7,  "type" :  "ironGolem" },
+							{ "amount": 40, "type" :  "masterGremlin" },
+							{ "amount": 7,  "type" :  "ironGolem" },
+							{ "amount": 40, "type" :  "masterGremlin" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 30,
+								"gold" : 500
+							},
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 8,  "type" :  "ironGolem" },
+							{ "amount": 50, "type" :  "masterGremlin" },
+							{ "amount": 8,  "type" :  "ironGolem" },
+							{ "amount": 50, "type" :  "masterGremlin" }
+						],
+						"combat_value": 300,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 40,
+								"gold" : 1000
+							},
+							"value": 6000
+						}
+					}
+				]
+			},
+			"martialSpiritPalace" : 
+			{
+				"name" : "Palace of Martial Spirit",
+				"index" : 13,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 10, "type" :  "godWar" },
+							{ "amount": 10, "type" :  "godWar" },
+							{ "amount": 10, "type" :  "godWar" },
+							{ "amount": 10, "type" :  "godWar" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godWar" }
+							],
+							"value": 38000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 15, "type" :  "godWar" },
+							{ "amount": 15, "type" :  "godWar" },
+							{ "amount": 15, "type" :  "godWar" },
+							{ "amount": 15, "type" :  "godWar" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godWar" }
+							],
+							"value": 57000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 20, "type" :  "godWar" },
+							{ "amount": 20, "type" :  "godWar" },
+							{ "amount": 20, "type" :  "godWar" },
+							{ "amount": 20, "type" :  "godWar" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godWar" }
+							],
+							"value": 75000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 30, "type" :  "godWar" },
+							{ "amount": 30, "type" :  "godWar" },
+							{ "amount": 30, "type" :  "godWar" },
+							{ "amount": 30, "type" :  "godWar" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godWar" }
+							],
+							"value": 90000
+						}
+					}
+				]
+			},
+			"pacificationCitadel" :
+			{
+				"name" : "Citadel of Pacification",
+				"index" : 14,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 10, "type" :  "godPeace" },
+							{ "amount": 10, "type" :  "godPeace" },
+							{ "amount": 10, "type" :  "godPeace" },
+							{ "amount": 10, "type" :  "godPeace" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godPeace" }
+							],
+							"value": 38000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 15, "type" :  "godPeace" },
+							{ "amount": 15, "type" :  "godPeace" },
+							{ "amount": 15, "type" :  "godPeace" },
+							{ "amount": 15, "type" :  "godPeace" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godPeace" }
+							],
+							"value": 57000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 20, "type" :  "godPeace" },
+							{ "amount": 20, "type" :  "godPeace" },
+							{ "amount": 20, "type" :  "godPeace" },
+							{ "amount": 20, "type" :  "godPeace" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godPeace" }
+							],
+							"value": 75000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 30, "type" :  "godPeace" },
+							{ "amount": 30, "type" :  "godPeace" },
+							{ "amount": 30, "type" :  "godPeace" },
+							{ "amount": 30, "type" :  "godPeace" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godPeace" }
+							],
+							"value": 90000
+						}
+					}
+				]
+			},
+			"magiciansMonastery" :
+			{
+				"name" : "Monastery of Magicians",
+				"index" : 15,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 10, "type" :  "godMana" },
+							{ "amount": 10, "type" :  "godMana" },
+							{ "amount": 10, "type" :  "godMana" },
+							{ "amount": 10, "type" :  "godMana" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godMana" }
+							],
+							"value": 38000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 15, "type" :  "godMana" },
+							{ "amount": 15, "type" :  "godMana" },
+							{ "amount": 15, "type" :  "godMana" },
+							{ "amount": 15, "type" :  "godMana" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godMana" }
+							],
+							"value": 57000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 20, "type" :  "godMana" },
+							{ "amount": 20, "type" :  "godMana" },
+							{ "amount": 20, "type" :  "godMana" },
+							{ "amount": 20, "type" :  "godMana" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godMana" }
+							],
+							"value": 75000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 30, "type" :  "godMana" },
+							{ "amount": 30, "type" :  "godMana" },
+							{ "amount": 30, "type" :  "godMana" },
+							{ "amount": 30, "type" :  "godMana" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godMana" }
+							],
+							"value": 90000
+						}
+					}
+				]
+			},
+			"legendsLibrary" :
+			{
+				"name" : "Library of Legends",
+				"index" : 16,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 10, "type" :  "godLore" },
+							{ "amount": 10, "type" :  "godLore" },
+							{ "amount": 10, "type" :  "godLore" },
+							{ "amount": 10, "type" :  "godLore" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godLore" }
+							],
+							"value": 38000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 15, "type" :  "godLore" },
+							{ "amount": 15, "type" :  "godLore" },
+							{ "amount": 15, "type" :  "godLore" },
+							{ "amount": 15, "type" :  "godLore" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godLore" }
+							],
+							"value": 57000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 20, "type" :  "godLore" },
+							{ "amount": 20, "type" :  "godLore" },
+							{ "amount": 20, "type" :  "godLore" },
+							{ "amount": 20, "type" :  "godLore" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godLore" }
+							],
+							"value": 75000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 30, "type" :  "godLore" },
+							{ "amount": 30, "type" :  "godLore" },
+							{ "amount": 30, "type" :  "godLore" },
+							{ "amount": 30, "type" :  "godLore" }
+						],
+						"combat_value": 2000,
+						"reward" : {
+							"creatures": [
+								{ "amount": 1, "type" :  "godLore" }
+							],
+							"value": 90000
+						}
+					}
+				]
+			},
+			"transylvanianTavern" :
+			{
+				"name" : "Transylvanian Tavern",
+				"index" : 17,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" }
+						],
+						"combat_value": 100,
+						"reward" : {
+							"resources":
+							{
+								"gold" : 1500
+							},
+							"creatures": [
+								{ "amount": 3, "type" :  "vampireLord" }
+							]
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" }
+						],
+						"combat_value": 150,
+						"reward" : {
+							"resources":
+							{
+								"gold" : 2500
+							},
+							"creatures": [
+								{ "amount": 5, "type" :  "vampireLord" }
+							],
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"gold" : 3500
+							},
+							"creatures": [
+								{ "amount": 7, "type" :  "vampireLord" }
+							],
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" }
+						],
+						"combat_value": 250,
+						"reward" : {
+							"resources":
+							{
+								"gold" : 5000
+							},
+							"creatures": [
+								{ "amount": 9, "type" :  "vampireLord" }
+							],
+							"value": 5000
+						}
+					}
+				]
+			},
+			"homeofthebat" :
+			{
+				"name" : "Home of the Bat",
+				"index" : 18,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire", "upgrade_chance": 50 },
+							{ "amount": 2, "type" :  "vampire" },
+							{ "amount": 2, "type" :  "vampire" }
+						],
+						"combat_value": 100,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 2,
+								"sulfur" : 2,
+								"crystal" : 2,
+								"gems" : 2
+							},
+							"creatures": [
+								{ "amount": 3, "type" :  "vampireLord" }
+							]
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire", "upgrade_chance": 70 },
+							{ "amount": 3, "type" :  "vampire" },
+							{ "amount": 3, "type" :  "vampire" }
+						],
+						"combat_value": 150,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 3,
+								"sulfur" : 3,
+								"crystal" : 3,
+								"gems" : 3
+							},
+							"creatures": [
+								{ "amount": 5, "type" :  "vampireLord" }
+							],
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire", "upgrade_chance": 80 },
+							{ "amount": 4, "type" :  "vampire" },
+							{ "amount": 4, "type" :  "vampire" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 4,
+								"sulfur" : 4,
+								"crystal" : 4,
+								"gems" : 4
+							},
+							"creatures": [
+								{ "amount": 7, "type" :  "vampireLord" }
+							],
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire", "upgrade_chance": 50 },
+							{ "amount": 6, "type" :  "vampire" },
+							{ "amount": 6, "type" :  "vampire" }
+						],
+						"combat_value": 250,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 5,
+								"sulfur" : 5,
+								"crystal" : 5,
+								"gems" : 5
+							},
+							"creatures": [
+								{ "amount": 9, "type" :  "vampireLord" }
+							],
+							"value": 5000
+						}
+					}
+				]
+			},
+			"lostBottle" :
+			{
+				"name" : "Lost Bottle",
+				"index" : 19,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 2, "type" :  "genie" },
+							{ "amount": 2, "type" :  "genie" },
+							{ "amount": 2, "type" :  "genie", "upgrade_chance": 50 },
+							{ "amount": 2, "type" :  "genie" },
+							{ "amount": 2, "type" :  "genie" }
+						],
+						"combat_value": 100,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 2,
+								"sulfur" : 2,
+								"crystal" : 2,
+								"gems" : 2
+							},
+							"creatures": [
+								{ "amount": 3, "type" :  "genie" }
+							]
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 3, "type" :  "genie" },
+							{ "amount": 3, "type" :  "genie" },
+							{ "amount": 3, "type" :  "genie", "upgrade_chance": 70 },
+							{ "amount": 3, "type" :  "genie" },
+							{ "amount": 3, "type" :  "genie" }
+						],
+						"combat_value": 150,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 3,
+								"sulfur" : 3,
+								"crystal" : 3,
+								"gems" : 3
+							},
+							"creatures": [
+								{ "amount": 5, "type" :  "genie" }
+							],
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 4, "type" :  "genie" },
+							{ "amount": 4, "type" :  "genie" },
+							{ "amount": 4, "type" :  "genie", "upgrade_chance": 80 },
+							{ "amount": 4, "type" :  "genie" },
+							{ "amount": 4, "type" :  "genie" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 4,
+								"sulfur" : 4,
+								"crystal" : 4,
+								"gems" : 4
+							},
+							"creatures": [
+								{ "amount": 7, "type" :  "genie" }
+							],
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 6, "type" :  "genie" },
+							{ "amount": 6, "type" :  "genie" },
+							{ "amount": 6, "type" :  "genie", "upgrade_chance": 90 },
+							{ "amount": 6, "type" :  "genie" },
+							{ "amount": 6, "type" :  "genie" }
+						],
+						"combat_value": 250,
+						"reward" : {
+							"resources":
+							{
+								"mercury" : 5,
+								"sulfur" : 5,
+								"crystal" : 5,
+								"gems" : 5
+							},
+							"creatures": [
+								{ "amount": 9, "type" :  "genie" }
+							],
+							"value": 5000
+						}
+					}
+				]
+			},
+			"grotto" :
+			{
+				"name" : "Grotto",
+				"index" : 20,
+				"levels": [
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 3, "type" :  "harpy" },
+							{ "amount": 3, "type" :  "beholder" },
+							{ "amount": 3, "type" :  "harpy" },
+							{ "amount": 3, "type" :  "beholder" }
+						],
+						"combat_value": 200,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 20,
+								"gold" : 1000
+							}
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 4, "type" :  "harpy" },
+							{ "amount": 4, "type" :  "beholder" },
+							{ "amount": 4, "type" :  "harpy" },
+							{ "amount": 4, "type" :  "beholder" }
+						],
+						"combat_value": 300,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 25,
+								"gold" : 1000
+							},
+							"value": 3000
+						}
+					},
+					{
+						"chance": 30,
+						"guards": [
+							{ "amount": 5, "type" :  "harpy" },
+							{ "amount": 5, "type" :  "beholder" },
+							{ "amount": 5, "type" :  "harpy" },
+							{ "amount": 5, "type" :  "beholder" }
+						],
+						"combat_value": 400,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 30,
+								"gold" : 1500
+							},
+							"value": 4000
+						}
+					},
+					{
+						"chance": 10,
+						"guards": [
+							{ "amount": 6, "type" :  "harpy" },
+							{ "amount": 6, "type" :  "beholder" },
+							{ "amount": 6, "type" :  "harpy" },
+							{ "amount": 6, "type" :  "beholder" }
+						],
+						"combat_value": 500,
+						"reward" : {
+							"resources":
+							{
+								"ore" : 35,
+								"gold" : 2000
+							},
+							"value": 5000
+						}
+					}
+				]
+			}
+		}
+	}
+}

+ 31 - 0
Mods/WoG/config/wog/dwellings.json

@@ -0,0 +1,31 @@
+{
+	"core:creatureGeneratorCommon" : {
+		"types" : {
+			"supremeArchangel" : { "index" : 80, "creatures" : [[ "supremeArchangel" ]] },
+			"diamondDragon" : { "index" : 81, "creatures" : [[ "diamondDragon" ]] },
+			"lordofThunder" : { "index" : 82, "creatures" : [[ "lordofThunder" ]] },
+			"hellBaron" : { "index" : 83, "creatures" : [[ "hellBaron" ]] },
+			"bloodDragon" : { "index" : 84, "creatures" : [[ "bloodDragon" ]] },
+
+			"darknessDragon" : { "index" : 85, "creatures" : [[ "darknessDragon" ]] },
+			"ghostBehemoth" : { "index" : 86, "creatures" : [[ "ghostBehemoth" ]] },
+			"hellHydra" : { "index" : 87, "creatures" : [[ "hellHydra" ]] },
+			"sacredPhoenix" : { "index" : 88, "creatures" : [[ "sacredPhoenix" ]] },
+			"lavaSharpshooter" : { "index" : 89, "creatures" : [[ "lavaSharpshooter" ]] },
+
+			"arcticSharpshooter" : { "index" : 90, "creatures" : [[ "arcticSharpshooter" ]] },
+			"gorynych" : { "index" : 91, "creatures" : [[ "gorynych" ]] },
+			"nightmare" : { "index" : 92, "creatures" : [[ "nightmare" ]] },
+			"minotaurKing2" : { "index" : 93, "creatures" : [[ "minotaurKing2" ]] },
+			"warZealot" : { "index" : 94, "creatures" : [[ "warZealot" ]] },
+
+			"santaGremlin" : { "index" : 95, "creatures" : [[ "santaGremlin" ]] },
+			"sylvanCentaur" : { "index" : 96, "creatures" : [[ "sylvanCentaur" ]] },
+			"sorceress" : { "index" : 97, "creatures" : [[ "sorceress" ]] },
+			"werewolf" : { "index" : 98, "creatures" : [[ "werewolf" ]] },
+			"hellSteed" : { "index" : 99, "creatures" : [[ "hellSteed" ]] },
+
+			"dracolich" : { "index" :100, "creatures" : [[ "dracolich" ]] }
+		}
+	}
+}

+ 72 - 0
Mods/WoG/mod.json

@@ -0,0 +1,72 @@
+{
+	"name" : "In The Wake of Gods",
+	"description" : "Unnofficial addon for Heroes of Might and Magic III",
+
+	"version" : "0.0.0",
+	"author" : "WoG Team",
+	"contact" : "http://forum.vcmi.eu/index.php",
+	"modType" : "Expansion",
+
+	"artifacts" : 
+	[
+		"config/wog/artifacts.json"
+	],
+
+	"creatures" : 
+	[
+		"config/wog/creatures.json"
+	],
+
+	"heroClasses" : 
+	[
+		"config/wog/heroClasses.json"
+	],
+
+	"objects" :
+	[
+		"config/wog/dwellings.json",
+		"config/wog/creatureBanks.json"
+	],
+
+	"filesystem":
+	{
+		"" :
+		[
+			{ "type" : "map", "path" : "/Config/wogFileOverrides.json"}
+		],
+		"CONFIG/" :
+		[
+			{ "type" : "dir", "path" : "/Config"}
+		],
+		"DATA/" :
+		[
+			{"type" : "lod", "path" : "/Data/hmm35wog.pac"},
+			{"type" : "dir", "path" : "/Data"}
+		],
+		"SPRITES/":
+		[
+			{"type" : "lod", "path" : "/Data/hmm35wog.pac"},
+			{"type" : "lod", "path" : "/Data/wog - animated objects.pac"},
+			{"type" : "lod", "path" : "/Data/wog - animated trees.pac"},
+			{"type" : "lod", "path" : "/Data/wog - battle decorations.pac"}
+		],
+		"SOUNDS/":
+		[
+			{"type" : "snd", "path" : "/Data/wog - sounds.snd"},
+			{"type" : "snd", "path" : "/Data/wog.snd"}
+		],
+		"MUSIC/":
+		[
+			{"type" : "dir", "path" : "/Mp3"}
+		],
+		"VIDEO/":
+		[
+			{"type" : "vid", "path" : "/Data/wog - video.vid"},
+			{"type" : "vid", "path" : "/Data/wog.vid"}
+		],
+		"MAPS/":
+		[
+			{"type" : "dir", "path" : "/Maps"}
+		]
+	}
+}

+ 0 - 591
config/bankconfig.json

@@ -1,591 +0,0 @@
-//Resources:  Wood, Mercury, Ore, Sulfur, Crystal, Gems, Gold
-//Artifacts:  Treasure, Minor, Major, Relic
-//NOTE: all H3M banks were moved to objects/creatureBanks.json
-//Remaining part should be moved to WoG mod
-{
-	"banks": [
-		{
-			"name" : "Hunting Lodge",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 3, "id": 22 }, { "number": 4, "id": 18 }, { "number": 3, "id": 22 }, { "number": 4, "id": 18 } ],
-					"upgrade_chance": 0,
-					"combat_value": 100,
-					"reward_resources":
-					{
-						"wood" : 15,
-						"gold" : 500
-					},
-					"value": 2000,
-					"profitability": 20,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 4, "id": 22 }, { "number": 6, "id": 18 }, { "number": 4, "id": 22 }, { "number": 6, "id": 18 } ],
-					"upgrade_chance": 0,
-					"combat_value": 150,
-					"reward_resources":
-					{
-						"wood" : 20,
-						"gold" : 500
-					},
-					"value": 3000,
-					"profitability": 20,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 5, "id": 22 }, { "number": 8, "id": 18 }, { "number": 5, "id": 22 }, { "number": 8, "id": 18 } ],
-					"upgrade_chance": 0,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"wood" : 25,
-						"gold" : 500
-					},
-					"value": 4000,
-					"profitability": 20,
-					"easiest": 150
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 6, "id": 22 }, { "number": 10, "id": 18 }, { "number": 6, "id": 22 }, { "number": 10, "id": 18 } ],
-					"upgrade_chance": 100,
-					"combat_value": 300,
-					"reward_resources":
-					{
-						"wood" : 40,
-						"gold" : 1000
-					},
-					"value": 6000,
-					"profitability": 20,
-					"easiest": 200
-				}
-			]
-		},
-
-		{
-			"name" : "Snow-covered Grotto",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 5, "id": 32 }, { "number": 20, "id": 29 }, { "number": 5, "id": 32 }, { "number": 20, "id": 29 } ],
-					"upgrade_chance": 0,
-					"combat_value": 100,
-					"reward_resources":
-					{
-						"ore" : 15,
-						"gold" : 500
-					},
-					"value": 2000,
-					"profitability": 20,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 6, "id": 32 }, { "number": 30, "id": 29 }, { "number": 6, "id": 32 }, { "number": 30, "id": 29 } ],
-					"upgrade_chance": 0,
-					"combat_value": 150,
-					"reward_resources":
-					{
-						"ore" : 20,
-						"gold" : 500
-					},
-					"value": 3000,
-					"profitability": 20,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 7, "id": 32 }, { "number": 40, "id": 29 }, { "number": 7, "id": 32 }, { "number": 40, "id": 29 } ],
-					"upgrade_chance": 0,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"ore" : 30,
-						"gold" : 500
-					},
-					"value": 4000,
-					"profitability": 20,
-					"easiest": 150
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 8, "id": 32 }, { "number": 50, "id": 29 }, { "number": 8, "id": 32 }, { "number": 50, "id": 29 } ],
-					"upgrade_chance": 0,
-					"combat_value": 300,
-					"reward_resources":
-					{
-						"ore" : 40,
-						"gold" : 1000
-					},
-					"value": 6000,
-					"profitability": 20,
-					"easiest": 200
-				}
-			]
-		},
-
-		{
-			"name" : "Palace of Martial Spirit",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 160 },	{ "number": 10, "id": 160 }, { "number": 10, "id": 160 }, { "number": 10, "id": 160 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 160 } ],
-					"value": 38000,
-					"profitability": 21,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 160 }, { "number": 15, "id": 160 }, { "number": 15, "id": 160 }, { "number": 15, "id": 160 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 160 } ],
-					"value": 57000,
-					"profitability": 26,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 160 }, { "number": 20, "id": 160 }, { "number": 20, "id": 160 }, { "number": 20, "id": 160 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 160 } ],
-					"value": 75000,
-					"profitability": 29,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 160 }, { "number": 30, "id": 160 }, { "number": 30, "id": 160 }, { "number": 30, "id": 160 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 160 } ],
-					"value": 90000,
-					"profitability": 27,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Citadel of Pacification",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 161 }, { "number": 10, "id": 161 }, { "number": 10, "id": 161 }, { "number": 10, "id": 161 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 161 } ],
-					"value": 38000,
-					"profitability": 21,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 161 }, { "number": 15, "id": 161 }, { "number": 15, "id": 161 }, { "number": 15, "id": 161 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 161 } ],
-					"value": 57000,
-					"profitability": 26,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 161 }, { "number": 20, "id": 161 }, { "number": 20, "id": 161 }, { "number": 20, "id": 161 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 161 } ],
-					"value": 75000,
-					"profitability": 29,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 161 }, { "number": 30, "id": 161 }, { "number": 30, "id": 161 }, { "number": 30, "id": 161 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 161 } ],
-					"value": 90000,
-					"profitability": 27,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Monastery of Magicians",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 162 }, { "number": 10, "id": 162 }, { "number": 10, "id": 162 }, { "number": 10, "id": 162 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 162 } ],
-					"value": 38000,
-					"profitability": 21,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 162 }, { "number": 15, "id": 162 }, { "number": 15, "id": 162 }, { "number": 15, "id": 162 }	],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 162 } ],
-					"value": 57000,
-					"profitability": 26,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 162 }, { "number": 20, "id": 162 }, { "number": 20, "id": 162 }, { "number": 20, "id": 162 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 162 } ],
-					"value": 75000,
-					"profitability": 29,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 162 }, { "number": 30, "id": 162 }, { "number": 30, "id": 162 }, { "number": 30, "id": 162 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 162 } ],
-					"value": 90000,
-					"profitability": 27,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Library of Legends",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 163 }, { "number": 10, "id": 163 }, { "number": 10, "id": 163 }, { "number": 10, "id": 163 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 163 } ],
-					"value": 38000,
-					"profitability": 21,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 163 }, { "number": 15, "id": 163 }, { "number": 15, "id": 163 }, { "number": 15, "id": 163 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 163 } ],
-					"value": 57000,
-					"profitability": 26,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 163 }, { "number": 20, "id": 163 }, { "number": 20, "id": 163 }, { "number": 20, "id": 163 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 163 } ],
-					"value": 75000,
-					"profitability": 29,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 163 }, { "number": 30, "id": 163 }, { "number": 30, "id": 163 }, { "number": 30, "id": 163 } ],
-					"upgrade_chance": 0,
-					"combat_value": 2000,
-					"reward_creatures": [ { "number": 1, "id": 163 } ],
-					"value": 90000,
-					"profitability": 27,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Transylvanian Tavern",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 62 } ],
-					"upgrade_chance": 0,
-					"combat_value": 100,
-					"reward_resources":
-					{
-						"gold" : 1500
-					},
-					"reward_creatures": [ { "number": 3, "id": 63 } ],
-					"value": 2000,
-					"profitability": 10,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 62 } ],
-					"upgrade_chance": 0,
-					"combat_value": 150,
-					"reward_resources":
-					{
-						"gold" : 2500
-					},
-					"reward_creatures": [ { "number": 5, "id": 63 } ],
-					"value": 3000,
-					"profitability": 10,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 62 } ],
-					"upgrade_chance": 0,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"gold" : 3500
-					},
-					"reward_creatures": [ { "number": 7, "id": 63 } ],
-					"value": 4000,
-					"profitability": 10,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 62 } ],
-					"upgrade_chance": 0,
-					"combat_value": 250,
-					"reward_resources":
-					{
-						"gold" : 5000
-					},
-					"reward_creatures": [ { "number": 9, "id": 63 } ],
-					"value": 5000,
-					"profitability": 10,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Home of the Bat",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 62 } ],
-					"upgrade_chance": 50,
-					"combat_value": 100,
-					"reward_resources":
-					{
-						"mercury" : 2,
-						"sulfur" : 2,
-						"crystal" : 2,
-						"gems" : 2
-					},
-					"reward_creatures": [ { "number": 3, "id": 63 } ],
-					"value": 2000,
-					"profitability": 10,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 62 } ],
-					"upgrade_chance": 70,
-					"combat_value": 150,
-					"reward_resources":
-					{
-						"mercury" : 3,
-						"sulfur" : 3,
-						"crystal" : 3,
-						"gems" : 3
-					},
-
-					"reward_creatures": [ { "number": 5, "id": 63 } ],
-
-					"value": 3000,
-					"profitability": 10,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 62 } ],
-					"upgrade_chance": 80,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"mercury" : 4,
-						"sulfur" : 4,
-						"crystal" : 4,
-						"gems" : 4
-					},
-
-					"reward_creatures": [ { "number": 7, "id": 63 } ],
-					"value": 4000,
-					"profitability": 10,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 62 } ],
-					"upgrade_chance": 90,
-					"combat_value": 250,
-					"reward_resources":
-					{
-						"mercury" : 5,
-						"sulfur" : 5,
-						"crystal" : 5,
-						"gems" : 5
-					},
-
-					"reward_creatures": [ { "number": 9, "id": 63 } ],
-					"value": 5000,
-					"profitability": 10,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Lost Bottle",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [ { "number": 10, "id": 36 } ],
-					"upgrade_chance": 50,
-					"combat_value": 100,
-					"reward_resources":
-					{
-						"mercury" : 2,
-						"sulfur" : 2,
-						"crystal" : 2,
-						"gems" : 2
-					},
-					"reward_creatures": [ { "number": 3, "id": 36 } ],
-					"value": 2000,
-					"profitability": 10,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 15, "id": 36 } ],
-					"upgrade_chance": 70,
-					"combat_value": 150,
-					"reward_resources":
-					{
-						"mercury" : 3,
-						"sulfur" : 3,
-						"crystal" : 3,
-						"gems" : 3
-					},
-					"reward_creatures": [ { "number": 5, "id": 36 } ],
-					"value": 3000,
-					"profitability": 10,
-					"easiest": 125
-				},
-				{
-					"chance": 30,
-					"guards": [ { "number": 20, "id": 36 } ],
-					"upgrade_chance": 80,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"mercury" : 4,
-						"sulfur" : 4,
-						"crystal" : 4,
-						"gems" : 4
-					},
-					"reward_creatures": [ { "number": 7, "id": 36 } ],
-					"value": 4000,
-					"profitability": 10,
-					"easiest": 145
-				},
-				{
-					"chance": 10,
-					"guards": [ { "number": 30, "id": 36 } ],
-					"upgrade_chance": 90,
-					"combat_value": 250,
-					"reward_resources":
-					{
-						"mercury" : 5,
-						"sulfur" : 5,
-						"crystal" : 5,
-						"gems" : 5
-					},
-					"reward_creatures": [ { "number": 9, "id": 36 } ],
-					"value": 5000,
-					"profitability": 10,
-					"easiest": 189
-				}
-			]
-		},
-
-		{
-			"name" : "Grotto",
-			"levels": [
-				{
-					"chance": 30,
-					"guards": [	{ "number": 3, "id": 72 }, { "number": 3, "id": 74 }, { "number": 3, "id": 72 }, { "number": 3, "id": 74 } ],
-					"upgrade_chance": 0,
-					"combat_value": 200,
-					"reward_resources":
-					{
-						"ore" : 20,
-						"gold" : 1000
-					},
-					"value": 2000,
-					"profitability": 20,
-					"easiest": 100
-				},
-				{
-					"chance": 30,
-					"guards": [	{ "number": 4, "id": 72 }, { "number": 4, "id": 74 }, { "number": 4, "id": 72 }, { "number": 4, "id": 74 } ],
-					"upgrade_chance": 0,
-					"combat_value": 300,
-					"reward_resources":
-					{
-						"ore" : 25,
-						"gold" : 1000
-					},
-					"value": 3000,
-					"profitability": 20,
-					"easiest": 150
-				},
-				{
-					"chance": 30,
-					"guards": [	{ "number": 5, "id": 72 }, { "number": 5, "id": 74 }, { "number": 5, "id": 72 }, { "number": 5, "id": 74 } ],
-					"upgrade_chance": 0,
-					"combat_value": 400,
-					"reward_resources":
-					{
-						"ore" : 30,
-						"gold" : 1500
-					},
-					"value": 4000,
-					"profitability": 20,
-					"easiest": 200
-				},
-				{
-					"chance": 10,
-					"guards": [	{ "number": 6, "id": 72 }, { "number": 6, "id": 74 }, { "number": 6, "id": 72 }, { "number": 6, "id": 74 } ],
-					"upgrade_chance": 0,
-					"combat_value": 500,
-					"reward_resources":
-					{
-						"ore" : 35,
-						"gold" : 2000
-					},
-					"value": 5000,
-					"profitability": 20,
-					"easiest": 250
-				}
-			]
-		}
-	]
-}

+ 1 - 8
config/objects/creatureBanks.json

@@ -28,8 +28,7 @@
 								"ore" : 4,
 								"ore" : 4,
 								"sulfur" : 4,
 								"sulfur" : 4,
 								"crystal" : 4,
 								"crystal" : 4,
-								"gems" : 4,
-								"gold" : 0
+								"gems" : 4
 							}
 							}
 						}
 						}
 					},
 					},
@@ -274,12 +273,6 @@
 							"value": 2000,
 							"value": 2000,
 							"resources":
 							"resources":
 							{
 							{
-								"wood" : 0,
-								"mercury" : 2,
-								"ore" : 0,
-								"sulfur" : 0,
-								"crystal" : 0,
-								"gems" : 0,
 								"gold" : 1000
 								"gold" : 1000
 							}
 							}
 						}
 						}

+ 6 - 0
debian/changelog

@@ -1,3 +1,9 @@
+vcmi (0.96) trusty; urgency=low
+
+  * New upstream release
+
+ -- Ivan Savenko <[email protected]>  Tue, 01 Jul 2014 20:57:29 +0300
+
 vcmi (0.95) precise; urgency=low
 vcmi (0.95) precise; urgency=low
 
 
   * New upstream release
   * New upstream release