Merge lp:~widelands-dev/widelands/trainer_as_carrier into lp:widelands

[GunChleoc]

Trainers now cost only a carrier again.

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.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1355. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/162534142.
Appveyor build 1197. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_trainer_as_carrier-1197.

[SirVer (sirver)]

I agree, let's get this in for b19.

@bunnybot merge

=== 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,