widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02511
Re: [Merge] lp:~widelands-dev/widelands/furnace into lp:widelands
Review: Needs Fixing
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.
Diff comments:
> === 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-07-26 15:33:33 +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/texts.lua'
> --- campaigns/emp02.wmf/scripting/texts.lua 2014-07-14 10:45:44 +0000
> +++ campaigns/emp02.wmf/scripting/texts.lua 2014-07-26 15:33:33 +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-07-26 15:33:33 +0000
> @@ -199,14 +199,16 @@
> 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
> + -- TODO(codereview): This is dynamic enough that since I've passed in the building name as a parameter (building to look up),
> + -- I get that as member of the object returned to look up things? Otherwise I would need some pointers on how to create this method.
> 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-07-26 15:33:33 +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/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-07-26 15:33:33 +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 '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-07-26 15:33:33 +0000
> @@ -134,7 +134,7 @@
> p3:forbid_buildings("all")
> p3:allow_buildings{
> "lumberjacks_hut",
> - "burners_house",
> + "charcoal_kiln",
> "quarry",
> "rangers_hut",
> "hardener",
>
> === 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-14 10:45:44 +0000
> +++ tribes/atlanteans/charcoal_kiln/conf 2014-07-26 15:33:33 +0000
> @@ -14,7 +14,7 @@
> stone=2
>
> [working positions]
> -burner=1
> +charcoal_burner=1
>
> [inputs]
> log=8
> @@ -30,9 +30,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-07-26 15:33:33 +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-03-16 20:55:15 +0000
> +++ tribes/atlanteans/coal/conf 2014-07-26 15:33:33 +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.
>
> preciousness=1
> default_target_quantity=20
>
> === modified file 'tribes/atlanteans/conf'
> --- tribes/atlanteans/conf 2014-07-12 14:20:51 +0000
> +++ tribes/atlanteans/conf 2014-07-26 15:33:33 +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-03-15 11:54:07 +0000
> +++ tribes/atlanteans/log/conf 2014-07-26 15:33:33 +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.
>
>
> preciousness=14
>
> === modified file 'tribes/atlanteans/scripting/sc00_headquarters.lua'
> --- tribes/atlanteans/scripting/sc00_headquarters.lua 2014-07-17 15:26:32 +0000
> +++ tribes/atlanteans/scripting/sc00_headquarters.lua 2014-07-26 15:33:33 +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-17 15:26:32 +0000
> +++ tribes/atlanteans/scripting/sc01_fortified_village.lua 2014-07-26 15:33:33 +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-15 10:02:22 +0000
> +++ tribes/barbarians/charcoal_kiln/conf 2014-07-26 15:33:33 +0000
> @@ -14,7 +14,7 @@
> grout=1
>
> [working positions]
> -burner=1
> +charcoal_burner=1
>
> [inputs]
> log=8
> @@ -30,9 +30,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-07-26 15:33:33 +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-03-16 20:55:15 +0000
> +++ tribes/barbarians/coal/conf 2014-07-26 15:33:33 +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
>
> === modified file 'tribes/barbarians/coalmine/help.lua'
> --- tribes/barbarians/coalmine/help.lua 2014-07-25 12:19:33 +0000
> +++ tribes/barbarians/coalmine/help.lua 2014-07-26 15:33:33 +0000
> @@ -10,7 +10,7 @@
> return
>
> --Lore Section
> - building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
> + building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their kilns. <br>
This actually needs to be "furnace", because it's referring both to the smelting works and the lime kiln here (coal consumers).
> Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]]) ..
>
> --General Section
>
> === modified file 'tribes/barbarians/conf'
> --- tribes/barbarians/conf 2014-07-18 20:08:26 +0000
> +++ tribes/barbarians/conf 2014-07-26 15:33:33 +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/deep_coalmine/help.lua'
> --- tribes/barbarians/deep_coalmine/help.lua 2014-07-25 12:19:33 +0000
> +++ tribes/barbarians/deep_coalmine/help.lua 2014-07-26 15:33:33 +0000
> @@ -11,7 +11,7 @@
>
> --Lore Section
> --text identical to coalmine
> - building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
> + building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their kilns. <br>
Dito - keep "furnace", and with all the other coal mine versions below as well.
> Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]]) ..
>
> --General Section
>
> === modified file 'tribes/barbarians/deeper_coalmine/help.lua'
> --- tribes/barbarians/deeper_coalmine/help.lua 2014-07-25 12:19:33 +0000
> +++ tribes/barbarians/deeper_coalmine/help.lua 2014-07-26 15:33:33 +0000
> @@ -11,7 +11,7 @@
>
> --Lore Section
> --text identical to coalmine
> - building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their furnaces. <br>
> + building_help_lore_string("barbarians", building_description, _[[Ages ago, the Barbarians learned to delve into mountainsides for that black material that feeds their kilns. <br>
furnace
> Wood may serve for a household fire and to keep you warm, but when it comes to working with iron or gold, there is no way around coal.]]) ..
>
> --General Section
>
> === modified file 'tribes/barbarians/log/conf'
> --- tribes/barbarians/log/conf 2014-03-15 11:54:07 +0000
> +++ tribes/barbarians/log/conf 2014-07-26 15:33:33 +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 in the production of coal. The wood hardener refines logs by hardening them in the fire which gives blackwood.
think "... in the charcoal kiln for the production of coal ..." would sound better here
>
>
> preciousness=14
>
> === modified file 'tribes/barbarians/scripting/sc00_headquarters.lua'
> --- tribes/barbarians/scripting/sc00_headquarters.lua 2014-07-17 15:26:32 +0000
> +++ tribes/barbarians/scripting/sc00_headquarters.lua 2014-07-26 15:33:33 +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-17 15:26:32 +0000
> +++ tribes/barbarians/scripting/sc01_fortified_village.lua 2014-07-26 15:33:33 +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-15 10:02:22 +0000
> +++ tribes/empire/charcoal_kiln/conf 2014-07-26 15:33:33 +0000
> @@ -15,7 +15,7 @@
> marble=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=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-07-26 15:33:33 +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-03-16 20:55:15 +0000
> +++ tribes/empire/coal/conf 2014-07-26 15:33:33 +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=25
> preciousness=1
>
> === modified file 'tribes/empire/conf'
> --- tribes/empire/conf 2014-07-17 15:26:32 +0000
> +++ tribes/empire/conf 2014-07-26 15:33:33 +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-03-15 11:54:07 +0000
> +++ tribes/empire/log/conf 2014-07-26 15:33:33 +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.
>
>
> preciousness=14
>
> === modified file 'tribes/empire/scripting/sc00_headquarters.lua'
> --- tribes/empire/scripting/sc00_headquarters.lua 2014-07-17 15:26:32 +0000
> +++ tribes/empire/scripting/sc00_headquarters.lua 2014-07-26 15:33:33 +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-17 15:26:32 +0000
> +++ tribes/empire/scripting/sc01_fortified_village.lua 2014-07-26 15:33:33 +0000
> @@ -57,8 +57,8 @@
> workers = {
> brewer = 1,
> builder = 10,
> - burner = 1,
> carrier = 39,
> + charcoal_burner = 1,
> geologist = 4,
> lumberjack = 3,
> miner = 4,
>
--
https://code.launchpad.net/~widelands-dev/widelands/furnace/+merge/227810
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/furnace.
References
