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

[Hans Joachim Desserud]

As discussed on IRC earlier today, unify the charcoal burner/burner's house and rename it to Charcoal Furnace.

Updated:
- tribes: images, names and conf
- campaigns: references in text and scripts
- maps: ditto

If there's anything I've missed or more places I should look just let me know.

I haven't done a lot of testing (the campaing maps are untested so far), but I've verified it is possible to start a game with all three tribes.

Oh, and I have a question/TODO in the diff as well.

[wl-zocker (wl-zocker)]

Are you sure that "furnace" is the right term? From what I see, it seems to describe what we call smelting works (that is at least what a quick look in http://en.wikipedia.org/wiki/Charcoal reveals).
Furthermore, "charcoal furnace" (with quotation mark) has only 36,100 hit on Google, while "charcoal burner" has 181,000. Another possible word seems collier. I would like to hear the opinion of an English native speaker.
Please do not understand me wrong: I think unifying charcoal burner and charcoal burner's house is a good idea (it has always bothered me that there were two different terms).

What has to be updated:
- Some maps talk about not containing much coal and advise to build charcoal burners in their description. I do not know if such maps are shipped with Widelands though.
- The translation table in our wiki.

[GunChleoc (gunchleoc)]

To unify the, we could all call them "Charcoal Burner's House". I did some digging online and there doesn't seem to be an easy English term for the German "Köhlerei" at all. You can have a pit or a stack, but what you see in-game is a house:

What about "kiln"? http://www.charcoalburners.co.uk/charcoal.php

As long as it's clear it's not a pottery kiln... *starts tearing out own hair*

[Hans Joachim Desserud (hjd)]

> Some maps talk about not containing much coal and advise to build charcoal burners in their description. I do not know if such maps are shipped with Widelands though.

The plateau was the only map I found which mentioned "burner" in any way.

>The translation table in our wiki.

While I didn't mention it, this is of course on my todo list.

>As long as it's clear it's not a pottery kiln...

..and you have to make sure it's not confused for the lime kiln. *Sigh*

[wl-zocker (wl-zocker)]

None of the proposed options really convinces me. I do not like "kiln" because we already have a "lime kiln". As it stands, I prefer renaming all three to "Charcoal Burner's House".

[SirVer (sirver)]

Barbarians do not build houses. I understand that there is movement to unify names, but please also keep the in mind that the three tribes should be different and should have their own individuality.

aD, I added you as a reviewer since your a native speaker. Can you add anything to the discussion?

[GunChleoc (gunchleoc)]

> Barbarians do not build houses. I understand that there is movement to unify
> names, but please also keep the in mind that the three tribes should be
> different and should have their own individuality.

We should have a "Charcoal Burner's Hut" then for consistency.

[_aD (ad-simplypeachy)]

"Kiln" is the correct term, so "Charcoal Kiln" would be the most appropriate phrase.

"Collier" is the term for a coal miner and "Colliery" is a coal mine. I believe both of these words are primarily used in Britain. A furnace is where one would burn charcoal to cook / smelt other products.

review: Needs Fixing

[GunChleoc (gunchleoc)]

Shall we go with "Charcoal Kiln" for all 3 buildings then?

@ _aD: Is there a special name for the worker as well? At the moment, we're simply using "Burner".

[_aD (ad-simplypeachy)]

I am sure there is a correct term, but if someone used it I probably wouldn't recognise it! The Oxford English Dictionary states that one of the definitions of "burner" is "a person...that burns".

On one of the sites linked about charcoal burning, there is the sentence: "Chris Wall-Palmer lives in his own woodland near Midhurst in West Sussex and has been a charcoal burner for 18 years".

I would say that naming the worker "Charcoal burner" might help remove ambiguity for the new player, but wouldn't consider it necessary to include the "charcoal". In the case of a "Charcoal kiln", it is more important to help identify what sort of kiln it is.

n.b. I live 15 miles from Midhurst...I have probably cycled past Chris's woodlands!

[GunChleoc (gunchleoc)]

Thanks! I think it might be beneficial to rename the worker from "Burner" to "Charcoal Burner", if it doesn't confuse old players.

[wl-zocker (wl-zocker)]

"Charcoal burner" is fine for me. "Charcoal kiln" is more likely to be confusing, but we will get used to it.

[GunChleoc (gunchleoc)]

Let's use "Charcoal Burner" for the worker and "Charcoal Kiln" for the building then - with the capital letters like that. English Speakers Like Their Title Case :P

[Hans Joachim Desserud (hjd)]

> Let's use "Charcoal Burner" for the worker and "Charcoal Kiln" for the
> building then - with the capital letters like that. English Speakers Like
> Their Title Case :P

The more I think about this, the more I realize I should have made a bug report.

Are we all agreed upon this suggestion? (Still not sure how this might conflict against the lime kiln)

[_aD (ad-simplypeachy)]

Agreed

review: Approve

[GunChleoc (gunchleoc)]

Let's go with it. Sorry about the confusion + extra work

[Hans Joachim Desserud (hjd)]

Let's try again.

Renamed charcoal burner/burner's house to Charcoal Kiln, and burner (the worker) to Charcoal Burner.

Remaining:
I have a TODO comment with a question, and the translation table on the wiki needs to be updated once/when this lands.

review: Needs Resubmitting

[GunChleoc (gunchleoc)]

I had a look at the diff without testing and added some comments for small string fixes.

Have you grepped for burner/Burner to make sure that you've caught them all?

I can't answer your todo question right now, since I'm not familiar with scenario code.

review: Needs Fixing

[Hans Joachim Desserud (hjd)]

>Have you grepped for burner/Burner to make sure that you've caught them all?

Replaced the use of burner in maps and campaigns now. Any other places I need to check?

[GunChleoc (gunchleoc)]

grep the tribes and scripting as well, just to make sure. Otherwise, +1 from me once your todo comment has been resolved.

[Hans Joachim Desserud (hjd)]

Unsurprisingly, nothing in scripting. I checked tribes when changing the names/moving directories.

[SirVer (sirver)]

What is this waiting on?

[Hans Joachim Desserud (hjd)]

I'd like a reply to the TODO comment/question.

Other than that, Gun Chleoc has approved to the changes a couple of comments up.

[SirVer (sirver)]

Sorry. I missed the question in the code and now that I found it, I do not understand what you mean by it. Can you elaborate a bit more?

[Hans Joachim Desserud (hjd)]

I'm not that familiar with lua, so I would like someone to doublecheck my assumptions.

I see that the code calls
local rv = plr:get_buildings{"well", "burners_house"}

The way I've interpreted this is that it gives me a map which contains building names as the keys and the amount of those buildings as the values. So if the player has two wells, calling #rv.well would look up the value associated with that key and return 2.

So the keys of the map seem to be available as attributes of rv, but it is not clear to me how for instance #rv.well came into existance. Is this populated by the parameters passed to get_buildings (or perhaps all building types available to a player)? Basically I want to know whether #rv.charcoal_kiln will exist or if I need to do something more in order to create this attribute?

[GunChleoc (gunchleoc)]

I think a way to test this would be to play the 2nd Empire campaign until you hit the objective "obj_better_material_2". Then don't build any coal mines but charcoal kilns only and see if you can complete the objectve by that. If you can, everything's fine.

[SirVer (sirver)]

tl;dr: yes, your assumption is correct.

longer:
local rv = plr:get_buildings{"well", "burners_house"}

returns a lua table of tables (see https://wl.widelands.org/docs/wl/autogen_wl_game/#wl.game.Player.get_buildings). It will therefore return { "well": { b1,b2}, "burners_house": { b1}} and so on.
the # operator means length in lua. so #rv.well == 2, #rv.burners_house == 1.

the dot operator is just synthetic sugar in Lua. Ie. rv["well"] is the same as rv.well

[Hans Joachim Desserud (hjd)]

>the # operator means length in lua.

Aha, so that's what it does.

> Ie. rv["well"] is the same as rv.well

Hm, like Javascript then.

Think that should be all then.

[GunChleoc (gunchleoc)]

LGTM

review: Approve

[Hans Joachim Desserud (hjd)]

Pushed to trunk.

I've updated
https://wl.widelands.org/wiki/TranslationDictionaryTemplate/
and
https://wl.widelands.org/wiki/Terminology%20Correspondence%20Table/

=== modified file 'campaigns/atl01.wmf/allowed_worker_types'
--- campaigns/atl01.wmf/allowed_worker_types	2014-03-15 09:52:23 +0000
+++ campaigns/atl01.wmf/allowed_worker_types	2014-08-03 09:56:19 +0000
@@ -10,7 +10,7 @@
 blacksmith="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 gardener="true"
 fisher="true"

=== modified file 'campaigns/emp01.wmf/scripting/starting_conditions.lua'
--- campaigns/emp01.wmf/scripting/starting_conditions.lua	2014-03-15 13:36:42 +0000
+++ campaigns/emp01.wmf/scripting/starting_conditions.lua	2014-08-03 09:56:19 +0000
@@ -46,8 +46,8 @@
    armorsmith = 1,
    brewer = 1,
    builder = 10,
-   burner = 1,
    carrier = 40,
+   charcoal_burner = 1,
    geologist = 4,
    lumberjack = 3,
    miner = 4,

=== modified file 'campaigns/emp02.wmf/scripting/mission_thread.lua'
--- campaigns/emp02.wmf/scripting/mission_thread.lua	2014-03-15 12:26:14 +0000
+++ campaigns/emp02.wmf/scripting/mission_thread.lua	2014-08-03 09:56:19 +0000
@@ -129,7 +129,7 @@
       "armorsmithy",
       "weaponsmithy",
       "smelting_works",
-      "burners_house",
+      "charcoal_kiln",
    }
 
    local o = add_obj(obj_build_mining_infrastructure)
@@ -145,14 +145,14 @@
          "armorsmithy",
          "weaponsmithy",
          "smelting_works",
-         "burners_house",
+         "charcoal_kiln",
       }
       if #rv.stonemasons_house > 0 and
          #rv.toolsmithy > 0 and
          #rv.armorsmithy > 0 and
          #rv.smelting_works > 0 and
          (#rv.oremine + #rv.deep_oremine > 0) and
-         (#rv.coalmine + #rv.deep_coalmine + #rv.burners_house > 0) and
+         (#rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln > 0) and
          #rv.weaponsmithy > 0 then break end
       sleep(4948)
    end
@@ -203,11 +203,11 @@
    while true do
       local rv = p1:get_buildings{
          "marblemine", "deep_marblemine", "oremine", "deep_oremine",
-         "coalmine", "deep_coalmine", "burners_house"
+         "coalmine", "deep_coalmine", "charcoal_kiln"
       }
       local mm = #rv.marblemine + #rv.deep_marblemine
       local ore = #rv.oremine + #rv.deep_oremine
-      local coal = #rv.coalmine + #rv.deep_coalmine + #rv.burners_house
+      local coal = #rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln
 
       if mm > 0 and ore > 0 and coal > 0 then break end
       sleep(6674)

=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- campaigns/emp02.wmf/scripting/starting_conditions.lua	2014-03-15 13:36:42 +0000
+++ campaigns/emp02.wmf/scripting/starting_conditions.lua	2014-08-03 09:56:19 +0000
@@ -51,8 +51,8 @@
          armorsmith = 1,
          brewer = 1,
          builder = 10,
-         burner = 1,
          carrier = 40,
+         charcoal_burner = 1,
          geologist = 4,
          lumberjack = 3,
          miner = 4,
@@ -122,8 +122,8 @@
       blacksmith = 2,
       brewer = 1,
       builder = 10,
-      burner = 1,
       carrier = 40,
+      charcoal_burner = 1,
       gardener = 1,
       geologist = 4,
       ["lime-burner"] = 1,

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2014-07-14 10:45:44 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2014-08-03 09:56:19 +0000
@@ -64,7 +64,7 @@
    title =_"Build a stonemason and mining infrastructure",
    number = 7,
    body = objective_text(_"Stonemason and Mining Infrastructure",
-      listitem_bullet(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal burner, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
+      listitem_bullet(_[[Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
    ),
 }
 
@@ -185,7 +185,7 @@
    body= saledus(_"Saledus is amazed",
 _([[By the Gods, this is an unbelievable stroke of fortune! ]] ..
 [[There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. ]] ..
-[[We should immediately start to build iron ore and coal mines (or at least charcoal burners), ]] ..
+[[We should immediately start to build iron ore and coal mines (or at least charcoal kilns), ]] ..
 [[smelting works, toolsmithies, armor and weapon smithies.]]) .. paragraphdivider() ..
 _([[However: for all these bigger buildings, we need better and more elegant building materials. ]] ..
 [[So, let’s build a stonemason, who will cut columns from marble.]]) .. paragraphdivider() ..

=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua'
--- campaigns/t02.wmf/scripting/mission_thread.lua	2014-04-26 13:55:11 +0000
+++ campaigns/t02.wmf/scripting/mission_thread.lua	2014-08-03 09:56:19 +0000
@@ -199,14 +199,14 @@
    o.done = true
 
    send_msg(order_msg_17_grindstone)
-   plr:allow_buildings{"lime_kiln", "well", "burners_house"}
+   plr:allow_buildings{"lime_kiln", "well", "charcoal_kiln"}
    o = add_obj(obj_better_material_2)
    -- Wait for the buildings to be build
    while true do
       local rv = plr:get_buildings{"lime_kiln", "well",
-         "coalmine", "deep_coalmine", "burners_house"}
+         "coalmine", "deep_coalmine", "charcoal_kiln"}
       if (#rv.lime_kiln > 0 and #rv.well > 0) and
-         (#rv.coalmine + #rv.deep_coalmine + #rv.burners_house > 0) then
+         (#rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln > 0) then
          break
       end
       sleep(5421)

=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-07-14 10:45:44 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-08-03 09:56:19 +0000
@@ -105,13 +105,13 @@
    name="mission grindstone",
    title=_"Build a lime kiln and coal economy",
    number = 3,
-   body=objective_text(_"Build a lime kiln, a well and a charcoal burner, or a coal mine", _(
+   body=objective_text(_"Build a lime kiln, a well and a charcoal kiln, or a coal mine", _(
 [[Better buildings may also require other improved materials besides blackwood. ]] ..
 [[One of these is grout, which is produced out of raw stone, water and coal by a lime-burner.]]) .. paragraphdivider() ..
 _([[You can obtain water by building a well upon a water source, ]] ..
 [[which your geologists can discover when you send them to any flag that is not on a mountain. ]] ..
-[[Coal can be obtained by building a charcoal burner or a coal mine.]] ..
-      listitem_bullet(_"Build a lime kiln, a well and a charcoal burner, or a coal mine")
+[[Coal can be obtained by building a charcoal kiln or a coal mine.]] ..
+      listitem_bullet(_"Build a lime kiln, a well and a charcoal kiln, or a coal mine")
    ))
 }
 

=== modified file 'campaigns/t02.wmf/scripting/starting_conditions.lua'
--- campaigns/t02.wmf/scripting/starting_conditions.lua	2014-03-15 13:36:42 +0000
+++ campaigns/t02.wmf/scripting/starting_conditions.lua	2014-08-03 09:56:19 +0000
@@ -44,8 +44,8 @@
    blacksmith=2,
    brewer=1,
    builder=10,
-   burner=1,
    carrier=40,
+   charcoal_burner=1,
    gardener=1,
    fisher=1,
    geologist=4,

=== modified file 'campaigns/t03.wmf/scripting/mission_thread.lua'
--- campaigns/t03.wmf/scripting/mission_thread.lua	2014-07-21 14:48:27 +0000
+++ campaigns/t03.wmf/scripting/mission_thread.lua	2014-08-03 09:56:19 +0000
@@ -137,7 +137,7 @@
       "granitemine",
       "smelting_works",
       "metalworks",
-      "burners_house",
+      "charcoal_kiln",
       "micro-brewery",
    }
 
@@ -145,10 +145,10 @@
    sleep(500)
 
    while true do
-      local h = p1:get_buildings{"coalmine","burners_house", "oremine",
+      local h = p1:get_buildings{"coalmine","charcoal_kiln", "oremine",
          "tavern", "smelting_works", "metalworks"}
 
-      if (#h.coalmine + #h.burners_house > 0) and
+      if (#h.coalmine + #h.charcoal_kiln > 0) and
          #h.oremine > 0 and #h.tavern > 0 and #h.smelting_works > 0 and
          #h.metalworks > 0
       then

=== modified file 'campaigns/t03.wmf/scripting/starting_conditions.lua'
--- campaigns/t03.wmf/scripting/starting_conditions.lua	2014-03-15 13:36:42 +0000
+++ campaigns/t03.wmf/scripting/starting_conditions.lua	2014-08-03 09:56:19 +0000
@@ -44,7 +44,7 @@
    blacksmith=2,
    brewer=1,
    builder=10,
-   burner=1,
+   charcoal_burner=1,
    gardener=1,
    fisher=2,
    geologist=4,

=== modified file 'maps/Desert Tournament.wmf/allowed_worker_types'
--- maps/Desert Tournament.wmf/allowed_worker_types	2014-03-15 09:52:23 +0000
+++ maps/Desert Tournament.wmf/allowed_worker_types	2014-08-03 09:56:19 +0000
@@ -8,7 +8,7 @@
 blacksmith="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 gardener="true"
 fisher="true"
@@ -35,7 +35,7 @@
 blacksmith="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 gardener="true"
 fisher="true"
@@ -62,7 +62,7 @@
 blacksmith="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 gardener="true"
 fisher="true"
@@ -89,7 +89,7 @@
 blacksmith="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 gardener="true"
 fisher="true"

=== modified file 'maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2014-06-05 09:53:03 +0000
+++ maps/MP Scenarios/Island Hopping.wmf/scripting/multiplayer_init.lua	2014-08-03 09:56:19 +0000
@@ -206,8 +206,8 @@
             armorsmith = 1,
             blackroot_farmer = 1,
             builder = 10,
-            burner = 1,
             carrier = 40,
+            charcoal_burner = 1,
             fish_breeder = 1,
             geologist = 4,
             miner = 4,

=== modified file 'maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua'
--- maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2014-05-28 09:15:34 +0000
+++ maps/MP Scenarios/Smugglers.wmf/scripting/multiplayer_init.lua	2014-08-03 09:56:19 +0000
@@ -95,8 +95,8 @@
             blacksmith = 2,
             brewer = 1,
             builder = 10,
-            burner = 1,
             carrier = 40,
+            charcoal_burner = 1,
             gardener = 1,
             geologist = 4,
             ["lime-burner"] = 1,

=== modified file 'maps/Plateau.wmf/scripting/initial_conditions.lua'
--- maps/Plateau.wmf/scripting/initial_conditions.lua	2014-03-15 13:36:42 +0000
+++ maps/Plateau.wmf/scripting/initial_conditions.lua	2014-08-03 09:56:19 +0000
@@ -134,7 +134,7 @@
 p3:forbid_buildings("all")
 p3:allow_buildings{
    "lumberjacks_hut",
-   "burners_house",
+   "charcoal_kiln",
    "quarry",
    "rangers_hut",
    "hardener",
@@ -166,7 +166,7 @@
          carrier = 40,
          builder = 4,
          lumberjack = 10,
-         burner = 1,
+         charcoal_burner = 1,
          brewer = 1,
          farmer = 1,
          gardener = 1,

=== modified file 'maps/Swamp Monks.wmf/allowed_worker_types'
--- maps/Swamp Monks.wmf/allowed_worker_types	2010-09-25 12:49:34 +0000
+++ maps/Swamp Monks.wmf/allowed_worker_types	2014-08-03 09:56:19 +0000
@@ -7,7 +7,7 @@
 baker="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 fisher="true"
 geologist="true"
@@ -27,7 +27,7 @@
 baker="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 fisher="true"
 geologist="true"
@@ -47,7 +47,7 @@
 baker="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 fisher="true"
 geologist="true"
@@ -67,7 +67,7 @@
 baker="true"
 brewer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 farmer="true"
 fisher="true"
 geologist="true"

=== modified file 'maps/Together we're strong.wmf/allowed_worker_types'
--- maps/Together we're strong.wmf/allowed_worker_types	2014-03-15 12:26:14 +0000
+++ maps/Together we're strong.wmf/allowed_worker_types	2014-08-03 09:56:19 +0000
@@ -10,7 +10,7 @@
 baker="true"
 blackroot_farmer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 shipwright="true"
 farmer="true"
 fish_breeder="true"
@@ -40,7 +40,7 @@
 baker="true"
 blackroot_farmer="true"
 builder="true"
-burner="true"
+charcoal_burner="true"
 shipwright="true"
 farmer="true"
 fish_breeder="true"

=== modified file 'maps/Trident of Fire.wmf/scripting/initial_conditions.lua'
--- maps/Trident of Fire.wmf/scripting/initial_conditions.lua	2014-03-15 13:36:42 +0000
+++ maps/Trident of Fire.wmf/scripting/initial_conditions.lua	2014-08-03 09:56:19 +0000
@@ -25,7 +25,7 @@
 					 fisher = 1,
 					 baker = 1,
 					 innkeeper = 1,
-					 burner = 1
+					 charcoal_burner = 1
 				},
 				soldiers = {
 					[{0,0,0,0}] = 3,		
@@ -43,9 +43,9 @@
 			 baker = 1,
 			 brewer = 2,
 			 builder = 2,
-			 burner = 1,
 			 carpenter = 1,
 			 carrier = 10,
+			 charcoal_burner = 1,
 			 farmer = 1,
 			 fisher = 1,
 			 forester = 2,
@@ -77,8 +77,8 @@
 				 baker = 1,          
 				 blackroot_farmer = 1,
 				 builder = 2,
-				 burner = 1,
 				 carrier = 10,
+				 charcoal_burner = 1,
 				 farmer = 1,
 				 fisher = 1,
 				 forester = 2,
@@ -206,8 +206,8 @@
 				 armorsmith = 1,
 				 brewer = 1,
 				 builder = 10,
-				 burner = 1,
 				 carrier = 40,
+				 charcoal_burner = 1,
 				 geologist = 4,
 				 lumberjack = 3,
 				 miner = 4,
@@ -276,8 +276,8 @@
 			 armorsmith = 1,
 			 blackroot_farmer = 1,
 			 builder = 10,
-			 burner = 1,
 			 carrier = 40,
+			 charcoal_burner = 1,
 			 fish_breeder = 1,
 			 geologist = 4,
 			 miner = 4,

=== renamed directory 'tribes/atlanteans/burner' => 'tribes/atlanteans/charcoal_burner'
=== renamed directory 'tribes/atlanteans/burners_house' => 'tribes/atlanteans/charcoal_kiln'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_00.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_00.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_00_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_00_pc.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_01.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_01.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_01_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_01_pc.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_02.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_02.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_02_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_02_pc.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_03.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_03.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_03_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_03_pc.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_04.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_04.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_b_04_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_b_04_pc.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_i_00.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_i_00.png'
=== renamed file 'tribes/atlanteans/burners_house/burner_i_00_pc.png' => 'tribes/atlanteans/charcoal_kiln/charcoal_kiln_i_00_pc.png'
=== modified file 'tribes/atlanteans/charcoal_kiln/conf'
--- tribes/atlanteans/burners_house/conf	2014-07-29 09:27:08 +0000
+++ tribes/atlanteans/charcoal_kiln/conf	2014-08-03 09:56:19 +0000
@@ -14,7 +14,7 @@
 stone=2
 
 [working positions]
-burner=1
+charcoal_burner=1
 
 [inputs]
 log=8
@@ -31,9 +31,9 @@
 produce=coal
 
 [idle]
-pics=burner_i_??.png
+pics=charcoal_kiln_i_??.png
 hotspot=47 57
 
 [working]
-pics=burner_b_??.png
+pics=charcoal_kiln_b_??.png
 hotspot=47 60

=== modified file 'tribes/atlanteans/charcoal_kiln/help.lua'
--- tribes/atlanteans/burners_house/help.lua	2014-07-25 12:19:33 +0000
+++ tribes/atlanteans/charcoal_kiln/help.lua	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
--- The Atlantean Charcoal Burner's House
+-- The Atlantean Charcoal Kiln
 
 include "scripting/formatting.lua"
 include "tribes/scripting/format_help.lua"

=== modified file 'tribes/atlanteans/coal/conf'
--- tribes/atlanteans/coal/conf	2014-07-28 14:04:36 +0000
+++ tribes/atlanteans/coal/conf	2014-08-03 09:56:19 +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 burner.
+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.
 
 default_target_quantity=20
 preciousness=1

=== modified file 'tribes/atlanteans/conf'
--- tribes/atlanteans/conf	2014-07-12 14:20:51 +0000
+++ tribes/atlanteans/conf	2014-08-03 09:56:19 +0000
@@ -12,7 +12,7 @@
 # Entries in the columns separated by ,
 wares_order=stone, log, planks, spideryarn, spidercloth; fish, smoked_fish, meat, smoked_meat, water, corn, cornflour, blackroot, blackrootflour, bread; quartz, diamond, coal, ironore, iron, goldore, gold; pick, saw, shovel, hammer, milking_tongs, fishing_net, bucket, hunting_bow, hook_pole, scythe, bread_paddle, fire_tongs; light_trident, long_trident, steel_trident, double_trident, heavy_double_trident,steel_shield, advanced_shield, tabard, goldyarn, golden_tabard
 
-workers_order=carrier, horse, horsebreeder; stonecutter, woodcutter, sawyer, forester, builder, spiderbreeder, weaver, shipwright; fisher, fish_breeder, hunter, smoker, farmer, blackroot_farmer, miller, baker; geologist, miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
+workers_order=carrier, horse, horsebreeder; stonecutter, woodcutter, sawyer, forester, builder, spiderbreeder, weaver, shipwright; fisher, fish_breeder, hunter, smoker, farmer, blackroot_farmer, miller, baker; geologist, miner, charcoal_burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
 
 # Some blue fires would be fine, but just an idea
 [frontier]
@@ -108,7 +108,7 @@
 baker=_Baker
 blackroot_farmer=_Blackroot Farmer
 builder=_Builder
-burner=_Burner
+charcoal_burner=_Charcoal Burner
 shipwright=_Shipwright
 farmer=_Farmer
 fish_breeder=_Fish Breeder
@@ -174,7 +174,7 @@
 mill=_Mill
 shipyard=_Shipyard
 bakery=_Bakery
-burners_house=_Charcoal Burner’s House
+charcoal_kiln=_Charcoal Kiln
 smelting_works=_Smelting Works
 toolsmithy=_Toolsmithy
 weaponsmithy=_Weapon Smithy

=== modified file 'tribes/atlanteans/log/conf'
--- tribes/atlanteans/log/conf	2014-07-28 14:04:36 +0000
+++ tribes/atlanteans/log/conf	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
-help=_Logs are the base for planks, which are used in nearly every building of the Atlanteans. Besides the sawmill, the charcoal burner, the toolsmithy and the smokery also need logs for their work.
+help=_Logs are the base for planks, which are used in nearly every building of the Atlanteans. Besides the sawmill, the charcoal kiln, the toolsmithy and the smokery also need logs for their work.
 
 default_target_quantity=40
 preciousness=14

=== modified file 'tribes/atlanteans/scripting/sc00_headquarters.lua'
--- tribes/atlanteans/scripting/sc00_headquarters.lua	2014-07-28 18:58:40 +0000
+++ tribes/atlanteans/scripting/sc00_headquarters.lua	2014-08-03 09:56:19 +0000
@@ -60,7 +60,7 @@
          armorsmith = 1,
          blackroot_farmer = 1,
          builder = 10,
-         burner = 1,
+         charcoal_burner = 1,
          carrier = 40,
          fish_breeder = 1,
          geologist = 4,

=== modified file 'tribes/atlanteans/scripting/sc01_fortified_village.lua'
--- tribes/atlanteans/scripting/sc01_fortified_village.lua	2014-07-28 18:58:40 +0000
+++ tribes/atlanteans/scripting/sc01_fortified_village.lua	2014-08-03 09:56:19 +0000
@@ -57,7 +57,7 @@
          workers = {
             blackroot_farmer = 1,
             builder = 10,
-            burner = 1,
+            charcoal_burner = 1,
             carrier = 38,
             fish_breeder = 1,
             geologist = 4,

=== renamed directory 'tribes/barbarians/burner' => 'tribes/barbarians/charcoal_burner'
=== renamed directory 'tribes/barbarians/burners_house' => 'tribes/barbarians/charcoal_kiln'
=== renamed file 'tribes/barbarians/burners_house/burners_house_i_00.png' => 'tribes/barbarians/charcoal_kiln/charcoal_kiln_i_00.png'
=== modified file 'tribes/barbarians/charcoal_kiln/conf'
--- tribes/barbarians/burners_house/conf	2014-07-29 09:27:08 +0000
+++ tribes/barbarians/charcoal_kiln/conf	2014-08-03 09:56:19 +0000
@@ -14,7 +14,7 @@
 grout=1
 
 [working positions]
-burner=1
+charcoal_burner=1
 
 [inputs]
 log=8
@@ -31,9 +31,9 @@
 produce=coal
 
 [idle]
-pics=burners_house_i_??.png  # ???
+pics=charcoal_kiln_i_??.png  # ???
 hotspot=47 54
 
 [working]
-pics=burners_house_i_??.png  # ???
+pics=charcoal_kiln_i_??.png  # ???
 hotspot=47 54

=== modified file 'tribes/barbarians/charcoal_kiln/help.lua'
--- tribes/barbarians/burners_house/help.lua	2014-07-25 12:19:33 +0000
+++ tribes/barbarians/charcoal_kiln/help.lua	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
--- The Barbarian Charcoal Burner's House
+-- The Barbarian Charcoal Kiln
 
 include "scripting/formatting.lua"
 include "tribes/scripting/format_help.lua"

=== modified file 'tribes/barbarians/coal/conf'
--- tribes/barbarians/coal/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/coal/conf	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
-help=_The fires of the barbarians are usually fed with coal. It is produced in coal mines or out of logs in a charcoal burner’s house. Consumers are several buildings: lime kiln, smelting works, axfactory, war mill, and helm smithy.
+help=_The fires of the barbarians are usually fed with coal. It is produced in coal mines or out of logs in a charcoal kiln. Consumers are several buildings: lime kiln, smelting works, axfactory, war mill, and helm smithy.
 
 default_target_quantity=20
 preciousness=1

=== modified file 'tribes/barbarians/conf'
--- tribes/barbarians/conf	2014-07-18 20:08:26 +0000
+++ tribes/barbarians/conf	2014-08-03 09:56:19 +0000
@@ -12,7 +12,7 @@
 # Entries in the columns separated by ,
 wares_order= raw_stone,log, blackwood, grout, thatchreed, cloth; fish, meat, water, wheat, pittabread, beer, strongbeer, ration, snack, meal; coal, ironore, iron, goldore, gold; pick, felling_ax, shovel, hammer, fishing_rod, hunting_spear, scythe, bread_paddle, kitchen_tools, fire_tongs; ax, sharpax, broadax, bronzeax, battleax, warriorsax, helm , mask , warhelm
 
-workers_order=carrier, ox, cattlebreeder; stonemason, lumberjack, ranger, builder, lime-burner, gardener, weaver, shipwright; fisher , hunter , gamekeeper, farmer, baker, brewer, master-brewer, innkeeper; geologist,miner, chief-miner, master-miner, burner, smelter; blacksmith, master-blacksmith; soldier, trainer, helmsmith, scout
+workers_order=carrier, ox, cattlebreeder; stonemason, lumberjack, ranger, builder, lime-burner, gardener, weaver, shipwright; fisher , hunter , gamekeeper, farmer, baker, brewer, master-brewer, innkeeper; geologist,miner, chief-miner, master-miner, charcoal_burner, smelter; blacksmith, master-blacksmith; soldier, trainer, helmsmith, scout
 
 
 [frontier]
@@ -105,7 +105,7 @@
 master-brewer=_Master Brewer
 brewer=_Brewer
 builder=_Builder
-burner=_Burner
+charcoal_burner=_Charcoal Burner
 master-miner=_Master Miner
 chief-miner=_Chief Miner
 farmer=_Farmer
@@ -176,7 +176,7 @@
 big_inn=_Big Inn
 inn=_Inn
 tavern=_Tavern
-burners_house=_Charcoal Burner’s House
+charcoal_kiln=_Charcoal Kiln
 smelting_works=_Smelting Works
 shipyard=_Shipyard
 warmill=_War Mill

=== modified file 'tribes/barbarians/log/conf'
--- tribes/barbarians/log/conf	2014-07-28 14:04:36 +0000
+++ tribes/barbarians/log/conf	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
-help=_Logs are a principal building material of the barbarians. The trees are felled by lumberjacks; rangers care for the supply of trees. Logs are also used in the metal workshop to build basic tools, and in the charcoal burner’s house in the production of coal. The wood hardener refines logs by hardening them in the fire which gives blackwood.
+help=_Logs are a principal building material of the barbarians. The trees are felled by lumberjacks; rangers care for the supply of trees. Logs are also used in the metal workshop to build basic tools, and in the charcoal kiln for the production of coal. The wood hardener refines logs by hardening them in the fire which gives blackwood.
 
 default_target_quantity=40
 preciousness=14

=== modified file 'tribes/barbarians/scripting/sc00_headquarters.lua'
--- tribes/barbarians/scripting/sc00_headquarters.lua	2014-07-28 18:58:40 +0000
+++ tribes/barbarians/scripting/sc00_headquarters.lua	2014-08-03 09:56:19 +0000
@@ -51,7 +51,7 @@
          blacksmith = 2,
          brewer = 1,
          builder = 10,
-         burner = 1,
+         charcoal_burner = 1,
          carrier = 40,
          gardener = 1,
          geologist = 4,

=== modified file 'tribes/barbarians/scripting/sc01_fortified_village.lua'
--- tribes/barbarians/scripting/sc01_fortified_village.lua	2014-07-28 18:58:40 +0000
+++ tribes/barbarians/scripting/sc01_fortified_village.lua	2014-08-03 09:56:19 +0000
@@ -50,7 +50,7 @@
          workers = {
             brewer = 1,
             builder = 10,
-            burner = 1,
+            charcoal_burner = 1,
             carrier = 38,
             gardener = 1,
             geologist = 4,

=== renamed directory 'tribes/empire/burner' => 'tribes/empire/charcoal_burner'
=== renamed directory 'tribes/empire/burners_house' => 'tribes/empire/charcoal_kiln'
=== renamed file 'tribes/empire/burners_house/burners_house_i_00.png' => 'tribes/empire/charcoal_kiln/charcoal_kiln_i_00.png'
=== modified file 'tribes/empire/charcoal_kiln/conf'
--- tribes/empire/burners_house/conf	2014-07-29 09:27:08 +0000
+++ tribes/empire/charcoal_kiln/conf	2014-08-03 09:56:19 +0000
@@ -15,7 +15,7 @@
 marble=1
 
 [working positions]
-burner=1
+charcoal_burner=1
 
 [inputs]
 log=8
@@ -32,9 +32,9 @@
 produce=coal
 
 [idle]
-pics=burners_house_i_??.png  # ???
+pics=charcoal_kiln_i_??.png  # ???
 hotspot=51 48
 
 [working]
-pics=burners_house_i_??.png  # ???
+pics=charcoal_kiln_i_??.png  # ???
 hotspot=51 48

=== modified file 'tribes/empire/charcoal_kiln/help.lua'
--- tribes/empire/burners_house/help.lua	2014-07-25 12:19:33 +0000
+++ tribes/empire/charcoal_kiln/help.lua	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
--- The Imperial Charcoal Burner's House
+-- The Imperial Charcoal Kiln
 
 include "scripting/formatting.lua"
 include "tribes/scripting/format_help.lua"

=== modified file 'tribes/empire/coal/conf'
--- tribes/empire/coal/conf	2014-07-28 14:04:36 +0000
+++ tribes/empire/coal/conf	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
-help=_The fires of the Empire smelting works, armor smithies and weapon smithies are usually fed with coal. It is mined in coal mines or produced by a charcoal burner out of logs.
+help=_The fires of the Empire smelting works, armor smithies and weapon smithies are usually fed with coal. It is mined in coal mines or produced by a charcoal kiln out of logs.
 
 default_target_quantity=20
 preciousness=1

=== modified file 'tribes/empire/conf'
--- tribes/empire/conf	2014-07-17 15:26:32 +0000
+++ tribes/empire/conf	2014-08-03 09:56:19 +0000
@@ -12,7 +12,7 @@
 # Entries in the columns separated by ,
 wares_order=stone, log, wood, wool,cloth;   fish,meat, water, wheat, flour, bread, beer, grape, wine, ration, meal;  marble, marblecolumn, coal, ironore, iron, goldore, gold;    pick, ax, saw, shovel, hammer, fishing_rod, hunting_spear, scythe, bread_paddle, basket, kitchen_tools, fire_tongs;   wood_lance, lance, advanced_lance, heavy_lance, war_lance, helm, armor, chain_armor, plate_armor
 
-workers_order=carrier, donkey, donkeybreeder;   stonemason, carpenter, lumberjack, forester, builder, shepherd, weaver, shipwright; fisher, hunter, farmer, miller, baker, brewer, pig-breeder, vinefarmer, innkeeper; geologist, miner, master-miner, burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
+workers_order=carrier, donkey, donkeybreeder;   stonemason, carpenter, lumberjack, forester, builder, shepherd, weaver, shipwright; fisher, hunter, farmer, miller, baker, brewer, pig-breeder, vinefarmer, innkeeper; geologist, miner, master-miner, charcoal_burner, smelter; toolsmith; soldier, trainer, weaponsmith, armorsmith, scout
 
 # No idea for the frontier. Maybe some javelins?
 [frontier]
@@ -107,7 +107,7 @@
 baker=_Baker
 brewer=_Brewer
 builder=_Builder
-burner=_Burner
+charcoal_burner=_Charcoal Burner
 carpenter=_Carpenter
 farmer=_Farmer
 fisher=_Fisher
@@ -177,7 +177,7 @@
 winery=_Winery
 inn=_Inn
 tavern=_Tavern
-burners_house=_Charcoal Burner
+charcoal_kiln=_Charcoal Kiln
 smelting_works=_Smelting Works
 shipyard=_Shipyard
 toolsmithy=_Toolsmithy

=== modified file 'tribes/empire/log/conf'
--- tribes/empire/log/conf	2014-07-28 14:04:36 +0000
+++ tribes/empire/log/conf	2014-08-03 09:56:19 +0000
@@ -1,4 +1,4 @@
-help=_Logs are an important building material for the Empire. The lumberjacks fell the trees; foresters care for the supply of trees. Logs are also used by the charcoal burner, the toolsmithy and the sawmill.
+help=_Logs are an important building material for the Empire. The lumberjacks fell the trees; foresters care for the supply of trees. Logs are also used by the charcoal kiln, the toolsmithy and the sawmill.
 
 default_target_quantity=40
 preciousness=14

=== modified file 'tribes/empire/scripting/sc00_headquarters.lua'
--- tribes/empire/scripting/sc00_headquarters.lua	2014-07-28 18:58:40 +0000
+++ tribes/empire/scripting/sc00_headquarters.lua	2014-08-03 09:56:19 +0000
@@ -60,8 +60,8 @@
          armorsmith = 1,
          brewer = 1,
          builder = 10,
-         burner = 1,
          carrier = 40,
+         charcoal_burner = 1,
          geologist = 4,
          lumberjack = 3,
          miner = 4,

=== modified file 'tribes/empire/scripting/sc01_fortified_village.lua'
--- tribes/empire/scripting/sc01_fortified_village.lua	2014-07-28 18:58:40 +0000
+++ tribes/empire/scripting/sc01_fortified_village.lua	2014-08-03 09:56:19 +0000
@@ -57,8 +57,8 @@
          workers = {
             brewer = 1,
             builder = 10,
-            burner = 1,
             carrier = 39,
+            charcoal_burner = 1,
             geologist = 4,
             lumberjack = 3,
             miner = 4,