← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~hjd/widelands/metalworks-text-bug-734409 into lp:widelands

 

Hans Joachim Desserud has proposed merging lp:~hjd/widelands/metalworks-text-bug-734409 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #734409 in widelands: "Metalworks enhancements i Barbarian tutorial 3 should be rephrased"
  https://bugs.launchpad.net/widelands/+bug/734409

For more details, see:
https://code.launchpad.net/~hjd/widelands/metalworks-text-bug-734409/+merge/63467

(See bug 734409 for details)
Reworked part of the campaign text to avoid confusion around axe factories and blacksmith/master blacksmith.

The change on line 336 is the one who is shown in the story dialog, while the change on line 111 is the reminder shown if the player checks current objectives.
-- 
https://code.launchpad.net/~hjd/widelands/metalworks-text-bug-734409/+merge/63467
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/metalworks-text-bug-734409 into lp:widelands.
=== modified file 'campaigns/t03.wmf/scripting/texts.lua'
--- campaigns/t03.wmf/scripting/texts.lua	2011-01-04 12:17:44 +0000
+++ campaigns/t03.wmf/scripting/texts.lua	2011-06-04 16:33:36 +0000
@@ -108,7 +108,7 @@
    name = "build_weapon_productions",
    title=_"Build weapon productions",
    body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Enhance your metalworks to an axefactory or - as soon as the blacksmith reaches his next level (master blacksmith) - even to a war mill and build up another metalworks to ensure the production of tools." ..
+_"* Enhance your metalworks to an axefactory to start producing weapons, and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance your axefactory to a war mill." ..
 "</p></rt>",
 }
 
@@ -333,7 +333,7 @@
 "<br>" ..
 _"* Build a battle arena and a trainings camp to the west of the mountains." ..
 "<br>" ..
-_"* As soon as the blacksmith reaches his next level (master blacksmith) enhance your metalworks to an axefactory or even a war mill and build up another metalworks to ensure the production of tools." ..
+_"* Enhance your metalworks to an axefactory in order to produce weapons and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance it to a war mill which produces additional weapons." ..
 "<br>" ..
 _"* Build a helmsmithy to the west of the mountains to provide your soldiers with better armor." ..
 "</p></rt>",