widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/trainer_as_carrier into lp:widelands.

Commit message:
Trainers now cost only a carrier again.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1422158 in widelands: "A trainer should be created before soldiers"
  https://bugs.launchpad.net/widelands/+bug/1422158

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/trainer_as_carrier/+merge/306698

Since we added some wares to the trainer cost in:

https://bugs.launchpad.net/widelands/+bug/669699

People have been having problems with getting a trainer:

https://bugs.launchpad.net/widelands/+bug/1422158

I am in favour of removing this new feature for Build 19, because it causes frustration for the players.

We should put it back in when we add the casern building.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/trainer_as_carrier into lp:widelands.

=== modified file 'data/tribes/workers/atlanteans/trainer/init.lua'
--- data/tribes/workers/atlanteans/trainer/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/workers/atlanteans/trainer/init.lua	2016-09-25 07:04:37 +0000
@@ -21,8 +21,9 @@
 
    buildcost = {
       atlanteans_carrier = 1,
-      trident_light = 1,
-      tabard = 1
+      -- TODO (GunChleoc): Add back in when we have a casern
+      --trident_light = 1,
+      --tabard = 1
    },
 
    animations = animations,

=== modified file 'data/tribes/workers/barbarians/trainer/init.lua'
--- data/tribes/workers/barbarians/trainer/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/workers/barbarians/trainer/init.lua	2016-09-25 07:04:37 +0000
@@ -20,7 +20,8 @@
 
    buildcost = {
       barbarians_carrier = 1,
-      ax = 1
+      -- TODO (GunChleoc): Add back in when we have a casern
+      --ax = 1
    },
 
    animations = animations,

=== modified file 'data/tribes/workers/empire/trainer/init.lua'
--- data/tribes/workers/empire/trainer/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/workers/empire/trainer/init.lua	2016-09-25 07:04:37 +0000
@@ -21,8 +21,9 @@
 
    buildcost = {
       empire_carrier = 1,
-      armor_helmet = 1,
-      spear_wooden = 1
+      -- TODO (GunChleoc): Add back in when we have a casern
+      --armor_helmet = 1,
+      --spear_wooden = 1
    },
 
    animations = animations,