widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

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

Requested reviews:
  Widelands Developers (widelands-dev)

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

Renamed a building to make more sense.
-- 
https://code.launchpad.net/~widelands-dev/widelands/rename_goldweaver/+merge/226580
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/rename_goldweaver into lp:widelands.

=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
--- campaigns/atl01.wmf/scripting/init.lua	2014-04-14 20:01:49 +0000
+++ campaigns/atl01.wmf/scripting/init.lua	2014-07-12 14:23:42 +0000
@@ -206,7 +206,7 @@
    local o = add_obj(obj_spidercloth_production)
 
    while not check_for_buildings(p1, {
-      spiderfarm = 1, goldweaver = 1, ["weaving-mill"] = 1
+      spiderfarm = 1, ["gold-spinning-mill"] = 1, ["weaving-mill"] = 1
    }) do sleep(6273) end
    o.done = true
 

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2014-04-22 08:11:00 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2014-07-12 14:23:42 +0000
@@ -72,10 +72,22 @@
    name = "obj_spidercloth_production",
    title = _ "Build a spider farm and a weaving mill",
    number = 3,
+<<<<<<< TREE
    body = objective_text(_"Spidercloth Production", _[[The weavers produce spidercloth and tabards in the weaving mill. Spidercloth is needed for the construction of some buildings and clothing, while tabards are the uniforms of soldiers. The weaving mill needs gold yarn and spideryarn as raw material. Spideryarn is produced by the spider farm, while gold yarn is produced by the gold weaver out of gold.]] .. paragraphdivider() ..
       listitem_bullet(_[[Build a weaving mill]]) ..
       listitem_bullet(_[[Build a spider farm]]) ..
       listitem_bullet(_[[Build a goldweaver]])
+=======
+   body = objective_text(_"Spidercloth Production", _(
+[[The weavers produce spidercloth and tabards in the weaving mill. ]] ..
+[[Spidercloth is needed for the construction of some buildings and clothing, ]] ..
+[[while tabards are the uniforms of soldiers. ]] ..
+[[The weaving mill needs gold yarn and spideryarn as raw material. ]] ..
+[[Spideryarn is produced by the spider farm, while gold yarn is produced by the gold spinning works out of gold.]]) .. "<br>" ..
+[[• ]] .. _[[Build a weaving mill]] .. "<br>" ..
+[[• ]] .. _[[Build a spider farm]] .. "<br>" ..
+[[• ]] .. _[[Build a gold spinning mill]]
+>>>>>>> MERGE-SOURCE
  )
 }
 
@@ -310,7 +322,7 @@
     body = jundlina(_ "Jundlina Replies", _(
 [[May Satul warm you too, Opol. I wanted to delay production of spidercloth, but I understand your urgency. ]] ..
 [[Your suggestion sounds fair to me, I will build your weaving mill and spider farm. ]] ..
-[[I will also build a goldweaver so that the golden tabards you make will not be golden by name alone.]]
+[[I will also build a gold spinning mill so that the golden tabards you make will not be golden by name alone.]]
     )) ..  new_objectives(obj_spidercloth_production)
  }
 }
@@ -320,7 +332,7 @@
       title = _ "Opol Seeks Out Jundlina",
       body = opol(_(
 [[May Satul warm you, Jundlina! ]] ..
-[[The weaving mill, goldweaver and spider farm buildings are complete ]] ..
+[[The weaving mill, gold spinning mill and spider farm buildings are complete ]] ..
 [[and are starting their work at this very moment. The weavers’ guild is very grateful for your support ]] ..
 [[and we will stand by our word and deliver the first tabard very soon.]]
       ))

=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf	2014-07-03 07:36:22 +0000
+++ tribes/atlanteans/conf	2014-07-12 14:23:42 +0000
@@ -163,7 +163,7 @@
 quarry=_Quarry
 woodcutters_house=_Woodcutter’s House
 foresters_house=_Forester’s House
-goldweaver=_Goldweaver
+gold-spinning-mill=_Gold Spinning Mill
 fishers_house=_Fisher’s House
 fish_breeders_house=_Fish Breeder’s House
 hunters_house=_Hunter’s House

=== renamed directory 'tribes/atlanteans/goldweaver' => 'tribes/atlanteans/gold-spinning-mill'
=== modified file 'tribes/atlanteans/gold-spinning-mill/conf'
--- tribes/atlanteans/goldweaver/conf	2014-07-03 20:06:38 +0000
+++ tribes/atlanteans/gold-spinning-mill/conf	2014-07-12 14:23:42 +0000
@@ -30,9 +30,9 @@
 produce=goldyarn
 
 [idle]
-pics=goldweaver_i_??.png  # ???
+pics=gold-spinning-mill_i_??.png  # ???
 hotspot=33 64
 
 [working]
-pics=goldweaver_i_??.png  # ???
+pics=gold-spinning-mill_i_??.png  # ???
 hotspot=33 64

=== renamed file 'tribes/atlanteans/goldweaver/goldweaver_i_00.png' => 'tribes/atlanteans/gold-spinning-mill/gold-spinning-mill_i_00.png'
=== renamed file 'tribes/atlanteans/goldweaver/goldweaver_i_00_pc.png' => 'tribes/atlanteans/gold-spinning-mill/gold-spinning-mill_i_00_pc.png'
=== modified file 'tribes/atlanteans/gold/conf'
--- tribes/atlanteans/gold/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/gold/conf	2014-07-12 14:23:42 +0000
@@ -1,4 +1,4 @@
-help=_Gold is one of the most valuable materials. It is produced out of gold ore in the smelting works. Gold is used by the armor smithy, the weapon smithy and the goldweaver.
+help=_Gold is one of the most valuable materials. It is produced out of gold ore in the smelting works. Gold is used by the armor smithy, the weapon smithy and the gold spinning mill.
 
 
 preciousness=2

=== modified file 'tribes/atlanteans/goldyarn/conf'
--- tribes/atlanteans/goldyarn/conf	2014-04-08 06:28:45 +0000
+++ tribes/atlanteans/goldyarn/conf	2014-07-12 14:23:42 +0000
@@ -1,4 +1,4 @@
-help=_This yarn, made of gold by the goldweaver, is used for weaving the exclusive golden tabard in the weaving mill.
+help=_This yarn, made of gold by the gold spinning mill, is used for weaving the exclusive golden tabard in the weaving mill.
 
 preciousness=2
 default_target_quantity=5