widelands-dev team mailing list archive

[wl-zocker <wl-zocker@xxxxxxxxxxx>]

wl-zocker has proposed merging lp:~widelands-dev/widelands/bug-669699 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #669699 in widelands: "trainer is only a carrier"
  https://bugs.launchpad.net/widelands/+bug/669699

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-669699/+merge/236490

Fixes the attached bug. I also fixed some other things (shipyard showing wrong productivity when not working).
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-669699/+merge/236490
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-669699 into lp:widelands.

=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2014-09-20 09:37:47 +0000
+++ src/scripting/lua_game.cc	2014-09-30 11:16:15 +0000
@@ -1119,7 +1119,6 @@
 
 
 /* RST
->>>>>>> MERGE-SOURCE
 	.. attribute:: field
 
 		(RO) The field that corresponds to this Message.

=== modified file 'tribes/atlanteans/coal/conf'
--- tribes/atlanteans/coal/conf	2014-08-26 17:25:00 +0000
+++ tribes/atlanteans/coal/conf	2014-09-30 11:16:15 +0000
@@ -1,4 +1,4 @@
-help=_The Atlantean fires in smelting works, armorsmithies and weaponsmithies are fed with coal. This coal is mined in coal mines or produced out of logs by a charcoal kiln.
+help=_The Atlantean fires in smelting works, armor smithies and weapon smithies are fed with coal. This coal is mined in coal mines or produced out of logs by a charcoal kiln.
 
 default_target_quantity=20
 preciousness=1

=== modified file 'tribes/atlanteans/labyrinth/conf'
--- tribes/atlanteans/labyrinth/conf	2014-07-27 19:31:34 +0000
+++ tribes/atlanteans/labyrinth/conf	2014-09-30 11:16:15 +0000
@@ -19,7 +19,7 @@
 quartz=1
 
 [working positions]
-carrier=1
+trainer=1
 
 [inputs]
 bread=10

=== modified file 'tribes/atlanteans/shipyard/conf'
--- tribes/atlanteans/shipyard/conf	2014-07-27 19:31:34 +0000
+++ tribes/atlanteans/shipyard/conf	2014-09-30 11:16:15 +0000
@@ -33,6 +33,7 @@
 [work]
 sleep=20000
 call=ship
+return=skipped
 
 [ship]
 check_map=seafaring

=== modified file 'tribes/atlanteans/trainer/conf'
--- tribes/atlanteans/trainer/conf	2013-07-23 20:21:03 +0000
+++ tribes/atlanteans/trainer/conf	2014-09-30 11:16:15 +0000
@@ -2,6 +2,8 @@
 
 [buildcost]
 carrier=1
+light_trident=1
+tabard=1
 
 [idle]
 pics=idle_??.png

=== modified file 'tribes/barbarians/shipyard/conf'
--- tribes/barbarians/shipyard/conf	2014-07-29 09:27:08 +0000
+++ tribes/barbarians/shipyard/conf	2014-09-30 11:16:15 +0000
@@ -32,6 +32,7 @@
 [work]
 sleep=20000
 call=ship
+return=skipped
 
 [ship]
 check_map=seafaring

=== modified file 'tribes/barbarians/trainer/conf'
--- tribes/barbarians/trainer/conf	2013-07-23 20:21:03 +0000
+++ tribes/barbarians/trainer/conf	2014-09-30 11:16:15 +0000
@@ -2,6 +2,7 @@
 
 [buildcost]
 carrier=1
+ax=1
 
 [idle]
 pics=idle_??.png

=== modified file 'tribes/empire/arena/conf'
--- tribes/empire/arena/conf	2014-07-27 19:32:24 +0000
+++ tribes/empire/arena/conf	2014-09-30 11:16:15 +0000
@@ -19,7 +19,7 @@
 
 
 [working positions]
-carrier=1
+trainer=1
 
 [soldier evade]
 min_level=0

=== modified file 'tribes/empire/colosseum/conf'
--- tribes/empire/colosseum/conf	2014-07-27 19:32:24 +0000
+++ tribes/empire/colosseum/conf	2014-09-30 11:16:15 +0000
@@ -20,7 +20,7 @@
 marblecolumn=2
 
 [working positions]
-carrier=1
+trainer=1
 
 [inputs]
 bread=10

=== modified file 'tribes/empire/shipyard/conf'
--- tribes/empire/shipyard/conf	2014-07-27 19:32:24 +0000
+++ tribes/empire/shipyard/conf	2014-09-30 11:16:15 +0000
@@ -32,6 +32,7 @@
 [work]
 sleep=20000
 call=ship
+return=skipped
 
 [ship]
 check_map=seafaring

=== modified file 'tribes/empire/trainer/conf'
--- tribes/empire/trainer/conf	2013-07-23 20:21:03 +0000
+++ tribes/empire/trainer/conf	2014-09-30 11:16:15 +0000
@@ -2,6 +2,8 @@
 
 [buildcost]
 carrier=1
+helm=1
+wood_lance=1
 
 [idle]
 pics=idle_??.png

=== modified file 'tribes/empire/vineyard/help.lua'
--- tribes/empire/vineyard/help.lua	2014-07-25 12:19:33 +0000
+++ tribes/empire/vineyard/help.lua	2014-09-30 11:16:15 +0000
@@ -14,7 +14,7 @@
 
 	--General Section
 	building_help_general_string("empire", building_description,
-		_"Sow and harvest wheat.") ..
+		_"Sow and harvest grapes.") ..
 
 	--Dependencies
 	building_help_dependencies_production("empire", building_description) ..