Notabilis has proposed merging
lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands.
Commit message:
Adding initial trainers to Headquarters and Fortified Village starting
conditions.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1075562 in widelands: "Implement a casern for soldier recruting"
https://bugs.launchpad.net/widelands/+bug/1075562
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1075562-initial-trainers/+merge/332959
This implements the suggestion of comment #60 in the linked bug report. It
avoids the problem with getting stuck when no trainers can be created since all
weapons are delivered to the barracks.
Note that it is still possible to get stuck when building more than one of each
training center. In that case, the problem has to be fixed by reducing the
amount of weapons in the barracks.
The amount of initial weapons has not been reduced so the game becomes a bit
easier by this branch (more initial weapons for soldiers).
The Trading Outpost starting condition is not modified by this branch but also
suffers from the problem. Should it be changed, too?
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1075562-initial-trainers into lp:widelands.
=== modified file 'data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua 2016-12-03 16:37:13 +0000
+++ data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua 2017-10-28 06:24:02 +0000
@@ -66,6 +66,7 @@
atlanteans_miner = 4,
atlanteans_stonecutter = 2,
atlanteans_toolsmith = 1,
+ atlanteans_trainer = 3,
atlanteans_woodcutter = 3,
atlanteans_horse = 5,
},
=== modified file 'data/tribes/scripting/starting_conditions/atlanteans/headquarters.lua'
--- data/tribes/scripting/starting_conditions/atlanteans/headquarters.lua 2016-03-30 07:23:59 +0000
+++ data/tribes/scripting/starting_conditions/atlanteans/headquarters.lua 2017-10-28 06:24:02 +0000
@@ -71,6 +71,7 @@
atlanteans_sawyer = 1,
atlanteans_stonecutter = 2,
atlanteans_toolsmith = 2,
+ atlanteans_trainer = 3,
atlanteans_weaponsmith = 1,
atlanteans_woodcutter = 3,
atlanteans_horse = 5,
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2017-09-17 14:47:35 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua 2017-10-28 06:24:02 +0000
@@ -61,6 +61,7 @@
barbarians_miner = 4,
barbarians_ranger = 1,
barbarians_stonemason = 2,
+ barbarians_trainer = 3,
barbarians_ox = 5,
},
soldiers = {
=== modified file 'data/tribes/scripting/starting_conditions/barbarians/headquarters.lua'
--- data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2017-09-17 14:47:35 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/headquarters.lua 2017-10-28 06:24:02 +0000
@@ -65,6 +65,7 @@
barbarians_miner_master = 4,
barbarians_ranger = 1,
barbarians_stonemason = 2,
+ barbarians_trainer = 3,
barbarians_ox = 5,
},
soldiers = {
=== modified file 'data/tribes/scripting/starting_conditions/empire/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/empire/fortified_village.lua 2016-12-03 16:37:13 +0000
+++ data/tribes/scripting/starting_conditions/empire/fortified_village.lua 2017-10-28 06:24:02 +0000
@@ -66,6 +66,7 @@
empire_miner = 4,
empire_stonemason = 1,
empire_toolsmith = 1,
+ empire_trainer = 3,
empire_donkey = 5,
},
soldiers = {
=== modified file 'data/tribes/scripting/starting_conditions/empire/headquarters.lua'
--- data/tribes/scripting/starting_conditions/empire/headquarters.lua 2016-03-30 07:23:59 +0000
+++ data/tribes/scripting/starting_conditions/empire/headquarters.lua 2017-10-28 06:24:02 +0000
@@ -70,6 +70,7 @@
empire_miner = 4,
empire_stonemason = 2,
empire_toolsmith = 2,
+ empire_trainer = 3,
empire_weaponsmith = 1,
empire_donkey = 5,
},
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
