Skip to content

Commit

Permalink
Merge pull request #21 from rkurbatov/rebalance
Browse files Browse the repository at this point in the history 
Rebalance
  • Loading branch information
@ciplogic
ciplogic committed Jun 26, 2019
2 parents b165403 + 9e9827f commit 98b63b3
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 97 deletions.
50 changes: 25 additions & 25 deletions src/fheroes2/castle/buildinginfo.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ buildstats_t _builds[] = {
// id gold wood mercury ore sulfur crystal gems
{BUILD_THIEVESGUILD, Race::ALL, {750, 5, 0, 0, 0, 0, 0}},
{BUILD_TAVERN, Race::ALL, {500, 5, 0, 0, 0, 0, 0}},
{BUILD_SHIPYARD, Race::ALL, {2000, 20, 0, 0, 0, 0, 0}},
{BUILD_SHIPYARD, Race::ALL, {2000, 15, 0, 0, 0, 0, 0}},
{BUILD_WELL, Race::ALL, {500, 0, 0, 0, 0, 0, 0}},
{BUILD_STATUE, Race::ALL, {1250, 0, 0, 5, 0, 0, 0}},
{BUILD_LEFTTURRET, Race::ALL, {1500, 0, 0, 5, 0, 0, 0}},
Expand All @@ -60,11 +60,11 @@ buildstats_t _builds[] = {
{BUILD_MOAT, Race::ALL, {750, 0, 0, 0, 0, 0, 0}},
{BUILD_CASTLE, Race::ALL, {5000, 20, 0, 20, 0, 0, 0}},
{BUILD_CAPTAIN, Race::ALL, {500, 0, 0, 0, 0, 0, 0}},
{BUILD_MAGEGUILD1, Race::ALL, {2000, 5, 0, 5, 0, 0, 0}},
{BUILD_MAGEGUILD2, Race::ALL, {1000, 5, 4, 5, 4, 4, 4}},
{BUILD_MAGEGUILD3, Race::ALL, {1000, 5, 6, 5, 6, 6, 6}},
{BUILD_MAGEGUILD4, Race::ALL, {1000, 5, 8, 5, 8, 8, 8}},
{BUILD_MAGEGUILD5, Race::ALL, {1000, 5, 10, 5, 10, 10, 10}},
{BUILD_MAGEGUILD1, Race::ALL, {1000, 5, 0, 5, 0, 0, 0}},
{BUILD_MAGEGUILD2, Race::ALL, {1500, 5, 2, 5, 2, 2, 2}},
{BUILD_MAGEGUILD3, Race::ALL, {1500, 5, 4, 5, 4, 4, 4}},
{BUILD_MAGEGUILD4, Race::ALL, {2000, 5, 6, 5, 6, 6, 6}},
{BUILD_MAGEGUILD5, Race::ALL, {2000, 5, 8, 5, 8, 8, 8}},

{BUILD_WEL2, Race::KNGT, {1000, 0, 0, 0, 0, 0, 0}},
{BUILD_WEL2, Race::BARB, {1000, 0, 0, 0, 0, 0, 0}},
Expand All @@ -73,10 +73,10 @@ buildstats_t _builds[] = {
{BUILD_WEL2, Race::WZRD, {1000, 0, 0, 0, 0, 0, 0}},
{BUILD_WEL2, Race::NECR, {1000, 0, 0, 0, 0, 0, 0}},

{BUILD_SPEC, Race::KNGT, {1500, 5, 0, 15, 0, 0, 0}},
{BUILD_SPEC, Race::BARB, {2000, 10, 0, 10, 0, 0, 0}},
{BUILD_SPEC, Race::SORC, {1500, 0, 0, 0, 0, 10, 0}},
{BUILD_SPEC, Race::WRLK, {3000, 5, 0, 10, 0, 0, 0}},
{BUILD_SPEC, Race::KNGT, {1500, 0, 0, 10, 0, 0, 0}},
{BUILD_SPEC, Race::BARB, {1500, 5, 0, 5, 0, 0, 0}},
{BUILD_SPEC, Race::SORC, {1500, 0, 5, 0, 0, 5, 0}},
{BUILD_SPEC, Race::WRLK, {3500, 5, 3, 10, 3, 3, 3}},
{BUILD_SPEC, Race::WZRD, {1500, 5, 5, 5, 5, 5, 5}},
{BUILD_SPEC, Race::NECR, {1000, 0, 10, 0, 10, 0, 0}},

Expand All @@ -91,8 +91,8 @@ buildstats_t _builds[] = {
{DWELLING_UPGRADE4, Race::KNGT, {2000, 5, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER5, Race::KNGT, {3000, 20, 0, 0, 0, 0, 0}},
{DWELLING_UPGRADE5, Race::KNGT, {3000, 10, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER6, Race::KNGT, {5000, 20, 0, 0, 0, 20, 0}},
{DWELLING_UPGRADE6, Race::KNGT, {5000, 10, 0, 0, 0, 10, 0}},
{DWELLING_MONSTER6, Race::KNGT, {5000, 10, 0, 0, 0, 20, 0}},
{DWELLING_UPGRADE6, Race::KNGT, {3500, 10, 0, 0, 0, 5, 0}},

{DWELLING_MONSTER1, Race::BARB, {300, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER2, Race::BARB, {800, 5, 0, 0, 0, 0, 0}},
Expand All @@ -102,48 +102,48 @@ buildstats_t _builds[] = {
{DWELLING_UPGRADE4, Race::BARB, {3000, 5, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER5, Race::BARB, {4000, 0, 0, 20, 0, 0, 0}},
{DWELLING_UPGRADE5, Race::BARB, {2000, 0, 0, 10, 0, 0, 0}},
{DWELLING_MONSTER6, Race::BARB, {6000, 0, 0, 20, 0, 20, 0}},
{DWELLING_MONSTER6, Race::BARB, {6000, 0, 0, 10, 0, 20, 0}},

{DWELLING_MONSTER1, Race::SORC, {500, 5, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER2, Race::SORC, {1000, 5, 0, 0, 0, 0, 0}},
{DWELLING_UPGRADE2, Race::SORC, {1500, 5, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER3, Race::SORC, {1500, 0, 0, 0, 0, 0, 0}},
{DWELLING_UPGRADE3, Race::SORC, {1500, 5, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER4, Race::SORC, {1500, 0, 0, 10, 0, 0, 0}},
{DWELLING_UPGRADE4, Race::SORC, {1500, 0, 5, 0, 0, 0, 0}},
{DWELLING_UPGRADE4, Race::SORC, {2000, 0, 5, 0, 0, 0, 0}},
{DWELLING_MONSTER5, Race::SORC, {3000, 10, 0, 0, 0, 0, 10}},
{DWELLING_MONSTER6, Race::SORC, {10000, 0, 20, 30, 0, 0, 0}},

{DWELLING_MONSTER1, Race::WRLK, {500, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER2, Race::WRLK, {1000, 0, 0, 10, 0, 0, 0}},
{DWELLING_MONSTER1, Race::WRLK, {500, 0, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER2, Race::WRLK, {1000, 0, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER3, Race::WRLK, {2000, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER4, Race::WRLK, {3000, 0, 0, 0, 0, 0, 10}},
{DWELLING_UPGRADE4, Race::WRLK, {2000, 0, 0, 0, 0, 0, 5}},
{DWELLING_MONSTER5, Race::WRLK, {4000, 0, 0, 0, 10, 0, 0}},
{DWELLING_MONSTER6, Race::WRLK, {15000, 0, 0, 30, 20, 0, 0}},
{DWELLING_UPGRADE6, Race::WRLK, {5000, 0, 0, 5, 10, 0, 0}},
{DWELLING_UPGRADE7, Race::WRLK, {5000, 0, 0, 5, 10, 0, 0}},
{DWELLING_MONSTER6, Race::WRLK, {13000, 0, 0, 30, 20, 0, 0}},
{DWELLING_UPGRADE6, Race::WRLK, {6000, 0, 0, 5, 10, 0, 0}},
{DWELLING_UPGRADE7, Race::WRLK, {6000, 0, 0, 5, 10, 0, 0}},

{DWELLING_MONSTER1, Race::WZRD, {400, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER2, Race::WZRD, {800, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER3, Race::WZRD, {1500, 5, 0, 5, 0, 0, 0}},
{DWELLING_UPGRADE3, Race::WZRD, {1500, 0, 5, 0, 0, 0, 0}},
{DWELLING_MONSTER4, Race::WZRD, {3000, 5, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER5, Race::WZRD, {3500, 5, 5, 5, 5, 5, 5}},
{DWELLING_UPGRADE5, Race::WZRD, {4000, 5, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER6, Race::WZRD, {12500, 5, 0, 5, 0, 0, 20}},
{DWELLING_UPGRADE6, Race::WZRD, {12500, 5, 0, 5, 0, 0, 20}},
{DWELLING_UPGRADE5, Race::WZRD, {3000, 5, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER6, Race::WZRD, {7500, 5, 0, 5, 0, 0, 20}},
{DWELLING_UPGRADE6, Race::WZRD, {16500, 5, 0, 5, 0, 0, 20}},

{DWELLING_MONSTER1, Race::NECR, {400, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER2, Race::NECR, {1000, 0, 0, 0, 0, 0, 0}},
{DWELLING_UPGRADE2, Race::NECR, {1000, 0, 0, 0, 0, 0, 0}},
{DWELLING_MONSTER3, Race::NECR, {1500, 0, 0, 10, 0, 0, 0}},
{DWELLING_UPGRADE3, Race::NECR, {1500, 0, 0, 5, 0, 0, 0}},
{DWELLING_MONSTER4, Race::NECR, {3000, 10, 0, 0, 0, 0, 0}},
{DWELLING_UPGRADE4, Race::NECR, {4000, 5, 0, 0, 0, 10, 10}},
{DWELLING_UPGRADE4, Race::NECR, {3500, 5, 10, 0, 0, 5, 0}},
{DWELLING_MONSTER5, Race::NECR, {4000, 10, 0, 0, 10, 0, 0}},
{DWELLING_UPGRADE5, Race::NECR, {3000, 0, 0, 5, 0, 5, 0}},
{DWELLING_MONSTER6, Race::NECR, {10000, 10, 5, 10, 5, 5, 5}},
{DWELLING_UPGRADE5, Race::NECR, {2500, 0, 0, 5, 5, 0, 0}},
{DWELLING_MONSTER6, Race::NECR, {12000, 10, 10, 10, 5, 5, 5}},

// end
{BUILD_NOTHING, Race::NONE, {0, 0, 0, 0, 0, 0, 0}},
Expand Down
24 changes: 12 additions & 12 deletions src/fheroes2/game/game_static.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@ namespace Skill
stats_t _stats[] = {
{
"knight", {1, 1, 1, 1}, {2, 2, 1, 1}, 0, 0, {0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0}, 10,
{35, 45, 10, 10}, {25, 25, 25, 25}, {2, 4, 3, 1, 3, 5, 3, 1, 1, 2, 0, 3, 2, 2}
{35, 45, 10, 10}, {25, 25, 25, 25}, {3, 4, 3, 1, 3, 5, 3, 1, 0, 2, 0, 3, 2, 2}
},
{
"barbarian", {1, 1, 1, 1}, {3, 1, 1, 1}, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, 10,
{55, 35, 5, 5}, {30, 30, 20, 20}, {3, 3, 2, 1, 2, 3, 3, 2, 1, 3, 0, 4, 4, 1}
"barbarian", {1, 1, 1, 1}, {3, 1, 1, 1}, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0}, 10,
{55, 35, 5, 5}, {25, 25, 25, 25}, {3, 3, 2, 0, 1, 3, 3, 2, 1, 3, 0, 5, 4, 1}
},
{
"sorceress", {0, 0, 2, 2}, {0, 0, 2, 3}, 1, 15, {0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 1}, 10,
{10, 10, 30, 50}, {20, 20, 30, 30}, {3, 3, 2, 2, 2, 1, 2, 3, 3, 4, 0, 2, 1, 4}
"sorceress", {0, 0, 2, 2}, {0, 1, 2, 2}, 1, 15, {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1}, 10,
{20, 15, 32, 33}, {25, 20, 25, 30}, {3, 2, 2, 2, 2, 0, 2, 5, 3, 3, 0, 2, 1, 4}
},
{
"warlock", {0, 0, 2, 2}, {0, 0, 3, 2}, 1, 19, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 1}, 10,
{10, 10, 50, 30}, {20, 20, 30, 30}, {1, 3, 2, 3, 2, 1, 2, 1, 3, 2, 1, 2, 4, 5}
"warlock", {0, 0, 2, 2}, {0, 0, 3, 2}, 1, 19, {0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}, 10,
{15, 15, 40, 30}, {20, 20, 30, 30}, {0, 1, 2, 4, 3, 2, 2, 1, 3, 2, 1, 2, 3, 5}
},
{
"wizard", {0, 0, 2, 2}, {0, 1, 2, 2}, 1, 17, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}, 10,
{10, 10, 40, 40}, {20, 20, 30, 30}, {1, 3, 2, 3, 2, 2, 2, 2, 4, 2, 0, 2, 2, 5}
"wizard", {0, 0, 2, 2}, {0, 0, 2, 3}, 1, 17, {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}, 10,
{15, 15, 35, 35}, {20, 20, 30, 30}, {2, 0, 2, 3, 3, 2, 2, 2, 4, 2, 0, 2, 2, 5}
},
{
"necromancer", {0, 0, 2, 2}, {1, 0, 2, 2}, 1, 10, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1}, 10,
{15, 15, 35, 35}, {25, 25, 25, 25}, {1, 3, 2, 3, 2, 0, 2, 1, 3, 2, 5, 3, 1, 4}
{20, 20, 30, 30}, {25, 25, 25, 25}, {1, 2, 3, 3, 2, 0, 2, 1, 3, 2, 5, 3, 0, 4}
},
{
nullptr, {0, 0, 0, 0}, {0, 0, 0, 0}, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10, {0, 0, 0, 0},
Expand All @@ -66,15 +66,15 @@ namespace Skill
{"pathfinding", {25, 50, 100}},
{"archery", {10, 25, 50}},
{"logistics", {10, 20, 30}},
{"scouting", {1, 2, 3}},
{"scouting", {1, 3, 5}},
{"diplomacy", {25, 50, 100}},
{"navigation", {33, 66, 100}},
{"leadership", {1, 2, 3}},
{"wisdom", {3, 4, 5}},
{"mysticism", {2, 3, 4}},
{"luck", {1, 2, 3}},
{"ballistics", {0, 0, 0}},
{"eagleeye", {20, 30, 40}},
{"eagleeye", {25, 40, 65}},
{"necromancy", {10, 20, 30}},
{"estates", {100, 250, 500}},
{nullptr, {0, 0, 0}},
Expand Down

0 comments on commit 98b63b3

Please sign in to comment.