widelands

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

  1. trainer_as_carrier
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8113
Proposed branch: lp:~widelands-dev/widelands/trainer_as_carrier
Merge into: lp:widelands
Diff against target: 45 lines (+8/-5)
3 files modified
data/tribes/workers/atlanteans/trainer/init.lua (+3/-2)
data/tribes/workers/barbarians/trainer/init.lua (+2/-1)
data/tribes/workers/empire/trainer/init.lua (+3/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/trainer_as_carrier
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+306698@code.launchpad.net

Commit message

Trainers now cost only a carrier again.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Revision history for this message
SirVer (sirver) wrote :

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

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/workers/atlanteans/trainer/init.lua'
2--- data/tribes/workers/atlanteans/trainer/init.lua 2015-12-11 16:54:00 +0000
3+++ data/tribes/workers/atlanteans/trainer/init.lua 2016-09-25 07:04:37 +0000
4@@ -21,8 +21,9 @@
5
6 buildcost = {
7 atlanteans_carrier = 1,
8- trident_light = 1,
9- tabard = 1
10+ -- TODO (GunChleoc): Add back in when we have a casern
11+ --trident_light = 1,
12+ --tabard = 1
13 },
14
15 animations = animations,
16
17=== modified file 'data/tribes/workers/barbarians/trainer/init.lua'
18--- data/tribes/workers/barbarians/trainer/init.lua 2015-12-11 16:54:00 +0000
19+++ data/tribes/workers/barbarians/trainer/init.lua 2016-09-25 07:04:37 +0000
20@@ -20,7 +20,8 @@
21
22 buildcost = {
23 barbarians_carrier = 1,
24- ax = 1
25+ -- TODO (GunChleoc): Add back in when we have a casern
26+ --ax = 1
27 },
28
29 animations = animations,
30
31=== modified file 'data/tribes/workers/empire/trainer/init.lua'
32--- data/tribes/workers/empire/trainer/init.lua 2015-12-11 16:54:00 +0000
33+++ data/tribes/workers/empire/trainer/init.lua 2016-09-25 07:04:37 +0000
34@@ -21,8 +21,9 @@
35
36 buildcost = {
37 empire_carrier = 1,
38- armor_helmet = 1,
39- spear_wooden = 1
40+ -- TODO (GunChleoc): Add back in when we have a casern
41+ --armor_helmet = 1,
42+ --spear_wooden = 1
43 },
44
45 animations = animations,

Subscribers

People subscribed via source and target branches

to status/vote changes: