games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Fxied #306 and #856.

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2012-04-08 02:14:20 +00:00
parent b874295b3a
commit 9f6270a1f7
7 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/GUIClasses.cpp
View File

@ -4170,7 +4170,7 @@ void CInGameConsole::endEnteringText(bool printEnteredText)
std::string txt = enteredText.substr(0, enteredText.size()-1); std::string txt = enteredText.substr(0, enteredText.size()-1);
LOCPLINT->cb->sendMessage(txt); LOCPLINT->cb->sendMessage(txt);
previouslyEntered.push_back(txt); previouslyEntered.push_back(txt);
print(txt); //print(txt);
} }
enteredText = ""; enteredText = "";
if(GH.topInt() == adventureInt) if(GH.topInt() == adventureInt)

120
config/bankconfig.json
View File

@ -11,7 +11,7 @@
"guards": [ { "number": 20, "id": 94 } ], "guards": [ { "number": 20, "id": 94 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 506, "combat_value": 506,
"reward_ressources": [ 4, 4, 4, 4, 4, 4, 0 ], "reward_resources": [ 4, 4, 4, 4, 4, 4, 0 ],
"value": 10000, "value": 10000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -22,7 +22,7 @@
"guards": [ { "number": 30, "id": 94 } ], "guards": [ { "number": 30, "id": 94 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 760, "combat_value": 760,
"reward_ressources": [ 6, 6, 6, 6, 6, 6, 0 ], "reward_resources": [ 6, 6, 6, 6, 6, 6, 0 ],
"value": 15000, "value": 15000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -32,7 +32,7 @@
"guards": [ { "number": 40, "id": 94 } ], "guards": [ { "number": 40, "id": 94 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 1013, "combat_value": 1013,
"reward_ressources": [ 8, 8, 8, 8, 8, 8, 0 ], "reward_resources": [ 8, 8, 8, 8, 8, 8, 0 ],
"value": 20000, "value": 20000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -42,7 +42,7 @@
"guards": [ { "number": 50, "id": 94 } ], "guards": [ { "number": 50, "id": 94 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 1266, "combat_value": 1266,
"reward_ressources": [ 10, 10, 10, 10, 10, 10, 0 ], "reward_resources": [ 10, 10, 10, 10, 10, 10, 0 ],
"value": 25000, "value": 25000,
"profitability": 20, "profitability": 20,
"easiest": 250 "easiest": 250
@ -58,7 +58,7 @@
"guards": [ { "number": 50, "id": 16 } ], "guards": [ { "number": 50, "id": 16 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 194, "combat_value": 194,
"reward_ressources": [ 0, 0, 0, 0, 2, 0, 2500 ], "reward_resources": [ 0, 0, 0, 0, 2, 0, 2500 ],
"value": 3500, "value": 3500,
"profitability": 18, "profitability": 18,
"easiest": 100 "easiest": 100
@ -68,7 +68,7 @@
"guards": [ { "number": 75, "id": 16 } ], "guards": [ { "number": 75, "id": 16 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 291, "combat_value": 291,
"reward_ressources": [ 0, 0, 0, 0, 3, 0, 4000 ], "reward_resources": [ 0, 0, 0, 0, 3, 0, 4000 ],
"value": 5500, "value": 5500,
"profitability": 19, "profitability": 19,
"easiest": 150 "easiest": 150
@ -78,7 +78,7 @@
"guards": [ { "number": 100, "id": 16 } ], "guards": [ { "number": 100, "id": 16 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 388, "combat_value": 388,
"reward_ressources": [ 0, 0, 0, 0, 5, 0, 5000 ], "reward_resources": [ 0, 0, 0, 0, 5, 0, 5000 ],
"value": 7500, "value": 7500,
"profitability": 19, "profitability": 19,
"easiest": 200 "easiest": 200
@ -88,7 +88,7 @@
"guards": [ { "number": 150, "id": 16 } ], "guards": [ { "number": 150, "id": 16 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 582, "combat_value": 582,
"reward_ressources": [ 0, 0, 0, 0, 10, 0, 7500 ], "reward_resources": [ 0, 0, 0, 0, 10, 0, 7500 ],
"value": 12500, "value": 12500,
"profitability": 21, "profitability": 21,
"easiest": 300 "easiest": 300
@ -150,7 +150,7 @@
"guards": [ { "number": 100, "id": 42 } ], "guards": [ { "number": 100, "id": 42 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 0, 2, 0, 0, 0, 0, 1000 ], "reward_resources": [ 0, 2, 0, 0, 0, 0, 1000 ],
"value": 2000, "value": 2000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -160,7 +160,7 @@
"guards": [ { "number": 150, "id": 42 } ], "guards": [ { "number": 150, "id": 42 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 0, 3, 0, 0, 0, 0, 1500 ], "reward_resources": [ 0, 3, 0, 0, 0, 0, 1500 ],
"value": 3000, "value": 3000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -170,7 +170,7 @@
"guards": [ { "number": 200, "id": 42 } ], "guards": [ { "number": 200, "id": 42 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 4, 0, 0, 0, 0, 2000 ], "reward_resources": [ 0, 4, 0, 0, 0, 0, 2000 ],
"value": 4000, "value": 4000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -180,7 +180,7 @@
"guards": [ { "number": 300, "id": 42 } ], "guards": [ { "number": 300, "id": 42 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 300, "combat_value": 300,
"reward_ressources": [ 0, 6, 0, 0, 0, 0, 3000 ], "reward_resources": [ 0, 6, 0, 0, 0, 0, 3000 ],
"value": 6000, "value": 6000,
"profitability": 20, "profitability": 20,
"easiest": 300 "easiest": 300
@ -196,7 +196,7 @@
"guards": [ { "number": 20, "id": 76 } ], "guards": [ { "number": 20, "id": 76 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 207, "combat_value": 207,
"reward_ressources": [ 0, 0, 0, 5, 0, 0, 2000 ], "reward_resources": [ 0, 0, 0, 5, 0, 0, 2000 ],
"value": 4500, "value": 4500,
"profitability": 22, "profitability": 22,
"easiest": 100 "easiest": 100
@ -206,7 +206,7 @@
"guards": [ { "number": 30, "id": 76 } ], "guards": [ { "number": 30, "id": 76 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 310, "combat_value": 310,
"reward_ressources": [ 0, 0, 0, 6, 0, 0, 3000 ], "reward_resources": [ 0, 0, 0, 6, 0, 0, 3000 ],
"value": 6000, "value": 6000,
"profitability": 19, "profitability": 19,
"easiest": 150 "easiest": 150
@ -216,7 +216,7 @@
"guards": [ { "number": 40, "id": 76 } ], "guards": [ { "number": 40, "id": 76 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 414, "combat_value": 414,
"reward_ressources": [ 0, 0, 0, 8, 0, 0, 4000 ], "reward_resources": [ 0, 0, 0, 8, 0, 0, 4000 ],
"value": 8000, "value": 8000,
"profitability": 19, "profitability": 19,
"easiest": 200 "easiest": 200
@ -226,7 +226,7 @@
"guards": [ { "number": 50, "id": 76 } ], "guards": [ { "number": 50, "id": 76 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 517, "combat_value": 517,
"reward_ressources": [ 0, 0, 0, 10, 0, 0, 5000 ], "reward_resources": [ 0, 0, 0, 10, 0, 0, 5000 ],
"value": 10000, "value": 10000,
"profitability": 19, "profitability": 19,
"easiest": 250 "easiest": 250
@ -242,7 +242,7 @@
"guards": [ { "number": 10, "id": 38 } ], "guards": [ { "number": 10, "id": 38 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 403, "combat_value": 403,
"reward_ressources": [ 0, 0, 0, 0, 0, 8, 4000 ], "reward_resources": [ 0, 0, 0, 0, 0, 8, 4000 ],
"value": 8000, "value": 8000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -252,7 +252,7 @@
"guards": [ { "number": 15, "id": 38 } ], "guards": [ { "number": 15, "id": 38 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 605, "combat_value": 605,
"reward_ressources": [ 0, 0, 0, 0, 0, 12, 6000 ], "reward_resources": [ 0, 0, 0, 0, 0, 12, 6000 ],
"value": 12000, "value": 12000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -262,7 +262,7 @@
"guards": [ { "number": 20, "id": 38 } ], "guards": [ { "number": 20, "id": 38 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 806, "combat_value": 806,
"reward_ressources": [ 0, 0, 0, 0, 0, 16, 8000 ], "reward_resources": [ 0, 0, 0, 0, 0, 16, 8000 ],
"value": 16000, "value": 16000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -272,7 +272,7 @@
"guards": [ { "number": 30, "id": 38 } ], "guards": [ { "number": 30, "id": 38 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 1210, "combat_value": 1210,
"reward_ressources": [ 0, 0, 0, 0, 0, 24, 12000 ], "reward_resources": [ 0, 0, 0, 0, 0, 24, 12000 ],
"value": 24000, "value": 24000,
"profitability": 20, "profitability": 20,
"easiest": 300 "easiest": 300
@ -334,7 +334,7 @@
"guards": [ { "number": 10, "id": 60 } ], "guards": [ { "number": 10, "id": 60 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 31, "combat_value": 31,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 2000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 2000 ],
"value": 2000, "value": 2000,
"profitability": 65, "profitability": 65,
"easiest": 100 "easiest": 100
@ -344,7 +344,7 @@
"guards": [ { "number": 15, "id": 60 } ], "guards": [ { "number": 15, "id": 60 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 46, "combat_value": 46,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 3000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 3000 ],
"value": 3000, "value": 3000,
"profitability": 65, "profitability": 65,
"easiest": 150 "easiest": 150
@ -354,7 +354,7 @@
"guards": [ { "number": 25, "id": 60 } ], "guards": [ { "number": 25, "id": 60 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 77, "combat_value": 77,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 4000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 4000 ],
"reward_artifacts": [ 1, 0, 0, 0 ], "reward_artifacts": [ 1, 0, 0, 0 ],
"value": 5000, "value": 5000,
"profitability": 65, "profitability": 65,
@ -365,7 +365,7 @@
"guards": [ { "number": 50, "id": 60 } ], "guards": [ { "number": 50, "id": 60 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 154, "combat_value": 154,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 5000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 5000 ],
"reward_artifacts": [ 0, 1, 0, 0 ], "reward_artifacts": [ 0, 1, 0, 0 ],
"value": 7000, "value": 7000,
"profitability": 45, "profitability": 45,
@ -382,7 +382,7 @@
"guards": [ { "number": 20, "id": 115 } ], "guards": [ { "number": 20, "id": 115 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 138, "combat_value": 138,
"reward_ressources": [ 0, 0, 0, 0, 0, 3000 ], "reward_resources": [ 0, 0, 0, 0, 0, 3000 ],
"value": 3000, "value": 3000,
"profitability": 22, "profitability": 22,
"easiest": 100 "easiest": 100
@ -392,7 +392,7 @@
"guards": [ { "number": 30, "id": 115 } ], "guards": [ { "number": 30, "id": 115 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 207, "combat_value": 207,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 3000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 3000 ],
"reward_artifacts": [ 1, 0, 0, 0 ], "reward_artifacts": [ 1, 0, 0, 0 ],
"value": 4000, "value": 4000,
"profitability": 19, "profitability": 19,
@ -403,7 +403,7 @@
"guards": [ { "number": 40, "id": 115 } ], "guards": [ { "number": 40, "id": 115 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 276, "combat_value": 276,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 4000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 4000 ],
"reward_artifacts": [ 1, 0, 0, 0 ], "reward_artifacts": [ 1, 0, 0, 0 ],
"value": 5000, "value": 5000,
"profitability": 18, "profitability": 18,
@ -414,7 +414,7 @@
"guards": [ { "number": 60, "id": 115 } ], "guards": [ { "number": 60, "id": 115 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 414, "combat_value": 414,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 6000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 6000 ],
"reward_artifacts": [ 0, 1, 0, 0 ], "reward_artifacts": [ 0, 1, 0, 0 ],
"value": 8000, "value": 8000,
"profitability": 19, "profitability": 19,
@ -431,7 +431,7 @@
"guards": [ { "number": 30, "id": 56 }, { "number": 20, "id": 59 }, { "number": 0, "id": 60 } , { "number": 0, "id": 62 } ], "guards": [ { "number": 30, "id": 56 }, { "number": 20, "id": 59 }, { "number": 0, "id": 60 } , { "number": 0, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 75, "combat_value": 75,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 1500 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 1500 ],
"value": 1500, "value": 1500,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -441,7 +441,7 @@
"guards": [ { "number": 25, "id": 56 }, { "number": 20, "id": 59 }, { "number": 5, "id": 60 }, { "number": 0, "id": 62 } ], "guards": [ { "number": 25, "id": 56 }, { "number": 20, "id": 59 }, { "number": 5, "id": 60 }, { "number": 0, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 94, "combat_value": 94,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 2000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 2000 ],
"value": 2000, "value": 2000,
"profitability": 21, "profitability": 21,
"easiest": 126 "easiest": 126
@ -451,7 +451,7 @@
"guards": [ { "number": 20, "id": 56 }, { "number": 20, "id": 59 }, { "number": 10, "id": 60 }, { "number": 5, "id": 62 } ], "guards": [ { "number": 20, "id": 56 }, { "number": 20, "id": 59 }, { "number": 10, "id": 60 }, { "number": 5, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 169, "combat_value": 169,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 2500 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 2500 ],
"reward_artifacts": [ 1, 0, 0, 0 ], "reward_artifacts": [ 1, 0, 0, 0 ],
"value": 3500, "value": 3500,
"profitability": 21, "profitability": 21,
@ -462,7 +462,7 @@
"guards": [ { "number": 20, "id": 56 }, { "number": 20, "id": 59 }, { "number": 10, "id": 60 }, { "number": 10, "id": 62 } ], "guards": [ { "number": 20, "id": 56 }, { "number": 20, "id": 59 }, { "number": 10, "id": 60 }, { "number": 10, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 225, "combat_value": 225,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 5000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 5000 ],
"reward_artifacts": [ 1, 0, 0, 0 ], "reward_artifacts": [ 1, 0, 0, 0 ],
"value": 6000, "value": 6000,
"profitability": 27, "profitability": 27,
@ -479,7 +479,7 @@
"guards": [ { "number": 8, "id": 26 }, { "number": 5, "id": 82 }, { "number": 2, "id": 27 }, { "number": 1, "id": 83 } ], "guards": [ { "number": 8, "id": 26 }, { "number": 5, "id": 82 }, { "number": 2, "id": 27 }, { "number": 1, "id": 83 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 769, "combat_value": 769,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 20000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 20000 ],
"reward_artifacts": [ 1, 1, 1, 1 ], "reward_artifacts": [ 1, 1, 1, 1 ],
"value": 38000, "value": 38000,
"profitability": 21, "profitability": 21,
@ -490,7 +490,7 @@
"guards": [ { "number": 8, "id": 26 }, { "number": 6, "id": 82 }, { "number": 3, "id": 27 }, { "number": 2, "id": 83 } ], "guards": [ { "number": 8, "id": 26 }, { "number": 6, "id": 82 }, { "number": 3, "id": 27 }, { "number": 2, "id": 83 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 209, "combat_value": 209,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 30000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 30000 ],
"reward_artifacts": [ 0, 1, 1, 2 ], "reward_artifacts": [ 0, 1, 1, 2 ],
"value": 57000, "value": 57000,
"profitability": 26, "profitability": 26,
@ -501,7 +501,7 @@
"guards": [ { "number": 8, "id": 26 }, { "number": 6, "id": 82 }, { "number": 4, "id": 27 }, { "number": 3, "id": 83 } ], "guards": [ { "number": 8, "id": 26 }, { "number": 6, "id": 82 }, { "number": 4, "id": 27 }, { "number": 3, "id": 83 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 556, "combat_value": 556,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 40000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 40000 ],
"reward_artifacts": [ 0, 0, 1, 3 ], "reward_artifacts": [ 0, 0, 1, 3 ],
"value": 75000, "value": 75000,
"profitability": 29, "profitability": 29,
@ -512,7 +512,7 @@
"guards": [ { "number": 8, "id": 26 }, { "number": 7, "id": 82 }, { "number": 6, "id": 27 }, { "number": 5, "id": 83 } ], "guards": [ { "number": 8, "id": 26 }, { "number": 7, "id": 82 }, { "number": 6, "id": 27 }, { "number": 5, "id": 83 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 343, "combat_value": 343,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 50000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 50000 ],
"reward_artifacts": [ 0, 0, 0, 4 ], "reward_artifacts": [ 0, 0, 0, 4 ],
"value": 90000, "value": 90000,
"profitability": 27, "profitability": 27,
@ -529,7 +529,7 @@
"guards": [ { "number": 3, "id": 22 }, { "number": 4, "id": 18 }, { "number": 3, "id": 22 }, { "number": 4, "id": 18 } ], "guards": [ { "number": 3, "id": 22 }, { "number": 4, "id": 18 }, { "number": 3, "id": 22 }, { "number": 4, "id": 18 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 15, 0, 0, 0, 0, 0, 500 ], "reward_resources": [ 15, 0, 0, 0, 0, 0, 500 ],
"value": 2000, "value": 2000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -539,7 +539,7 @@
"guards": [ { "number": 4, "id": 22 }, { "number": 6, "id": 18 }, { "number": 4, "id": 22 }, { "number": 6, "id": 18 } ], "guards": [ { "number": 4, "id": 22 }, { "number": 6, "id": 18 }, { "number": 4, "id": 22 }, { "number": 6, "id": 18 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 20, 0, 0, 0, 0, 0, 500 ], "reward_resources": [ 20, 0, 0, 0, 0, 0, 500 ],
"value": 3000, "value": 3000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -549,7 +549,7 @@
"guards": [ { "number": 5, "id": 22 }, { "number": 8, "id": 18 }, { "number": 5, "id": 22 }, { "number": 8, "id": 18 } ], "guards": [ { "number": 5, "id": 22 }, { "number": 8, "id": 18 }, { "number": 5, "id": 22 }, { "number": 8, "id": 18 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 25, 0, 0, 0, 0, 0, 500 ], "reward_resources": [ 25, 0, 0, 0, 0, 0, 500 ],
"value": 4000, "value": 4000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -559,7 +559,7 @@
"guards": [ { "number": 6, "id": 22 }, { "number": 10, "id": 18 }, { "number": 6, "id": 22 }, { "number": 10, "id": 18 } ], "guards": [ { "number": 6, "id": 22 }, { "number": 10, "id": 18 }, { "number": 6, "id": 22 }, { "number": 10, "id": 18 } ],
"upgrade_chance": 100, "upgrade_chance": 100,
"combat_value": 300, "combat_value": 300,
"reward_ressources": [ 40, 0, 0, 0, 0, 0, 1000 ], "reward_resources": [ 40, 0, 0, 0, 0, 0, 1000 ],
"value": 6000, "value": 6000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -575,7 +575,7 @@
"guards": [ { "number": 5, "id": 32 }, { "number": 20, "id": 29 }, { "number": 5, "id": 32 }, { "number": 20, "id": 29 } ], "guards": [ { "number": 5, "id": 32 }, { "number": 20, "id": 29 }, { "number": 5, "id": 32 }, { "number": 20, "id": 29 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 0, 0, 15, 0, 0, 0, 500 ], "reward_resources": [ 0, 0, 15, 0, 0, 0, 500 ],
"value": 2000, "value": 2000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -585,7 +585,7 @@
"guards": [ { "number": 6, "id": 32 }, { "number": 30, "id": 29 }, { "number": 6, "id": 32 }, { "number": 30, "id": 29 } ], "guards": [ { "number": 6, "id": 32 }, { "number": 30, "id": 29 }, { "number": 6, "id": 32 }, { "number": 30, "id": 29 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 0, 0, 20, 0, 0, 0, 500 ], "reward_resources": [ 0, 0, 20, 0, 0, 0, 500 ],
"value": 3000, "value": 3000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -595,7 +595,7 @@
"guards": [ { "number": 7, "id": 32 }, { "number": 40, "id": 29 }, { "number": 7, "id": 32 }, { "number": 40, "id": 29 } ], "guards": [ { "number": 7, "id": 32 }, { "number": 40, "id": 29 }, { "number": 7, "id": 32 }, { "number": 40, "id": 29 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 0, 30, 0, 0, 0, 500 ], "reward_resources": [ 0, 0, 30, 0, 0, 0, 500 ],
"value": 4000, "value": 4000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -605,7 +605,7 @@
"guards": [ { "number": 8, "id": 32 }, { "number": 50, "id": 29 }, { "number": 8, "id": 32 }, { "number": 50, "id": 29 } ], "guards": [ { "number": 8, "id": 32 }, { "number": 50, "id": 29 }, { "number": 8, "id": 32 }, { "number": 50, "id": 29 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 300, "combat_value": 300,
"reward_ressources": [ 0, 0, 40, 0, 0, 0, 1000 ], "reward_resources": [ 0, 0, 40, 0, 0, 0, 1000 ],
"value": 6000, "value": 6000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -805,7 +805,7 @@
"guards": [ { "number": 10, "id": 62 } ], "guards": [ { "number": 10, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 1500 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 1500 ],
"reward_creatures": [ { "number": 3, "id": 63 } ], "reward_creatures": [ { "number": 3, "id": 63 } ],
"reward_artifacts": [ ], "reward_artifacts": [ ],
"value": 2000, "value": 2000,
@ -817,7 +817,7 @@
"guards": [ { "number": 15, "id": 62 } ], "guards": [ { "number": 15, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 2500 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 2500 ],
"reward_creatures": [ { "number": 5, "id": 63 } ], "reward_creatures": [ { "number": 5, "id": 63 } ],
"value": 3000, "value": 3000,
"profitability": 10, "profitability": 10,
@ -828,7 +828,7 @@
"guards": [ { "number": 20, "id": 62 } ], "guards": [ { "number": 20, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 3500 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 3500 ],
"reward_creatures": [ { "number": 7, "id": 63 } ], "reward_creatures": [ { "number": 7, "id": 63 } ],
"value": 4000, "value": 4000,
"profitability": 10, "profitability": 10,
@ -839,7 +839,7 @@
"guards": [ { "number": 30, "id": 62 } ], "guards": [ { "number": 30, "id": 62 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 250, "combat_value": 250,
"reward_ressources": [ 0, 0, 0, 0, 0, 0, 5000 ], "reward_resources": [ 0, 0, 0, 0, 0, 0, 5000 ],
"reward_creatures": [ { "number": 9, "id": 63 } ], "reward_creatures": [ { "number": 9, "id": 63 } ],
"value": 5000, "value": 5000,
"profitability": 10, "profitability": 10,
@ -856,7 +856,7 @@
"guards": [ { "number": 10, "id": 62 } ], "guards": [ { "number": 10, "id": 62 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 0, 2, 0, 2, 2, 2, 0 ], "reward_resources": [ 0, 2, 0, 2, 2, 2, 0 ],
"reward_creatures": [ { "number": 3, "id": 63 } ], "reward_creatures": [ { "number": 3, "id": 63 } ],
"value": 2000, "value": 2000,
"profitability": 10, "profitability": 10,
@ -867,7 +867,7 @@
"guards": [ { "number": 15, "id": 62 } ], "guards": [ { "number": 15, "id": 62 } ],
"upgrade_chance": 70, "upgrade_chance": 70,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 0, 3, 0, 3, 3, 3, 0 ], "reward_resources": [ 0, 3, 0, 3, 3, 3, 0 ],
"reward_creatures": [ { "number": 5, "id": 63 } ], "reward_creatures": [ { "number": 5, "id": 63 } ],
"value": 3000, "value": 3000,
@ -879,7 +879,7 @@
"guards": [ { "number": 20, "id": 62 } ], "guards": [ { "number": 20, "id": 62 } ],
"upgrade_chance": 80, "upgrade_chance": 80,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 4, 0, 4, 4, 4, 0 ], "reward_resources": [ 0, 4, 0, 4, 4, 4, 0 ],
"reward_creatures": [ { "number": 7, "id": 63 } ], "reward_creatures": [ { "number": 7, "id": 63 } ],
"value": 4000, "value": 4000,
"profitability": 10, "profitability": 10,
@ -890,7 +890,7 @@
"guards": [ { "number": 30, "id": 62 } ], "guards": [ { "number": 30, "id": 62 } ],
"upgrade_chance": 90, "upgrade_chance": 90,
"combat_value": 250, "combat_value": 250,
"reward_ressources": [ 0, 5, 0, 5, 5, 5, 0 ], "reward_resources": [ 0, 5, 0, 5, 5, 5, 0 ],
"reward_creatures": [ { "number": 9, "id": 63 } ], "reward_creatures": [ { "number": 9, "id": 63 } ],
"value": 5000, "value": 5000,
"profitability": 10, "profitability": 10,
@ -907,7 +907,7 @@
"guards": [ { "number": 10, "id": 36 } ], "guards": [ { "number": 10, "id": 36 } ],
"upgrade_chance": 50, "upgrade_chance": 50,
"combat_value": 100, "combat_value": 100,
"reward_ressources": [ 0, 2, 0, 2, 2, 2, 0 ], "reward_resources": [ 0, 2, 0, 2, 2, 2, 0 ],
"reward_creatures": [ { "number": 3, "id": 36 } ], "reward_creatures": [ { "number": 3, "id": 36 } ],
"value": 2000, "value": 2000,
"profitability": 10, "profitability": 10,
@ -918,7 +918,7 @@
"guards": [ { "number": 15, "id": 36 } ], "guards": [ { "number": 15, "id": 36 } ],
"upgrade_chance": 70, "upgrade_chance": 70,
"combat_value": 150, "combat_value": 150,
"reward_ressources": [ 0, 3, 0, 3, 3, 3, 0 ], "reward_resources": [ 0, 3, 0, 3, 3, 3, 0 ],
"reward_creatures": [ { "number": 5, "id": 36 } ], "reward_creatures": [ { "number": 5, "id": 36 } ],
"value": 3000, "value": 3000,
"profitability": 10, "profitability": 10,
@ -929,7 +929,7 @@
"guards": [ { "number": 20, "id": 36 } ], "guards": [ { "number": 20, "id": 36 } ],
"upgrade_chance": 80, "upgrade_chance": 80,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 4, 0, 4, 4, 4, 0 ], "reward_resources": [ 0, 4, 0, 4, 4, 4, 0 ],
"reward_creatures": [ { "number": 7, "id": 36 } ], "reward_creatures": [ { "number": 7, "id": 36 } ],
"value": 4000, "value": 4000,
"profitability": 10, "profitability": 10,
@ -940,7 +940,7 @@
"guards": [ { "number": 30, "id": 36 } ], "guards": [ { "number": 30, "id": 36 } ],
"upgrade_chance": 90, "upgrade_chance": 90,
"combat_value": 250, "combat_value": 250,
"reward_ressources": [ 0, 5, 0, 5, 5, 5, 0 ], "reward_resources": [ 0, 5, 0, 5, 5, 5, 0 ],
"reward_creatures": [ { "number": 9, "id": 36 } ], "reward_creatures": [ { "number": 9, "id": 36 } ],
"value": 5000, "value": 5000,
"profitability": 10, "profitability": 10,
@ -957,7 +957,7 @@
"guards": [ { "number": 3, "id": 72 }, { "number": 3, "id": 74 }, { "number": 3, "id": 72 }, { "number": 3, "id": 74 } ], "guards": [ { "number": 3, "id": 72 }, { "number": 3, "id": 74 }, { "number": 3, "id": 72 }, { "number": 3, "id": 74 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 200, "combat_value": 200,
"reward_ressources": [ 0, 0, 20, 0, 0, 0, 1000 ], "reward_resources": [ 0, 0, 20, 0, 0, 0, 1000 ],
"value": 2000, "value": 2000,
"profitability": 20, "profitability": 20,
"easiest": 100 "easiest": 100
@ -967,7 +967,7 @@
"guards": [ { "number": 4, "id": 72 }, { "number": 4, "id": 74 }, { "number": 4, "id": 72 }, { "number": 4, "id": 74 } ], "guards": [ { "number": 4, "id": 72 }, { "number": 4, "id": 74 }, { "number": 4, "id": 72 }, { "number": 4, "id": 74 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 300, "combat_value": 300,
"reward_ressources": [ 0, 0, 25, 0, 0, 0, 1000 ], "reward_resources": [ 0, 0, 25, 0, 0, 0, 1000 ],
"value": 3000, "value": 3000,
"profitability": 20, "profitability": 20,
"easiest": 150 "easiest": 150
@ -977,7 +977,7 @@
"guards": [ { "number": 5, "id": 72 }, { "number": 5, "id": 74 }, { "number": 5, "id": 72 }, { "number": 5, "id": 74 } ], "guards": [ { "number": 5, "id": 72 }, { "number": 5, "id": 74 }, { "number": 5, "id": 72 }, { "number": 5, "id": 74 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 400, "combat_value": 400,
"reward_ressources": [ 0, 0, 30, 0, 0, 0, 1500 ], "reward_resources": [ 0, 0, 30, 0, 0, 0, 1500 ],
"value": 4000, "value": 4000,
"profitability": 20, "profitability": 20,
"easiest": 200 "easiest": 200
@ -987,7 +987,7 @@
"guards": [ { "number": 6, "id": 72 }, { "number": 6, "id": 74 }, { "number": 6, "id": 72 }, { "number": 6, "id": 74 } ], "guards": [ { "number": 6, "id": 72 }, { "number": 6, "id": 74 }, { "number": 6, "id": 72 }, { "number": 6, "id": 74 } ],
"upgrade_chance": 0, "upgrade_chance": 0,
"combat_value": 500, "combat_value": 500,
"reward_ressources": [ 0, 0, 35, 0, 0, 0, 2000 ], "reward_resources": [ 0, 0, 35, 0, 0, 0, 2000 ],
"value": 5000, "value": 5000,
"profitability": 20, "profitability": 20,
"easiest": 250 "easiest": 250

2
config/buildings.json
View File

@ -7,7 +7,7 @@
// creatures_upgraded: ids of the upgraded creatures in each dwelling, ordered by level // creatures_upgraded: ids of the upgraded creatures in each dwelling, ordered by level
// horde: horde building creature levels (-1 if not present) // horde: horde building creature levels (-1 if not present)
// mage_guild: maximum level of the mage guild // mage_guild: maximum level of the mage guild
// primary_ressource: (1,3,4,5 for rares and 127 for wood+ore) // primary_resource: (1,3,4,5 for rares and 127 for wood+ore)
// war_machine: type of war machine that this city can build // war_machine: type of war machine that this city can build
{ {

4
config/resources.json Normal file
View File

@ -0,0 +1,4 @@
{
// Price of each resource in gold, in usual resource order
"resources_prices": [ 250, 500, 250, 500, 500, 500, 1, 0 ]
}

4
config/ressources.json
View File

@ -1,4 +0,0 @@
{
// Price of each ressource in gold, in usual ressource order
"ressources_prices": [ 250, 500, 250, 500, 500, 500, 1, 0 ]
}

2
config/startres.json
View File

@ -1,4 +1,4 @@
// Starting ressources, ordered by difficulty level (0 to 4) // Starting resources, ordered by difficulty level (0 to 4)
{ {
"difficulty": "difficulty":
[ [

10
lib/CObjectHandler.cpp
View File

@ -128,9 +128,9 @@ static void readBankLevel(const JsonNode &level, BankConfig &bc)
bc.resources.resize(GameConstants::RESOURCE_QUANTITY); bc.resources.resize(GameConstants::RESOURCE_QUANTITY);
idx = 0; idx = 0;
BOOST_FOREACH(const JsonNode &ressource, level["reward_ressources"].Vector()) BOOST_FOREACH(const JsonNode &resource, level["reward_resources"].Vector())
{ {
bc.resources[idx] = ressource.Float(); bc.resources[idx] = resource.Float();
idx ++; idx ++;
} }
@ -168,9 +168,9 @@ void CObjectHandler::loadObjects()
} }
tlog5 << "\t\tDone loading cregens!\n"; tlog5 << "\t\tDone loading cregens!\n";
tlog5 << "\t\tReading ressources prices \n"; tlog5 << "\t\tReading resources prices \n";
const JsonNode config2(GameConstants::DATA_DIR + "/config/ressources.json"); const JsonNode config2(GameConstants::DATA_DIR + "/config/resources.json");
BOOST_FOREACH(const JsonNode &price, config2["ressources_prices"].Vector()) BOOST_FOREACH(const JsonNode &price, config2["resources_prices"].Vector())
{ {
resVals.push_back(price.Float()); resVals.push_back(price.Float());
} }