Merge lp:~widelands-dev/widelands/bug-1344179 into lp:widelands

[wl-zocker]

I changed the return=skipped conditions for almost all buildings. The buildings now only produce when their output is really needed (until now, they also produced when there was enough input in the economy, even when the output was not needed).
I increased the default_target_quantities of many wares to avoid running out of them. I changed them as I thought they might be ok, I did not test them in-game.
I also did some clean-ups and reodering in the conf files. I noticed that this was maybe not so clever ...

Some things I want to point out:
- The Atlantean mill and the smokery have two programs independant of the other. I added a "when site has" statement to the smokery - the mill already had it.
- Since blackroots and grapes cannot be used for anything else, the mill or the winery always consume them.
- I added a "default_target_quantity=" to all wares for easier grepping, even when it has no influence in the game (affects basic products, e.g. wheat or water).
- The crystal mine and the marble mine check if any of their output is needed before they work, even when the output cannot be created in the current program. This is to avoid "lucky digging" (I only need marble -> my mine finds more marble than normal).

Is it possible to add codecheck rules for the conf files? It would be nice if they always had the same order.

[GunChleoc (gunchleoc)]

We are planning to turn the conf files into Lua files anyway (just like with one_world), so I don't think bothering with a code check rule right now makes sense.

[GunChleoc (gunchleoc)]

Added 3 questions/comments to the diff

[wl-zocker (wl-zocker)]

> We are planning to turn the conf files into Lua files anyway (just like with one_world), so I don't think bothering with a code check rule right now makes sense.

So I have to understand that lua stuff (sigh). Codecheck rules for lua might then be introduced.
For more, see my three diff comments.

[GunChleoc (gunchleoc)]

You won't really have to lean Lua for that - if you have a look at the world init.lua files, they are just structured lists like the conf files are, with no complicated programming in them.

Lua will allow me to do some really cool stuff for the translations though, like using place holders and proper plural formss :)

[wl-zocker (wl-zocker)]

I am looking forward to the new possibilities you will exhaust. You already did quite a lot - I saw you had another branch with the production program.

So, let's see what other reviewers think.

[SirVer (sirver)]

The Lua files for the world turned out easier than the conf files. I assume it will be the same for the conf files, so do not despair :). there will not be much logic in the tribes config files either.

A style checker for Lua would be really nice to have. We can enhance the c++ one to work over Lua files too - regular expression rules should be possible and useful. However, since the Lua files are not mentioned in the CMakeFiles we can not make it run like the cpp checker on each change.

Otherwise: lgtm. Thanks for taking care of this.

review: Approve

=== modified file 'tribes/atlanteans/advanced_shield/conf'
--- tribes/atlanteans/advanced_shield/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/advanced_shield/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_These advanced shields are used by the best soldiers of the Atlanteans. They are produced in the armor smithy and used in the labyrinth – together with food – to train soldiers from Defense level 1 to level 2.
 
+default_target_quantity=1
 preciousness=1
 
 # A golden shield with the sign of the Atlanteans

=== modified file 'tribes/atlanteans/blackroot/conf'
--- tribes/atlanteans/blackroot/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/blackroot/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,8 @@
 help=_Blackroots are a special kind of root produced in blackroot farms and processed in mills. The Atlanteans like their strong taste and use their flour for making bread.
 
+default_target_quantity=20 # currently not used
 preciousness=10
 
-# No description yet
-
 [idle]
 pics=idle.png
 hotspot=9 15

=== modified file 'tribes/atlanteans/blackroot_farm/conf'
--- tribes/atlanteans/blackroot_farm/conf	2014-07-22 12:29:17 +0000
+++ tribes/atlanteans/blackroot_farm/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=big
 output=blackroot
 
+[aihints]
+space_consumer=true
+build_material=false
+
 [buildcost]
 planks=3
 stone=2
@@ -11,10 +15,6 @@
 stone=2
 log=1
 
-[aihints]
-space_consumer=true
-build_material=false
-
 [working positions]
 blackroot_farmer=1
 

=== modified file 'tribes/atlanteans/blackrootflour/conf'
--- tribes/atlanteans/blackrootflour/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/blackrootflour/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Blackroot Flour is produced in mills out of blackroots. It is used in bakeries to make a tasty bread.
 
-
+default_target_quantity=15
 preciousness=2
 
 [idle]

=== modified file 'tribes/atlanteans/bread/conf'
--- tribes/atlanteans/bread/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/bread/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_This tasty bread is made in bakeries out of cornflour, blackroot flour and water. It is appreciated as basic food for miners, scouts and soldiers in training sites (labyrinth and dungeon).
 
+default_target_quantity=20
 preciousness=2
-default_target_quantity=20
 
 # No description yet
 [idle]

=== modified file 'tribes/atlanteans/bread_paddle/conf'
--- tribes/atlanteans/bread_paddle/conf	2014-03-15 11:54:07 +0000
+++ tribes/atlanteans/bread_paddle/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 6

=== modified file 'tribes/atlanteans/bucket/conf'
--- tribes/atlanteans/bucket/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/bucket/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Big buckets for the fish breeder – produced by the toolsmith.
 
+default_target_quantity=2
+
 # Two big buckets
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/burners_house/conf'
--- tribes/atlanteans/burners_house/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/burners_house/conf	2014-07-28 14:34:07 +0000
@@ -24,7 +24,7 @@
 
 [work]
 sleep=30000
-return=skipped unless economy needs coal or not economy needs log
+return=skipped unless economy needs coal
 consume=log:6
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== modified file 'tribes/atlanteans/castle/conf'
--- tribes/atlanteans/castle/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/castle/conf	2014-07-28 14:34:07 +0000
@@ -9,6 +9,11 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the castle.
 defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
+
 [buildcost]
 planks=4
 stone=7
@@ -25,9 +30,3 @@
 [idle]
 pics=castle_i_??.png
 hotspot=91 91
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true
-

=== modified file 'tribes/atlanteans/coal/conf'
--- tribes/atlanteans/coal/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/coal/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 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.
 
+default_target_quantity=20
 preciousness=1
-default_target_quantity=20
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/coalmine/conf'
--- tribes/atlanteans/coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/coalmine/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=mine
 output=coal
 
+[aihints]
+mines=coal
+
 [buildcost]
 log=7
 planks=4
@@ -13,9 +16,6 @@
 [working positions]
 miner=3
 
-[aihints]
-mines=coal
-
 [inputs]
 bread=10
 smoked_fish=10
@@ -26,8 +26,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs coal or not economy needs bread
-return=skipped unless economy needs coal or not economy needs smoked_fish
+return=skipped unless economy needs coal
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
 mine=coal 4 100 5 2
@@ -40,7 +39,7 @@
 produce=coal:3
 
 [out_of_resource_notification]
-title=_Main Coal Vein Exhausted.
+title=_Main Coal Vein Exhausted
 message=_This coal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
 
 [idle]

=== modified file 'tribes/atlanteans/corn/conf'
--- tribes/atlanteans/corn/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/corn/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,7 @@
 help=_This corn is processed in the mill into fine cornflour that every Atlantean baker needs for a good bread. Also horse and spider farms need to be provided with corn.
 
-
-
+default_target_quantity=25 # currently not used
 preciousness=12
-default_target_quantity=25
 
 # Simply corn
 [idle]

=== modified file 'tribes/atlanteans/cornflour/conf'
--- tribes/atlanteans/cornflour/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/cornflour/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Cornflour is produced in a mill out of corn and is one of three parts of the Atlantean bread produced in bakeries.
 
+default_target_quantity=15
 preciousness=2
 
 [idle]

=== modified file 'tribes/atlanteans/crystalmine/conf'
--- tribes/atlanteans/crystalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/crystalmine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 output=quartz
 output=stone
 
+[aihints]
+mines=granite
+
 [buildcost]
 log=7
 planks=4
@@ -15,9 +18,6 @@
 [working positions]
 miner=3
 
-[aihints]
-mines=granite
-
 [inputs]
 bread=10
 smoked_fish=10
@@ -30,8 +30,7 @@
 work=_Work
 
 [mine_stone]
-return=skipped unless economy needs stone or not economy needs bread
-return=skipped unless economy needs stone or not economy needs smoked_fish
+return=skipped unless economy needs stone or economy needs quartz or economy needs diamond
 sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
@@ -48,8 +47,7 @@
 produce=quartz
 
 [mine_quartz]
-return=skipped unless economy needs quartz or not economy needs bread
-return=skipped unless economy needs quartz or not economy needs smoked_fish
+return=skipped unless economy needs stone or economy needs quartz or economy needs diamond
 sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
@@ -63,8 +61,7 @@
 produce=quartz:2
 
 [mine_diamond]
-return=skipped unless economy needs diamond or not economy needs bread
-return=skipped unless economy needs diamond or not economy needs smoked_fish
+return=skipped unless economy needs stone or economy needs quartz or economy needs diamond
 sleep=45000
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
@@ -84,7 +81,7 @@
 return=skipped
 
 [out_of_resource_notification]
-title=_Main Crystal Vein Exhausted.
+title=_Main Crystal Vein Exhausted
 message=_This crystal mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
 
 [idle]

=== modified file 'tribes/atlanteans/diamond/conf'
--- tribes/atlanteans/diamond/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/diamond/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,8 @@
 help=_These wonderful diamonds are used to build some exclusive buildings. They are mined in a crystal mine.
 
+default_target_quantity=5
 preciousness=2
 
-# No description yet
 [idle]
 pics=idle.png
 hotspot=4 7

=== modified file 'tribes/atlanteans/double_trident/conf'
--- tribes/atlanteans/double_trident/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/double_trident/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_The double trident is one of the best tridents produced by the Atlantean weapon smithy. It is used in a dungeon – together with food – to train soldiers from attack level 2 to level 3.
 
-
+default_target_quantity=1
 preciousness=1
 
 # A simple double trident

=== modified file 'tribes/atlanteans/farm/conf'
--- tribes/atlanteans/farm/conf	2014-07-22 12:29:17 +0000
+++ tribes/atlanteans/farm/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,11 @@
 size=big
 output=corn
 
+[aihints]
+space_consumer=true
+is_basic=true # farm needs spidercloth to be build and spidercloth needs
+              # corn for production -> farm should be build ASAP!
+
 [buildcost]
 log=3
 stone=2
@@ -15,11 +20,6 @@
 [working positions]
 farmer=1
 
-[aihints]
-space_consumer=true
-is_basic=true # farm needs spidercloth to be build and spidercloth needs
-              # corn for production -> farm should be build ASAP!
-
 [programs]
 plant_corn=_Plant corn
 harvest_corn=_Harvest corn

=== modified file 'tribes/atlanteans/fire_tongs/conf'
--- tribes/atlanteans/fire_tongs/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/fire_tongs/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Fire tongs are tools of the smelter, who works in the smelting works. They are produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=5 5

=== modified file 'tribes/atlanteans/fish/conf'
--- tribes/atlanteans/fish/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/fish/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Fish is one of the biggest food resources of the Atlanteans. It has to be smoked in a smokery before being delivered to mines, training sites and scouts.
- 
+
+default_target_quantity=20 # currently not used
 preciousness=4
 
 [idle]

=== modified file 'tribes/atlanteans/fish_breeders_house/conf'
--- tribes/atlanteans/fish_breeders_house/conf	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/fish_breeders_house/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,10 @@
 size=small
 
+[aihints]
+build_material=false
+needs_water=true
+renews_map_resource=fish
+
 [buildcost]
 log=1
 planks=1
@@ -11,11 +16,6 @@
 [working positions]
 fish_breeder=1
 
-[aihints]
-build_material=false
-needs_water=true
-renews_map_resource=fish
-
 [programs]
 work=_Work
 

=== modified file 'tribes/atlanteans/fishers_house/conf'
--- tribes/atlanteans/fishers_house/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/fishers_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=fish
 
+[aihints]
+build_material=false
+needs_water=true
+
 [buildcost]
 log=1
 planks=2
@@ -11,10 +15,6 @@
 [working positions]
 fisher=1
 
-[aihints]
-build_material=false
-needs_water=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/atlanteans/fishing_net/conf'
--- tribes/atlanteans/fishing_net/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/fishing_net/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The fishing net is used by the fisher and produced by the toolsmith.
 
+default_target_quantity=2
+
 # A simple fishing net
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/foresters_house/conf'
--- tribes/atlanteans/foresters_house/conf	2014-05-27 14:14:14 +0000
+++ tribes/atlanteans/foresters_house/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,9 @@
 size=small
 
+[aihints]
+space_consumer=true
+renews_map_resource=log
+
 [buildcost]
 log=1
 planks=1
@@ -12,10 +16,6 @@
 [working positions]
 forester=1
 
-[aihints]
-space_consumer=true
-renews_map_resource=log
-
 [programs]
 work=_Work
 

=== modified file 'tribes/atlanteans/gold/conf'
--- tribes/atlanteans/gold/conf	2014-07-12 14:20:51 +0000
+++ tribes/atlanteans/gold/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 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.
 
-
+default_target_quantity=20
 preciousness=2
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/golden_tabard/conf'
--- tribes/atlanteans/golden_tabard/conf	2014-04-08 06:28:45 +0000
+++ tribes/atlanteans/golden_tabard/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Golden tabards are produced in Atlantean weaving mills out of gold yarn. They are used in the labyrinth – together with food – to train soldiers from health level 0 to level 1.
 
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/atlanteans/goldmine/conf'
--- tribes/atlanteans/goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/goldmine/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=mine
 output=goldore
 
+[aihints]
+build_material=false
+mines=gold
+
 [buildcost]
 log=7
 planks=4
@@ -13,10 +17,6 @@
 [working positions]
 miner=3
 
-[aihints]
-build_material=false
-mines=gold
-
 [inputs]
 bread=10
 smoked_fish=10
@@ -27,8 +27,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs goldore or not economy needs bread
-return=skipped unless economy needs goldore or not economy needs smoked_fish
+return=skipped unless economy needs goldore
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
 mine=gold 4 100 5 2
@@ -41,7 +40,7 @@
 produce=goldore
 
 [out_of_resource_notification]
-title=_Main Gold Vein Exhausted.
+title=_Main Gold Vein Exhausted
 message=_This gold mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
 
 [idle]

=== modified file 'tribes/atlanteans/goldore/conf'
--- tribes/atlanteans/goldore/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/goldore/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
 
+default_target_quantity=15
 preciousness=2
 
 [idle]

=== modified file 'tribes/atlanteans/goldyarn/conf'
--- tribes/atlanteans/goldyarn/conf	2014-07-12 14:20:51 +0000
+++ tribes/atlanteans/goldyarn/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_This yarn, made of gold by the gold spinning mill, is used for weaving the exclusive golden tabard in the weaving mill.
 
+default_target_quantity=5
 preciousness=2
-default_target_quantity=5
 
 # Goldyarn
 [idle]

=== modified file 'tribes/atlanteans/guardhall/conf'
--- tribes/atlanteans/guardhall/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/guardhall/conf	2014-07-28 14:34:07 +0000
@@ -9,6 +9,9 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the guardhall.
 defeated_you_string=_Your soldiers defeated the enemy at the guardhall.
 
+[aihints]
+fighting=true
+
 [buildcost]
 log=2
 planks=3
@@ -23,6 +26,3 @@
 [idle]
 pics=guardhall_i_??.png
 hotspot=58 72
-
-[aihints]
-fighting=true

=== modified file 'tribes/atlanteans/guardhouse/conf'
--- tribes/atlanteans/guardhouse/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/guardhouse/conf	2014-07-28 14:34:07 +0000
@@ -9,6 +9,10 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the guardhouse.
 defeated_you_string=_Your soldiers defeated the enemy at the guardhouse.
 
+[aihints]
+expansion=true
+mountain_conqueror=true
+
 [buildcost]
 log=1
 planks=1
@@ -20,7 +24,3 @@
 [idle]
 pics=guardhouse_i_??.png
 hotspot=33 41
-
-[aihints]
-expansion=true
-mountain_conqueror=true

=== modified file 'tribes/atlanteans/hammer/conf'
--- tribes/atlanteans/hammer/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/hammer/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_The hammer is an essential tool. It is needed by geologists, builders, weaponsmiths and armorsmiths. Make sure you always got some in reserve! It is produced by the toolsmith.
+
+default_target_quantity=2
 preciousness=1
 
 [idle]

=== modified file 'tribes/atlanteans/heavy_double_trident/conf'
--- tribes/atlanteans/heavy_double_trident/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/heavy_double_trident/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_This is the most dangerous weapon of the Atlantean military. Only the best of the best soldiers may use it. It is produced in the weapon smithy and used in the dungeon – together with food – to train soldiers from attack level 3 to level 4.
 
+default_target_quantity=1
 preciousness=1
 
 # A golden doubled trident

=== modified file 'tribes/atlanteans/hook_pole/conf'
--- tribes/atlanteans/hook_pole/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/hook_pole/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This hook pole is used by the smoker to suspend all the meat and fish from the top of the smokery. It is created by the toolsmith.
 
+default_target_quantity=1
+
 # a pole with a hook
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/hunters_house/conf'
--- tribes/atlanteans/hunters_house/conf	2014-07-20 21:23:10 +0000
+++ tribes/atlanteans/hunters_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=small
 output=meat
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=1
 planks=1
@@ -9,9 +12,6 @@
 [return_on_dismantle]
 stone=1
 
-[aihints]
-build_material=false
-
 [working positions]
 hunter=1
 
@@ -25,7 +25,7 @@
 [out_of_resource_notification]
 # TRANSLATORS: "Game" means animals that you can hunt
 title=_Out of Game
-message=_The hunter working out of this hunter’s house can’t find any game in his working radius. Remember that you can increase the number of existing fish by building a fishbreeder’s house.
+message=_The hunter working out of this hunter’s house can’t find any game in his working radius.
 delay_attempts=10
 
 [idle]

=== modified file 'tribes/atlanteans/hunting_bow/conf'
--- tribes/atlanteans/hunting_bow/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/hunting_bow/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This bow is used by the Atlantean hunter. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=9 16

=== modified file 'tribes/atlanteans/iron/conf'
--- tribes/atlanteans/iron/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/iron/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Iron is made out of iron ore in the smelting works. It is used in the toolsmithy, armor smithy and weapon smithy.
 
+default_target_quantity=20
 preciousness=4
-default_target_quantity=30
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/ironmine/conf'
--- tribes/atlanteans/ironmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/ironmine/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=mine
 output=ironore
 
+[aihints]
+build_material=false
+mines=iron
+
 [buildcost]
 log=7
 planks=4
@@ -13,10 +17,6 @@
 [working positions]
 miner=3
 
-[aihints]
-build_material=false
-mines=iron
-
 [inputs]
 bread=10
 smoked_fish=10
@@ -27,8 +27,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs ironore or not economy needs bread
-return=skipped unless economy needs ironore or not economy needs smoked_fish
+return=skipped unless economy needs ironore
 consume=smoked_fish,smoked_meat:2 bread:2
 animate=working 20000
 mine=iron 4 100 5 2
@@ -41,7 +40,7 @@
 produce=ironore:2
 
 [out_of_resource_notification]
-title=_Main Iron Vein Exhausted.
+title=_Main Iron Vein Exhausted
 message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider dismantling or destroying it.
 
 [idle]

=== modified file 'tribes/atlanteans/ironore/conf'
--- tribes/atlanteans/ironore/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/ironore/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Iron ore is mined in iron mines. It is smelted in a smelting works to retrieve the iron.
 
-
+default_target_quantity=15
 preciousness=4
 
 [idle]

=== modified file 'tribes/atlanteans/light_trident/conf'
--- tribes/atlanteans/light_trident/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/light_trident/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,7 @@
 help=_This is the basic weapon of the Atlantean soldiers. Together with a tabard, it makes up the equipment of young soldiers. Light tridents are produced in the weapon smithy as are all other tridents.
 
-
-
+default_target_quantity=30
 preciousness=1
-default_target_quantity=20
 
 # A simple trident
 [idle]

=== modified file 'tribes/atlanteans/log/conf'
--- tribes/atlanteans/log/conf	2014-03-15 11:54:07 +0000
+++ tribes/atlanteans/log/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 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.
 
- 
+default_target_quantity=40
 preciousness=14
-default_target_quantity=40
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/long_trident/conf'
--- tribes/atlanteans/long_trident/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/long_trident/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_The long trident is the first trident in the training of soldiers. It is produced in the weapon smithy and used in the dungeon – together with food – to train soldiers from attack level 0 to level 1. 
 
+default_target_quantity=1
 preciousness=1
 
 # A simple, but long trident.

=== modified file 'tribes/atlanteans/meat/conf'
--- tribes/atlanteans/meat/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/meat/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Meat is one food resource of the Atlanteans. It is obtained from wild game taken by the hunter and has to be smoked in a smokery before being delivered to mines and training sites (dungeon and labyrinth).
 
+default_target_quantity=20 # currently not used
 preciousness=2
 
 [idle]

=== modified file 'tribes/atlanteans/milking_tongs/conf'
--- tribes/atlanteans/milking_tongs/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/milking_tongs/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Milking tongs are used by the spider breeder to milk the spiders. They are produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 9

=== modified file 'tribes/atlanteans/mill/conf'
--- tribes/atlanteans/mill/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/mill/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,9 @@
 output=cornflour
 output=blackrootflour
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=3
 stone=3
@@ -12,9 +15,6 @@
 stone=2
 planks=1
 
-[aihints]
-build_material=false
-
 [working positions]
 miller=1
 
@@ -29,7 +29,7 @@
 
 [produce_cornflour]
 return=skipped when site has blackroot and economy needs blackrootflour and not economy needs cornflour
-return=skipped unless economy needs cornflour or not economy needs corn
+return=skipped unless economy needs cornflour
 sleep=3500
 consume=corn
 animate=working 15000
@@ -37,6 +37,7 @@
 
 [produce_blackrootflour]
 return=skipped when site has corn and economy needs cornflour and not economy needs blackrootflour
+# No check whether we need blackrootflour because blackroots cannot be used for anything else.
 sleep=3500
 consume=blackroot
 animate=working 15000

=== modified file 'tribes/atlanteans/pick/conf'
--- tribes/atlanteans/pick/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/pick/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,5 @@
 help=_Picks are used by stonecutters and miners. They are produced by the toolsmith.
+
 default_target_quantity=3
 preciousness=1
 

=== modified file 'tribes/atlanteans/planks/conf'
--- tribes/atlanteans/planks/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/planks/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,5 @@
 help=_Planks are an important building material of the Atlanteans. They are produced out of logs by the sawmill. The weapon smithy and the shipyard also use planks to produce the different tridents and mighty ships.
 
-
-
 default_target_quantity=40
 preciousness=7
 

=== modified file 'tribes/atlanteans/port/conf'
--- tribes/atlanteans/port/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/port/conf	2014-07-28 14:34:07 +0000
@@ -18,11 +18,11 @@
 spidercloth=1
 gold=1
 
-[build]
-pics=port_b_??.png  # 4 frames
-hotspot=74 70
-
 [idle]
 pics=port_i_??.png  # 20 frames
 hotspot=74 70
 fps=10
+
+[build]
+pics=port_b_??.png  # 4 frames
+hotspot=74 70

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/quarry/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=stone
 
+[aihints]
+is_basic=true
+stoneproducer=true
+
 [buildcost]
 log=2
 planks=1
@@ -11,10 +15,6 @@
 [working positions]
 stonecutter=1
 
-[aihints]
-is_basic=true
-stoneproducer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/atlanteans/quartz/conf'
--- tribes/atlanteans/quartz/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/quartz/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_These transparent quartz’ are used to build some exclusive buildings. They are produced in a crystal mine.
 
+default_target_quantity=5
 preciousness=1
 
 [idle]

=== modified file 'tribes/atlanteans/scouts_house/conf'
--- tribes/atlanteans/scouts_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/atlanteans/scouts_house/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,8 @@
 size=small
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=2
 stone=1
@@ -14,9 +17,6 @@
 smoked_fish=2
 bread=2
 
-[aihints]
-build_material=false
-
 [programs]
 work=_Work
 

=== modified file 'tribes/atlanteans/scythe/conf'
--- tribes/atlanteans/scythe/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/scythe/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The Scythe is the tool of the farmers. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 2

=== modified file 'tribes/atlanteans/shovel/conf'
--- tribes/atlanteans/shovel/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/shovel/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,5 @@
 help=_Shovels are needed for the proper handling of plants. Therefore the forester and the blackroot farmer are using them. They are produced by the toolsmith.
+
 default_target_quantity=2
 
 [idle]

=== modified file 'tribes/atlanteans/small_tower/conf'
--- tribes/atlanteans/small_tower/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/small_tower/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,9 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the small tower.
 defeated_you_string=_Your soldiers defeated the enemy at the small tower.
 
+[aihints]
+fighting=true
+
 [buildcost]
 log=1
 planks=2
@@ -22,6 +25,3 @@
 [idle]
 pics=small_tower_i_??.png
 hotspot=42 65
-
-[aihints]
-fighting=true

=== modified file 'tribes/atlanteans/smelting_works/conf'
--- tribes/atlanteans/smelting_works/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/smelting_works/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,9 @@
 output=iron
 output=gold
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=1
 stone=4
@@ -11,9 +14,6 @@
 [return_on_dismantle]
 stone=3
 
-[aihints]
-build_material=false
-
 [working positions]
 smelter=1
 

=== modified file 'tribes/atlanteans/smoked_fish/conf'
--- tribes/atlanteans/smoked_fish/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/smoked_fish/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_As no Atlantean likes raw fish, smoking it in a smokery is the most common way to make it edible.
 
+default_target_quantity=30
 preciousness=3
-default_target_quantity=30
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/smoked_meat/conf'
--- tribes/atlanteans/smoked_meat/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/smoked_meat/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 help=_Smoked meat is made out of meat in a smokery. It is delivered to the mines and training sites (labyrinth and dungeon) where the miners and soldiers prepare a nutritious lunch for themselves.
 
-
+default_target_quantity=20
 preciousness=2
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/smokery/conf'
--- tribes/atlanteans/smokery/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/smokery/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,11 @@
-#help: Will smoke food unless the economy has less logs than the target quantity and at least the target quantity of the smoked food.
-
 size=medium
 output=smoked_meat
 output=smoked_fish
 
+[aihints]
+build_material=false
+is_food_basic=true
+
 [buildcost]
 log=1
 stone=4
@@ -13,10 +15,6 @@
 [return_on_dismantle]
 stone=3
 
-[aihints]
-build_material=false
-is_food_basic=true
-
 [working positions]
 smoker=1
 
@@ -31,14 +29,16 @@
 work=_Work
 
 [smoke_meat]
-return=skipped unless economy needs smoked_meat or not economy needs log
+return=skipped when site has fish and economy needs smoked_fish and not economy needs smoked_meat
+return=skipped unless economy needs smoked_meat
 sleep=30000
 consume=meat:2 log
 animate=working 30000
 produce=smoked_meat:2
 
 [smoke_fish]
-return=skipped unless economy needs smoked_fish or not economy needs log
+return=skipped when site has meat and economy needs smoked_meat and not economy needs smoked_fish
+return=skipped unless economy needs smoked_fish
 sleep=30000
 consume=fish:2 log
 animate=working 30000

=== modified file 'tribes/atlanteans/spidercloth/conf'
--- tribes/atlanteans/spidercloth/conf	2014-04-08 06:28:45 +0000
+++ tribes/atlanteans/spidercloth/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Spidercloth is made out of spideryarn in a weaving mill. It is used in the toolsmithy and the shipyard. Also some higher developed buildings need spidercloth for their construction.
 
-default_target_quantity=10
+default_target_quantity=20
 preciousness=1
 
 [idle]

=== modified file 'tribes/atlanteans/spiderfarm/conf'
--- tribes/atlanteans/spiderfarm/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/spiderfarm/conf	2014-07-28 14:34:07 +0000
@@ -22,8 +22,7 @@
 
 [work]
 sleep=25000
-return=skipped unless economy needs spideryarn or not economy needs corn
-return=skipped unless economy needs spideryarn or not economy needs water
+return=skipped unless economy needs spideryarn
 consume=corn water
 animate=working 30000
 produce=spideryarn

=== modified file 'tribes/atlanteans/steel_shield/conf'
--- tribes/atlanteans/steel_shield/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/steel_shield/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_This steel shield is produced in the armor smithy and used in the labyrinth – together with food – to train soldiers from defense level 0 to level 1.
+
+default_target_quantity=1
 preciousness=1
 
 # A shield with the sign of the Atlanteans on it.

=== modified file 'tribes/atlanteans/steel_trident/conf'
--- tribes/atlanteans/steel_trident/conf	2013-07-23 19:04:12 +0000
+++ tribes/atlanteans/steel_trident/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,6 @@
 help=_This is the medium trident. It is produced in the weapon smithy and used by advanced soldiers in the dungeon to train from attack level 1 to level 2 (together with food). 
 
-
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/atlanteans/stone/conf'
--- tribes/atlanteans/stone/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/stone/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Stone is a basic building ware of the Atlanteans. It is produced in a quarry or a crystal mine.
 
+default_target_quantity=20
 preciousness=5
-default_target_quantity=20
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/tabard/conf'
--- tribes/atlanteans/tabard/conf	2014-04-08 06:28:45 +0000
+++ tribes/atlanteans/tabard/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_A tabard and a light trident are the basic equipment for young soldiers. Tabards are produced in the weaving mill.
 
+default_target_quantity=30
 preciousness=1
-default_target_quantity=20
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/toolsmithy/conf'
--- tribes/atlanteans/toolsmithy/conf	2014-07-15 10:02:22 +0000
+++ tribes/atlanteans/toolsmithy/conf	2014-07-28 14:34:07 +0000
@@ -12,6 +12,10 @@
 output=scythe
 output=shovel
 
+[aihints]
+build_material=false
+is_basic=true
+
 [buildcost]
 log=1
 stone=2
@@ -22,10 +26,6 @@
 stone=1
 planks=1
 
-[aihints]
-build_material=false
-is_basic=true
-
 [working positions]
 toolsmith=1
 

=== modified file 'tribes/atlanteans/tower/conf'
--- tribes/atlanteans/tower/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/tower/conf	2014-07-28 14:34:07 +0000
@@ -11,6 +11,10 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the tower.
 defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
+[aihints]
+expansion=true
+mountain_conqueror=true
+
 [buildcost]
 log=2
 planks=3
@@ -25,7 +29,3 @@
 [idle]
 pics=tower_i_??.png
 hotspot=55 60
-
-[aihints]
-expansion=true
-mountain_conqueror=true

=== modified file 'tribes/atlanteans/water/conf'
--- tribes/atlanteans/water/conf	2014-03-16 20:55:15 +0000
+++ tribes/atlanteans/water/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Water is the essence of life! It is used in the bakery and the horse and spider farms.
 
+default_target_quantity=25 # currently not used
 preciousness=7
-default_target_quantity=25
 
 [idle]
 pics=idle.png

=== modified file 'tribes/atlanteans/weaving-mill/conf'
--- tribes/atlanteans/weaving-mill/conf	2014-07-14 10:45:44 +0000
+++ tribes/atlanteans/weaving-mill/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 output=tabard
 output=golden_tabard
 
+[aihints]
+is_basic=true
+
 [buildcost]
 log=3
 stone=4
@@ -57,9 +60,6 @@
 pics=weaving_mill_i_??.png  # ???
 hotspot=65 69
 
-[aihints]
-is_basic=true
-
 [working]
 pics=weaving_mill_i_??.png # ???
 hotspot=65 69

=== modified file 'tribes/atlanteans/well/conf'
--- tribes/atlanteans/well/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/well/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=small
 output=water
 
+[aihints]
+mines_water=true
+
 [buildcost]
 log=2
 stone=1
@@ -34,7 +37,3 @@
 [working]
 pics=well_i_??.png  # ???
 hotspot=31 32
-
-[aihints]
-mines_water=true
-

=== modified file 'tribes/atlanteans/woodcutters_house/conf'
--- tribes/atlanteans/woodcutters_house/conf	2014-07-21 09:30:12 +0000
+++ tribes/atlanteans/woodcutters_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=log
 
+[aihints]
+is_basic=true
+logproducer=true
+
 [buildcost]
 log=2
 planks=1
@@ -12,10 +16,6 @@
 [working positions]
 woodcutter=1
 
-[aihints]
-is_basic=true
-logproducer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/ax/conf'
--- tribes/barbarians/ax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/ax/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_The Ax is the basic weapon of the barbarians. All young soldiers are equipped with it.
-default_target_quantity=15
+
+default_target_quantity=30
 preciousness=3
 
 [idle]

=== modified file 'tribes/barbarians/axfactory/conf'
--- tribes/barbarians/axfactory/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/axfactory/conf	2014-07-28 14:34:07 +0000
@@ -67,6 +67,10 @@
 call=produce_broadax
 return=skipped
 
+[idle]
+pics=axfactory_i_??.png  # ???
+hotspot=57 76
+
 [build]
 pics=axfactory_b_??.png  # ???
 hotspot=57 76
@@ -75,10 +79,6 @@
 pics=axfactory_u_??.png  # ???
 hotspot=57 76
 
-[idle]
-pics=axfactory_i_??.png  # ???
-hotspot=57 76
-
 [working]
 pics=axfactory_w_??.png  # ???
 hotspot=57 76

=== modified file 'tribes/barbarians/bakery/conf'
--- tribes/barbarians/bakery/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/bakery/conf	2014-07-28 14:34:07 +0000
@@ -27,8 +27,7 @@
 
 [work]
 sleep=20000
-return=skipped unless economy needs pittabread or not economy needs water
-return=skipped unless economy needs pittabread or not economy needs wheat
+return=skipped unless economy needs pittabread
 consume=water:3 wheat:3
 animate=working 20000
 produce=pittabread

=== modified file 'tribes/barbarians/battlearena/conf'
--- tribes/barbarians/battlearena/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/battlearena/conf	2014-07-28 14:34:07 +0000
@@ -54,6 +54,11 @@
 animate=working 15000
 train=soldier evade 1 2
 
+[idle]
+pics=battlearena_i_??.png  # ???
+hotspot=110 72
+fps=10
+
 [build]
 pics=battlearena_b_??.png
 hotspot=110 72
@@ -62,11 +67,6 @@
 pics=battlearena_u_??.png
 hotspot=110 72
 
-[idle]
-pics=battlearena_i_??.png  # ???
-hotspot=110 72
-fps=10
-
 [working]
 pics=battlearena_w_??.png  # ???
 hotspot=110 72

=== modified file 'tribes/barbarians/battleax/conf'
--- tribes/barbarians/battleax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/battleax/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_This is a dangerous weapon the barbarians are able to produce. It is produced in the ax factory. Only trained warriors are able to wield such a weapon. It is used – together with food – in the training camp to train soldiers from attack level 3 to 4. 
 
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/beer/conf'
--- tribes/barbarians/beer/conf	2013-07-23 19:04:12 +0000
+++ tribes/barbarians/beer/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,7 @@
 help=_Beer is produced in micro breweries used in inns and big inns to produce snacks.
+
+default_target_quantity=15
 preciousness=2
-default_target_quantity=15
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/blackwood/conf'
--- tribes/barbarians/blackwood/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/blackwood/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,5 @@
 help=_This fire-hardened wood is as hard as iron and it is used for several buildings. It is produced out of logs in the wood hardener.
 
-
 default_target_quantity=40
 preciousness=10
 

=== modified file 'tribes/barbarians/bread_paddle/conf'
--- tribes/barbarians/bread_paddle/conf	2014-03-15 11:54:07 +0000
+++ tribes/barbarians/bread_paddle/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The bread paddle is the tool of the baker and each baker needs one. It is produced in the metal works like all other tools (but it ceases to be produced by the building if the metal works is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 6

=== modified file 'tribes/barbarians/brewery/conf'
--- tribes/barbarians/brewery/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/brewery/conf	2014-07-28 14:34:07 +0000
@@ -25,8 +25,7 @@
 
 [work]
 sleep=30000
-return=skipped unless economy needs strongbeer or not economy needs water
-return=skipped unless economy needs strongbeer or not economy needs wheat
+return=skipped unless economy needs strongbeer
 consume=water wheat
 animate=working 30000
 produce=strongbeer
@@ -34,6 +33,7 @@
 [idle]
 pics=brewery_i_??.png  # ???
 hotspot=60 59
+
 [working]
 pics=brewery_i_??.png  # ???
 hotspot=60 59

=== modified file 'tribes/barbarians/broadax/conf'
--- tribes/barbarians/broadax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/broadax/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_The broad ax is produced by the axfactory and the war mill. It is used in the training camp – together with food – to train warriors with a fundamental fighting knowledge (from attack level 1 to attack level 2).
 
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/bronzeax/conf'
--- tribes/barbarians/bronzeax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/bronzeax/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_The bronze ax is considered a weapon that is hard to handle. Only skilled warriors can use it. It is produced at the war mill and used in the training camp (it trains – together with food – from attack level 2 to level 3).
+
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/burners_house/conf'
--- tribes/barbarians/burners_house/conf	2014-07-15 10:02:22 +0000
+++ tribes/barbarians/burners_house/conf	2014-07-28 14:34:07 +0000
@@ -24,7 +24,7 @@
 
 [work]
 sleep=30000
-return=skipped unless economy needs coal or not economy needs log
+return=skipped unless economy needs coal
 consume=log:6
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== modified file 'tribes/barbarians/citadel/conf'
--- tribes/barbarians/citadel/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/citadel/conf	2014-07-28 14:34:07 +0000
@@ -11,7 +11,6 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the citadel.
 defeated_you_string=_Your soldiers defeated the enemy at the citadel.
 
-
 [enhancement_cost]
 blackwood=9
 log=5
@@ -24,6 +23,11 @@
 raw_stone=3
 grout=1
 
+[idle]
+pics=citadel_i_??.png
+hotspot=102 102
+fps=10
+
 [build]
 pics=citadel_b_??.png
 hotspot=102 102
@@ -31,8 +35,3 @@
 [unoccupied]
 pics=citadel_u_??.png
 hotspot=102 102
-
-[idle]
-pics=citadel_i_??.png
-hotspot=102 102
-fps=10

=== modified file 'tribes/barbarians/coal/conf'
--- tribes/barbarians/coal/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/coal/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,5 @@
 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.
 
-
 default_target_quantity=20
 preciousness=1
 

=== modified file 'tribes/barbarians/coalmine/conf'
--- tribes/barbarians/coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/coalmine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,10 @@
 output=coal
 enhancement=deep_coalmine
 
+[aihints]
+mines=coal
+mines_percent=30
+
 [buildcost]
 log=4
 raw_stone=2
@@ -13,10 +17,6 @@
 [working positions]
 miner=1
 
-[aihints]
-mines=coal
-mines_percent=30
-
 [inputs]
 ration=6
 
@@ -25,6 +25,7 @@
 
 [work]
 sleep=45000
+return=skipped unless economy needs coal
 consume=ration
 animate=working 20000
 mine=coal 2 33 5 17

=== modified file 'tribes/barbarians/deep_coalmine/conf'
--- tribes/barbarians/deep_coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deep_coalmine/conf	2014-07-28 14:34:07 +0000
@@ -4,6 +4,10 @@
 output=coal
 enhancement=deeper_coalmine
 
+[aihints]
+mines=coal
+mines_percent=60
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,10 +20,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=coal
-mines_percent=60
-
 [inputs]
 snack=6
 
@@ -28,6 +28,7 @@
 
 [work]
 sleep=42000
+return=skipped unless economy needs coal
 consume=snack
 animate=working 18000
 mine=coal 2 66 5 17

=== modified file 'tribes/barbarians/deep_goldmine/conf'
--- tribes/barbarians/deep_goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deep_goldmine/conf	2014-07-28 14:34:07 +0000
@@ -4,6 +4,10 @@
 output=goldore
 enhancement=deeper_goldmine
 
+[aihints]
+mines=gold
+mines_percent=60
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,10 +20,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=gold
-mines_percent=60
-
 [inputs]
 snack=6
 
@@ -28,6 +28,7 @@
 
 [work]
 sleep=42000
+return=skipped unless economy needs goldore
 consume=snack
 animate=working 18000
 mine=gold 2 66 5 17

=== modified file 'tribes/barbarians/deep_oremine/conf'
--- tribes/barbarians/deep_oremine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deep_oremine/conf	2014-07-28 14:34:07 +0000
@@ -4,6 +4,10 @@
 output=ironore
 enhancement=deeper_oremine
 
+[aihints]
+mines=iron
+mines_percent=60
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,10 +20,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=iron
-mines_percent=60
-
 [inputs]
 snack=6
 
@@ -28,6 +28,7 @@
 
 [work]
 sleep=43000
+return=skipped unless economy needs ironore
 consume=snack
 animate=working 18000
 mine=iron 2 66 5 17
@@ -40,14 +41,14 @@
 title=_Main Iron Vein Exhausted
 message=_This iron mine’s main vein is exhausted. Expect strongly diminished returns on investment. You should consider enhancing, dismantling or destroying it.
 
+[idle]
+pics=deep_oremine_i_??.png
+hotspot=21 37
+
 [build]
 pics=deep_oremine_b_??.png
 hotspot=21 37
 
-[idle]
-pics=deep_oremine_i_??.png
-hotspot=21 37
-
 [working]
 pics=deep_oremine_w_??.png
 hotspot=21 37

=== modified file 'tribes/barbarians/deeper_coalmine/conf'
--- tribes/barbarians/deeper_coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deeper_coalmine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=coal
 
+[aihints]
+mines=coal
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,9 +19,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=coal
-
 [inputs]
 meal=6
 
@@ -27,6 +27,7 @@
 
 [work]
 sleep=40000
+return=skipped unless economy needs coal
 consume=meal
 animate=working 16000
 mine=coal 2 100 10 2

=== modified file 'tribes/barbarians/deeper_goldmine/conf'
--- tribes/barbarians/deeper_goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deeper_goldmine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=goldore
 
+[aihints]
+mines=gold
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,9 +19,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=gold
-
 [inputs]
 meal=6
 
@@ -27,6 +27,7 @@
 
 [work]
 sleep=40000
+return=skipped unless economy needs goldore
 consume=meal
 animate=working 16000
 mine=gold 2 100 10 2

=== modified file 'tribes/barbarians/deeper_oremine/conf'
--- tribes/barbarians/deeper_oremine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/deeper_oremine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=ironore
 
+[aihints]
+mines=iron
+
 [enhancement_cost]
 log=4
 raw_stone=2
@@ -16,9 +19,6 @@
 chief-miner=1
 miner=1
 
-[aihints]
-mines=iron
-
 [inputs]
 meal=6
 
@@ -27,6 +27,7 @@
 
 [work]
 sleep=40000
+return=skipped unless economy needs ironore
 consume=meal
 animate=working 16000
 mine=iron 2 100 10 2

=== modified file 'tribes/barbarians/donjon/conf'
--- tribes/barbarians/donjon/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/donjon/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,10 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the donjon.
 defeated_you_string=_Your soldiers defeated the enemy at the donjon.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
 
 [buildcost]
 blackwood=7
@@ -20,20 +24,15 @@
 blackwood=3
 raw_stone=3
 
-[build]
-pics=donjon_b_??.png
-hotspot=48 84
-
 [idle]
 pics=donjon_i_??.png
 hotspot=48 84
 fps=10
 
+[build]
+pics=donjon_b_??.png
+hotspot=48 84
+
 [unoccupied]
 pics=donjon_u_??.png
 hotspot=48 84
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true

=== modified file 'tribes/barbarians/fire_tongs/conf'
--- tribes/barbarians/fire_tongs/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/fire_tongs/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Fire tongs are tools of the smelter, who works in the smelting works. Produced by the metal works (but they cease to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=5 5

=== modified file 'tribes/barbarians/fish/conf'
--- tribes/barbarians/fish/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/fish/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Besides pitta bread and meat, fish is also a foodstuff for the barbarians. It is used in the taverns, inns and big inns and at the training sites (training camp and battle arena).
 
+default_target_quantity=20 # currently not used
 preciousness=3
 
 [idle]

=== modified file 'tribes/barbarians/fisher/conf'
--- tribes/barbarians/fisher/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/fisher/conf	2014-07-28 14:34:07 +0000
@@ -10,13 +10,13 @@
 1=walk coords
 2=playFX ../../../sound/fisher/fisher_throw_net 192
 3=mine fish 1
-4=animation idle 3000 # Play a fishing animation
+4=animation fishing 3000 # Play a fishing animation
 5=playFX ../../../sound/fisher/fisher_pull_net 192
 6=createware fish
 7=return
 
 [idle]
-pics=fishing_??.png
+pics=idle_??.png
 hotspot=9 39
 fps=10
 
@@ -29,3 +29,8 @@
 dirpics=walk_!!_??.png
 hotspot=10 38
 fps=10
+
+[fishing]
+pics=fishing_??.png
+hotspot=9 39
+fps=10

=== added file 'tribes/barbarians/fisher/idle_00.png'
Binary files tribes/barbarians/fisher/idle_00.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/fisher/idle_00.png	2014-07-28 14:34:07 +0000 differ
=== added file 'tribes/barbarians/fisher/idle_00_pc.png'
Binary files tribes/barbarians/fisher/idle_00_pc.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/fisher/idle_00_pc.png	2014-07-28 14:34:07 +0000 differ
=== modified file 'tribes/barbarians/fishers_hut/conf'
--- tribes/barbarians/fishers_hut/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/fishers_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=fish
 
+[aihints]
+build_material=false
+needs_water=true
+
 [buildcost]
 log=4
 
@@ -10,10 +14,6 @@
 [working positions]
 fisher=1
 
-[aihints]
-build_material=false
-needs_water=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/fishing_rod/conf'
--- tribes/barbarians/fishing_rod/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/fishing_rod/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Fishing rods are needed by barbarian fishers for fishing. They are one of the basic tools produced in a metal workshop (but they cease to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=4 5

=== modified file 'tribes/barbarians/fortress/conf'
--- tribes/barbarians/fortress/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/fortress/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,11 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
 defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
+
 [buildcost]
 blackwood=9
 log=5
@@ -22,6 +27,11 @@
 raw_stone=2
 grout=1
 
+[idle]
+pics=fortress_i_??.png
+hotspot=103 80
+fps=10
+
 [build]
 pics=fortress_b_??.png
 hotspot=103 80
@@ -29,13 +39,3 @@
 [unoccupied]
 pics=fortress_u_??.png
 hotspot=103 80
-
-[idle]
-pics=fortress_i_??.png
-hotspot=103 80
-fps=10
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true

=== modified file 'tribes/barbarians/gamekeepers_hut/conf'
--- tribes/barbarians/gamekeepers_hut/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/gamekeepers_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,9 @@
 size=small
 
+[aihints]
+build_material=false
+renews_map_resource=meat
+
 [buildcost]
 log=4
 raw_stone=1
@@ -11,10 +15,6 @@
 [working positions]
 gamekeeper=1
 
-[aihints]
-build_material=false
-renews_map_resource=meat
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/gold/conf'
--- tribes/barbarians/gold/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/gold/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Gold is the most valuable of all metals; only very important things are embellished with it. It is obtained out of gold ore in a smelting works. It is used as a precious building material and to produce different axes (in the war mill) and different parts of armor (in the helm smithy).
 
+default_target_quantity=20
 preciousness=2
-default_target_quantity=15
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/goldmine/conf'
--- tribes/barbarians/goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/goldmine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,11 @@
 output=goldore
 enhancement=deep_goldmine
 
+[aihints]
+build_material=false
+mines=gold
+mines_percent=30
+
 [buildcost]
 log=4
 raw_stone=2
@@ -13,11 +18,6 @@
 [working positions]
 miner=1
 
-[aihints]
-build_material=false
-mines=gold
-mines_percent=30
-
 [inputs]
 ration=6
 
@@ -26,6 +26,7 @@
 
 [work]
 sleep=45000
+return=skipped unless economy needs goldore
 consume=ration
 animate=working 20000
 mine=gold 2 33 5 17

=== modified file 'tribes/barbarians/goldore/conf'
--- tribes/barbarians/goldore/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/goldore/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
+
+default_target_quantity=15
 preciousness=2
 
 [idle]

=== modified file 'tribes/barbarians/granitemine/conf'
--- tribes/barbarians/granitemine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/granitemine/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=mine
 output=raw_stone
 
+[aihints]
+mines=granite
+
 [buildcost]
 log=4
 raw_stone=2
@@ -12,9 +15,6 @@
 [working positions]
 miner=1
 
-[aihints]
-mines=granite
-
 [inputs]
 ration=8
 
@@ -23,6 +23,7 @@
 
 [work]
 sleep=20000
+return=skipped unless economy needs raw_stone
 consume=ration
 animate=working 20000
 mine=granite 2 100 5 17

=== modified file 'tribes/barbarians/hammer/conf'
--- tribes/barbarians/hammer/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/hammer/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_The hammer is an essential tool. It is needed by the geologist, the builder, the blacksmith and the helmsmith. Make sure you always have some in reserve! It is one of the basic tools produced at the metal workshop, (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
+
+default_target_quantity=2
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/helm/conf'
--- tribes/barbarians/helm/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/helm/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_A helmet is a basic tool to protect warriors. It is produced in the helm smithy and used in the training camp – together with food – to train soldiers from health level 0 to level 1.
+
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/hunters_hut/conf'
--- tribes/barbarians/hunters_hut/conf	2014-07-20 21:23:10 +0000
+++ tribes/barbarians/hunters_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=small
 output=meat
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=4
 raw_stone=1
@@ -9,9 +12,6 @@
 log=1
 raw_stone=1
 
-[aihints]
-build_material=false
-
 [working positions]
 hunter=1
 

=== modified file 'tribes/barbarians/hunting_spear/conf'
--- tribes/barbarians/hunting_spear/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/hunting_spear/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This spear is light enough to be thrown, but heavy enough to kill any animal in one blow. It is only used by hunters. Produced in the metal works (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 5

=== modified file 'tribes/barbarians/iron/conf'
--- tribes/barbarians/iron/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/iron/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,7 @@
 help=_Iron is obtained out of iron ore in the smelting works. It is used to produce weapons and tools in the metal workshop, axfactory, war mill and in the helm smithy.
+
+default_target_quantity=20
 preciousness=4
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/ironore/conf'
--- tribes/barbarians/ironore/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/ironore/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_Iron ore is mined in iron mines. It delivers iron when smelted in a smelting works.
+
+default_target_quantity=15
 preciousness=4
 
 [idle]

=== modified file 'tribes/barbarians/kitchen_tools/conf'
--- tribes/barbarians/kitchen_tools/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/kitchen_tools/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_How can one create a meal, snack or ration, if there are no kitchen tools? Be sure to have a metal workshop to produce this basic tool (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=8 8

=== modified file 'tribes/barbarians/log/conf'
--- tribes/barbarians/log/conf	2014-03-15 11:54:07 +0000
+++ tribes/barbarians/log/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 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.
 
-
+default_target_quantity=40
 preciousness=14
-default_target_quantity=40
 
 # Barbarian logs are made of black wood from the black forests
 # they come from.

=== modified file 'tribes/barbarians/lumberjacks_hut/conf'
--- tribes/barbarians/lumberjacks_hut/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/lumberjacks_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=log
 
+[aihints]
+is_basic=true
+logproducer=true
+
 [buildcost]
 log=3
 
@@ -10,10 +14,6 @@
 [working positions]
 lumberjack=1
 
-[aihints]
-is_basic=true
-logproducer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/mask/conf'
--- tribes/barbarians/mask/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/mask/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_This is the most enhanced Barbarian armor. It is produced in the helm smithy and used in the training camp – together with food – to train soldiers from health level 2 to level 3.
 
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/meal/conf'
--- tribes/barbarians/meal/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/meal/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_A meal is made out of pitta bread, strong beer and fish/meat in a big inn. This substantial food is exactly what workers in a deeper mine need.
 
-
+default_target_quantity=10
 preciousness=5
 
 [idle]

=== modified file 'tribes/barbarians/meat/conf'
--- tribes/barbarians/meat/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/meat/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Meat contains a lot of energy. It is produced by hunters and used in the taverns, inns and big inns to prepare rations, snacks and meals for the miners. It is also consumed in the training sites (training camp and battle arena).
 
+default_target_quantity=20 # currently not used
 preciousness=3
 
 [idle]

=== modified file 'tribes/barbarians/metalworks/conf'
--- tribes/barbarians/metalworks/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/metalworks/conf	2014-07-28 14:34:07 +0000
@@ -1,16 +1,20 @@
 size=medium
+output=bread_paddle
 output=felling_ax
-output=bread_paddle
 output=fire_tongs
 output=fishing_rod
 output=hammer
+output=hunting_spear
 output=kitchen_tools
 output=pick
 output=scythe
 output=shovel
-output=hunting_spear
 enhancement=axfactory
 
+[aihints]
+build_material=false
+is_basic=true
+
 [buildcost]
 log=1
 blackwood=1
@@ -30,23 +34,27 @@
 iron=8
 log=8
 
-[aihints]
-build_material=false
-is_basic=true
-
 [programs]
+produce_bread_paddle=_Produce bread paddle
 produce_felling_ax=_Produce felling ax
-produce_bread_paddle=_Produce bread paddle
 produce_fire_tongs=_Produce fire tongs
 produce_fishing_rod=_Produce fishing rod
 produce_hammer=_Produce hammer
+produce_hunting_spear=_Produce hunting spear
 produce_kitchen_tools=_Produce kitchen tools
 produce_pick=_Produce pick
 produce_scythe=_Produce scythe
 produce_shovel=_Produce shovel
-produce_hunting_spear=_Produce hunting spear
 work=_Work
 
+[produce_bread_paddle]
+return=skipped unless economy needs bread_paddle
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=bread_paddle
+
 [produce_felling_ax]
 return=skipped unless economy needs felling_ax
 sleep=32000
@@ -55,14 +63,6 @@
 animate=working 35000
 produce=felling_ax
 
-[produce_bread_paddle]
-return=skipped unless economy needs bread_paddle
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=bread_paddle
-
 [produce_fire_tongs]
 return=skipped unless economy needs fire_tongs
 sleep=32000
@@ -87,6 +87,14 @@
 animate=working 35000
 produce=hammer
 
+[produce_hunting_spear]
+return=skipped unless economy needs hunting_spear
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=hunting_spear
+
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
 sleep=32000
@@ -119,27 +127,23 @@
 animate=working 35000
 produce=shovel
 
-[produce_hunting_spear]
-return=skipped unless economy needs hunting_spear
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=hunting_spear
-
 [work]
 call=produce_bread_paddle
+call=produce_felling_ax
 call=produce_fire_tongs
 call=produce_fishing_rod
 call=produce_hammer
+call=produce_hunting_spear
 call=produce_kitchen_tools
 call=produce_pick
 call=produce_scythe
 call=produce_shovel
-call=produce_hunting_spear
-call=produce_felling_ax
 return=skipped
 
+[idle]
+pics=metalworks_i_??.png
+hotspot=57 76
+
 [build]
 pics=metalworks_b_??.png
 hotspot=57 76
@@ -148,10 +152,6 @@
 pics=metalworks_u_??.png
 hotspot=57 76
 
-[idle]
-pics=metalworks_i_??.png
-hotspot=57 76
-
 [working]
 pics=metalworks_w_??.png
 hotspot=57 76

=== modified file 'tribes/barbarians/oremine/conf'
--- tribes/barbarians/oremine/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/oremine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,11 @@
 output=ironore
 enhancement=deep_oremine
 
+[aihints]
+build_material=false
+mines=iron
+mines_percent=30
+
 [buildcost]
 log=4
 raw_stone=2
@@ -13,11 +18,6 @@
 [working positions]
 miner=1
 
-[aihints]
-build_material=false
-mines=iron
-mines_percent=30
-
 [inputs]
 ration=6
 
@@ -26,6 +26,7 @@
 
 [work]
 sleep=45000
+return=skipped unless economy needs ironore
 consume=ration
 animate=working 20000
 mine=iron 2 33 5 17

=== modified file 'tribes/barbarians/pittabread/conf'
--- tribes/barbarians/pittabread/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/pittabread/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_The barbarian bakers are best in making this flat and tasty pitta bread. It is made out of wheat and water following a secret recipe. Pitta bread is used in the taverns, inns and big inns to prepare rations, snacks and meals. It is also consumed at training sites (training camp and battle arena).
 
+default_target_quantity=20
 preciousness=4
-default_target_quantity=20
 
 [idle]
 pics=bread_idle.png

=== modified file 'tribes/barbarians/port/conf'
--- tribes/barbarians/port/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/port/conf	2014-07-28 14:34:07 +0000
@@ -20,11 +20,11 @@
 thatchreed=1
 gold=1
 
-[build]
-pics=port_b_??.png  # 4 frames
-hotspot=67 80
-
 [idle]
 pics=port_i_??.png  # 20 frames
 hotspot=67 80
 fps=10
+
+[build]
+pics=port_b_??.png  # 4 frames
+hotspot=67 80

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/quarry/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=raw_stone
 
+[aihints]
+is_basic=true
+stoneproducer=true
+
 [buildcost]
 log=4
 
@@ -10,10 +14,6 @@
 [working positions]
 stonemason=1
 
-[aihints]
-is_basic=true
-stoneproducer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/rangers_hut/conf'
--- tribes/barbarians/rangers_hut/conf	2014-05-25 17:43:56 +0000
+++ tribes/barbarians/rangers_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,9 @@
 size=small
 
+[aihints]
+renews_map_resource=log
+space_consumer=true
+
 [buildcost]
 log=4
 
@@ -9,10 +13,6 @@
 [working positions]
 ranger=1
 
-[aihints]
-renews_map_resource=log
-space_consumer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/barbarians/ration/conf'
--- tribes/barbarians/ration/conf	2013-07-23 19:04:12 +0000
+++ tribes/barbarians/ration/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_A small bite to keep miners strong and working. Also the scout consumes rations on his scouting trips. Rations are produced in a tavern, an inn or a big inn out of fish or meat or pitta bread. 
 
+default_target_quantity=20
 preciousness=5
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/raw_stone/conf'
--- tribes/barbarians/raw_stone/conf	2013-07-23 19:04:12 +0000
+++ tribes/barbarians/raw_stone/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,10 @@
 help=_Raw Stones are a basic building material of the barbarians. It is produced in quarries and granite mines.
 
+default_target_quantity=20
 preciousness=5
 
 # The stonemasons of the barbarians are not very talented workers,
-# therefore the stones miss a certain profesionality: rough, hard edges
+# therefore the stones miss a certain professionalism: rough, hard edges
 # and not completly cubic.
 
 [idle]

=== modified file 'tribes/barbarians/scouts_hut/conf'
--- tribes/barbarians/scouts_hut/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/scouts_hut/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,8 @@
 size=small
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=2
 raw_stone=1
@@ -11,9 +14,6 @@
 [inputs]
 ration=2
 
-[aihints]
-build_material=false
-
 [working positions]
 scout=1
 

=== modified file 'tribes/barbarians/scythe/conf'
--- tribes/barbarians/scythe/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/scythe/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The scythe is the tool of the farmer. It is produced in the metal workshop (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 2

=== modified file 'tribes/barbarians/sentry/conf'
--- tribes/barbarians/sentry/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/sentry/conf	2014-07-28 14:34:07 +0000
@@ -9,6 +9,11 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
 defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
+
 [buildcost]
 blackwood=2
 
@@ -27,8 +32,3 @@
 [unoccupied]
 pics=sentry_u_??.png
 hotspot=39 40
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true

=== modified file 'tribes/barbarians/sharpax/conf'
--- tribes/barbarians/sharpax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/sharpax/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,6 @@
 help=_Young warriors are proud to learn to fight with this powerful weapon. It is heavier and sharper than the ordinary ax. It is produced in axfactories and war mills. In training camps, it is used – together with food – to train soldiers from attack level 0 to level 1.
 
-
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/shipyard/conf'
--- tribes/barbarians/shipyard/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/shipyard/conf	2014-07-28 14:34:07 +0000
@@ -38,17 +38,17 @@
 return=completed
 
 [idle]
-pics=work_??.png
+pics=shipyard_i_??.png
 hotspot=62 48
 
 [build]
-pics=build_??.png
+pics=shipyard_b_??.png
 hotspot=62 48
 
 [working]
-pics=work_??.png
+pics=shipyard_w_??.png
 hotspot=62 48
 
 [unoccupied]
-pics=vacant_??.png
+pics=shipyard_u_??.png
 hotspot=62 48

=== renamed file 'tribes/barbarians/shipyard/build_00.png' => 'tribes/barbarians/shipyard/shipyard_b_00.png'
=== renamed file 'tribes/barbarians/shipyard/build_00_pc.png' => 'tribes/barbarians/shipyard/shipyard_b_00_pc.png'
=== renamed file 'tribes/barbarians/shipyard/build_01.png' => 'tribes/barbarians/shipyard/shipyard_b_01.png'
=== renamed file 'tribes/barbarians/shipyard/build_01_pc.png' => 'tribes/barbarians/shipyard/shipyard_b_01_pc.png'
=== renamed file 'tribes/barbarians/shipyard/build_02.png' => 'tribes/barbarians/shipyard/shipyard_b_02.png'
=== renamed file 'tribes/barbarians/shipyard/build_02_pc.png' => 'tribes/barbarians/shipyard/shipyard_b_02_pc.png'
=== renamed file 'tribes/barbarians/shipyard/build_03.png' => 'tribes/barbarians/shipyard/shipyard_b_03.png'
=== renamed file 'tribes/barbarians/shipyard/build_03_pc.png' => 'tribes/barbarians/shipyard/shipyard_b_03_pc.png'
=== renamed file 'tribes/barbarians/shipyard/idle_00.png' => 'tribes/barbarians/shipyard/shipyard_i_00.png'
=== renamed file 'tribes/barbarians/shipyard/idle_00_pc.png' => 'tribes/barbarians/shipyard/shipyard_i_00_pc.png'
=== renamed file 'tribes/barbarians/shipyard/vacant_00.png' => 'tribes/barbarians/shipyard/shipyard_u_00.png'
=== renamed file 'tribes/barbarians/shipyard/vacant_00_pc.png' => 'tribes/barbarians/shipyard/shipyard_u_00_pc.png'
=== renamed file 'tribes/barbarians/shipyard/work_00.png' => 'tribes/barbarians/shipyard/shipyard_w_00.png'
=== renamed file 'tribes/barbarians/shipyard/work_00_pc.png' => 'tribes/barbarians/shipyard/shipyard_w_00_pc.png'
=== modified file 'tribes/barbarians/shovel/conf'
--- tribes/barbarians/shovel/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/shovel/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The shovel is needed for the proper handling of plants. Therefore the gardener and the ranger use it. Produced at the metal workshop (but it ceases to be produced by the building if it is enhanced to an axfactory and war mill).
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=4 5

=== modified file 'tribes/barbarians/snack/conf'
--- tribes/barbarians/snack/conf	2013-07-23 19:04:12 +0000
+++ tribes/barbarians/snack/conf	2014-07-28 14:34:07 +0000
@@ -1,10 +1,7 @@
 help=_A bigger morsel than the ration to provide miners in deep mines. It is produced in an inn or a big inn out of fish/meat, pitta bread and beer.
 
-
-
-
+default_target_quantity=15
 preciousness=5
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/strongbeer/conf'
--- tribes/barbarians/strongbeer/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/strongbeer/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,7 @@
 help=_Only this beer is acceptable for the warriors in a battle arena. Some say that the whole power of the barbarians lies in this ale. It helps to train the soldiers’ evade level from 0 to 1 to 2. Strong beer is also used in big inns to prepare meals.
 
-
-
+default_target_quantity=15
 preciousness=2
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/tavern/conf'
--- tribes/barbarians/tavern/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/tavern/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,10 @@
 output=ration
 enhancement=inn
 
+[aihints]
+build_material=false
+is_food_basic=true
+
 [buildcost]
 log=3
 blackwood=2
@@ -13,10 +17,6 @@
 blackwood=1
 raw_stone=1
 
-[aihints]
-build_material=false
-is_food_basic=true
-
 [working positions]
 innkeeper=1
 
@@ -26,21 +26,15 @@
 meat=4
 
 [programs]
-produce_ration=_Produce ration
 work=_Work
 
-[produce_ration]
+[work]
 sleep=14000
 return=skipped unless economy needs ration
 consume=fish,pittabread,meat
 animate=working 19000
 produce=ration
 
-[work]
-call=produce_ration
-return=skipped
-
-
 [idle]
 pics=tavern_i_??.png  # ???
 hotspot=32 56

=== modified file 'tribes/barbarians/thatchreed/conf'
--- tribes/barbarians/thatchreed/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/thatchreed/conf	2014-07-28 14:34:07 +0000
@@ -1,9 +1,7 @@
 help=_Thatch reed is produced in a reed yard and used to make the roofs of buildings waterproof.
 
+default_target_quantity=10 # currently not used
 preciousness=5
-default_target_quantity=10
-
-# Reed is growing near by watersides.
 
 [idle]
 pics=idle.png

=== modified file 'tribes/barbarians/trainingcamp/conf'
--- tribes/barbarians/trainingcamp/conf	2014-03-17 17:23:26 +0000
+++ tribes/barbarians/trainingcamp/conf	2014-07-28 14:34:07 +0000
@@ -110,6 +110,11 @@
 consume=warhelm fish,meat:2 pittabread
 train=soldier hp 2 3
 
+[idle]
+pics=trainingcamp_i_??.png  # ???
+hotspot=110 75
+fps=10
+
 [build]
 pics=trainingcamp_b_??.png  # ???
 hotspot=110 77
@@ -117,8 +122,3 @@
 [unoccupied]
 pics=trainingcamp_u_??.png  # ???
 hotspot=110 75
-
-[idle]
-pics=trainingcamp_i_??.png  # ???
-hotspot=110 75
-fps=10

=== modified file 'tribes/barbarians/warhelm/conf'
--- tribes/barbarians/warhelm/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/warhelm/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_A warhelm is an enhanced armor for barbarian warriors. It is produced in a helm smithy and used in a training camp – together with food – to train soldiers from health level 1 to level 2.
+
+default_target_quantity=1
 preciousness=2
 
 [idle]

=== modified file 'tribes/barbarians/warmill/conf'
--- tribes/barbarians/warmill/conf	2014-07-14 10:45:44 +0000
+++ tribes/barbarians/warmill/conf	2014-07-28 14:34:07 +0000
@@ -104,6 +104,10 @@
 call=produce_warriorsax
 return=skipped
 
+[idle]
+pics=warmill_i_??.png  # ???
+hotspot=57 76
+
 [build]
 pics=warmill_b_??.png  # ???
 hotspot=57 76
@@ -112,10 +116,6 @@
 pics=warmill_u_??.png  # ???
 hotspot=57 76
 
-[idle]
-pics=warmill_i_??.png  # ???
-hotspot=57 76
-
 [working]
 pics=warmill_w_??.png  # ???
 hotspot=57 76

=== modified file 'tribes/barbarians/warriorsax/conf'
--- tribes/barbarians/warriorsax/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/warriorsax/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_The warrior’s axe is the most dangerous of all Barbarian weapons. Only a few warriors ever were able to handle those huge and powerful axes. It is produced in a war mill and used – together with food – in a training camp to train soldiers from attack level 4 to level 5.
 
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/barbarians/water/conf'
--- tribes/barbarians/water/conf	2014-03-16 20:55:15 +0000
+++ tribes/barbarians/water/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 help=_Water is the essence of life! It is used in the bakery, the micro brewery and the brewery. The lime kiln and the cattle farm also need to be supplied with water.
 
-
+default_target_quantity=25 # currently not used
 preciousness=8
-default_target_quantity=25
 
 [idle]
 pics=water_idle.png

=== modified file 'tribes/barbarians/well/conf'
--- tribes/barbarians/well/conf	2014-07-21 09:30:12 +0000
+++ tribes/barbarians/well/conf	2014-07-28 14:34:07 +0000
@@ -1,16 +1,16 @@
 size=small
 output=water
 
+[aihints]
+build_material=false
+mines_water=true
+
 [buildcost]
 log=4
 
 [return_on_dismantle]
 log=2
 
-[aihints]
-build_material=false
-mines_water=true
-
 [working positions]
 carrier=1
 

=== modified file 'tribes/barbarians/wheat/conf'
--- tribes/barbarians/wheat/conf	2013-07-23 19:04:12 +0000
+++ tribes/barbarians/wheat/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Wheat is essential for surviving. It is produced in farms and consumed by bakeries, micro breweries and breweries. Also Cattle farms need to be supplied with wheat.
 
+default_target_quantity=25 # currently not used
 preciousness=12
-default_target_quantity=25
 
 [idle]
 pics=wheat_idle.png

=== modified file 'tribes/empire/advanced_lance/conf'
--- tribes/empire/advanced_lance/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/advanced_lance/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_This is an advanced lance with a steel tip. It is produced in a weapon smithy and used in a training camp – together with food – to train soldiers from attack level 1 to level 2.
 
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/armor/conf'
--- tribes/empire/armor/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/armor/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_Basic armor for Empire soldiers. It is produced in the armor smithy and used in the training camp – together with food – to train soldiers from health level 1 to level 2.
+
+default_target_quantity=1
 preciousness=0
 
 [idle]

=== modified file 'tribes/empire/ax/conf'
--- tribes/empire/ax/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/ax/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,5 @@
 help=_The ax is the tool for the lumberjack. It is produced by the toolsmith.
+
 default_target_quantity=3
 preciousness=1
 

=== modified file 'tribes/empire/bakery/conf'
--- tribes/empire/bakery/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/bakery/conf	2014-07-28 14:34:07 +0000
@@ -30,14 +30,14 @@
 animate=working 15000
 produce=bread
 
+[idle]
+pics=bakery_i_??.png  # ???
+hotspot=42 65
+
 [build]
 pics=bakery_b_??.png  # ???
 hotspot=42 65
 
-[idle]
-pics=bakery_i_??.png  # ???
-hotspot=42 65
-
 [working]
 pics=bakery_w_??.png  # ???
 hotspot=43 65

=== modified file 'tribes/empire/barracks/conf'
--- tribes/empire/barracks/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/barracks/conf	2014-07-28 14:34:07 +0000
@@ -10,7 +10,6 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the barracks.
 defeated_you_string=_Your soldiers defeated the enemy at the barracks.
 
-
 [buildcost]
 log=1
 wood=2

=== modified file 'tribes/empire/barrier/conf'
--- tribes/empire/barrier/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/barrier/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,8 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the barrier.
 defeated_you_string=_Your soldiers defeated the enemy at the barrier.
 
+[aihints]
+fighting=true
 
 [buildcost]
 log=2
@@ -35,6 +37,3 @@
 [idle]
 pics=barrier_i_??.png
 hotspot=49 77
-
-[aihints]
-fighting=true

=== modified file 'tribes/empire/basket/conf'
--- tribes/empire/basket/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/basket/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This basket is needed by the vinefarmer for harvesting the grapes. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=8 11

=== modified file 'tribes/empire/bread/conf'
--- tribes/empire/bread/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/bread/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,5 @@
 help=_The bakers of the Empire make really tasty bread out of flour and water. It is used in taverns and inns to prepare rations and meals. Bread is also consumed at the training sites (arena, colosseum, training camp).
 
-
 default_target_quantity=20
 preciousness=4
 

=== modified file 'tribes/empire/bread_paddle/conf'
--- tribes/empire/bread_paddle/conf	2014-03-15 11:54:07 +0000
+++ tribes/empire/bread_paddle/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The bread paddle is the tool of the baker, each baker needs one. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 6

=== modified file 'tribes/empire/brewery/conf'
--- tribes/empire/brewery/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/brewery/conf	2014-07-28 14:34:07 +0000
@@ -26,8 +26,7 @@
 
 [work]
 sleep=30000
-return=skipped unless economy needs beer or not economy needs water
-return=skipped unless economy needs beer or not economy needs wheat
+return=skipped unless economy needs beer
 consume=water wheat
 animate=working 30000
 produce=beer

=== modified file 'tribes/empire/burners_house/conf'
--- tribes/empire/burners_house/conf	2014-07-15 10:02:22 +0000
+++ tribes/empire/burners_house/conf	2014-07-28 14:34:07 +0000
@@ -25,7 +25,7 @@
 
 [work]
 sleep=30000
-return=skipped unless economy needs coal or not economy needs log
+return=skipped unless economy needs coal
 consume=log:6
 animate=working 90000 # charcoal fires are burning some days in real life
 produce=coal

=== modified file 'tribes/empire/castle/conf'
--- tribes/empire/castle/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/castle/conf	2014-07-28 14:34:07 +0000
@@ -11,7 +11,6 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the castle.
 defeated_you_string=_Your soldiers defeated the enemy at the castle.
 
-
 [enhancement_cost]
 wood=5
 marblecolumn=4

=== modified file 'tribes/empire/chain_armor/conf'
--- tribes/empire/chain_armor/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/chain_armor/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_The chain armor is a medium armor for Empire soldiers. It is produced in an armor smithy and used in a training camp – together with food – to train soldiers from health level 2 to level 3.
 
+default_target_quantity=1
 preciousness=0
 
 [idle]

=== modified file 'tribes/empire/cloth/conf'
--- tribes/empire/cloth/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/cloth/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,6 @@
 help=_Cloth is needed to build several buildings. It is also consumed in the armor smithy.
 
-
-default_target_quantity=5
+default_target_quantity=15
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/coal/conf'
--- tribes/empire/coal/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/coal/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 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.
 
-default_target_quantity=25
+default_target_quantity=20
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/coalmine/conf'
--- tribes/empire/coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/coalmine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,10 @@
 output=coal
 enhancement=deep_coalmine
 
+[aihints]
+mines=coal
+mines_percent=50
+
 [buildcost]
 log=4
 wood=2
@@ -13,10 +17,6 @@
 [working positions]
 miner=1
 
-[aihints]
-mines=coal
-mines_percent=50
-
 [inputs]
 ration=6
 beer=6
@@ -26,8 +26,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs coal or not economy needs ration
-return=skipped unless economy needs coal or not economy needs beer
+return=skipped unless economy needs coal
 consume=beer ration
 animate=working 20000
 mine=coal 2 50 5 17

=== modified file 'tribes/empire/deep_coalmine/conf'
--- tribes/empire/deep_coalmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/deep_coalmine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=coal
 
+[aihints]
+mines=coal
+
 [enhancement_cost]
 log=4
 wood=2
@@ -15,9 +18,6 @@
 master-miner=1
 miner=1
 
-[aihints]
-mines=coal
-
 [inputs]
 meal=6
 beer=6
@@ -27,8 +27,7 @@
 
 [work]
 sleep=42000
-return=skipped unless economy needs coal or not economy needs meal
-return=skipped unless economy needs coal or not economy needs beer
+return=skipped unless economy needs coal
 consume=beer meal
 animate=working 18000
 mine=coal 2 100 5 2

=== modified file 'tribes/empire/deep_goldmine/conf'
--- tribes/empire/deep_goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/deep_goldmine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=goldore
 
+[aihints]
+mines=gold
+
 [enhancement_cost]
 log=4
 wood=2
@@ -15,9 +18,6 @@
 master-miner=1
 miner=1
 
-[aihints]
-mines=gold
-
 [inputs]
 meal=6
 wine=6
@@ -27,8 +27,7 @@
 
 [work]
 sleep=43000
-return=skipped unless economy needs goldore or not economy needs meal
-return=skipped unless economy needs goldore or not economy needs wine
+return=skipped unless economy needs goldore
 consume=meal wine
 animate=working 18000
 mine=gold 2 100 5 2

=== modified file 'tribes/empire/deep_marblemine/conf'
--- tribes/empire/deep_marblemine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/deep_marblemine/conf	2014-07-28 14:34:07 +0000
@@ -4,6 +4,9 @@
 output=marble
 output=stone
 
+[aihints]
+mines=granite
+
 [enhancement_cost]
 log=4
 wood=2
@@ -16,9 +19,6 @@
 master-miner=1
 miner=1
 
-[aihints]
-mines=granite
-
 [inputs]
 meal=6
 wine=6
@@ -28,6 +28,7 @@
 
 [work]
 sleep=43000
+return=skipped unless economy needs marble or economy needs stone
 consume=meal wine
 animate=working 18000
 mine=granite 2 100 5 2

=== modified file 'tribes/empire/deep_oremine/conf'
--- tribes/empire/deep_oremine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/deep_oremine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,9 @@
 enhanced_building=yes
 output=ironore
 
+[aihints]
+mines=iron
+
 [enhancement_cost]
 log=4
 wood=2
@@ -15,9 +18,6 @@
 master-miner=1
 miner=1
 
-[aihints]
-mines=iron
-
 [inputs]
 meal=6
 beer=6
@@ -27,8 +27,7 @@
 
 [work]
 sleep=43000
-return=skipped unless economy needs ironore or not economy needs meal
-return=skipped unless economy needs ironore or not economy needs beer
+return=skipped unless economy needs ironore
 consume=meal beer
 animate=working 18000
 mine=iron 2 100 5 2

=== modified file 'tribes/empire/fire_tongs/conf'
--- tribes/empire/fire_tongs/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/fire_tongs/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Fire tongs are tools of the smelter, who works in the smelting works. They are produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=5 5

=== modified file 'tribes/empire/fish/conf'
--- tribes/empire/fish/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/fish/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Besides bread and meat, fish is also a foodstuff for the Empire. Fish are used in taverns, inns and training sites (arena, colosseum, training camp).
 
+default_target_quantity=20 # currently not used
 preciousness=3
 
 [idle]

=== modified file 'tribes/empire/fishers_house/conf'
--- tribes/empire/fishers_house/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/fishers_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=fish
 
+[aihints]
+build_material=false
+needs_water=true
+
 [buildcost]
 log=1
 wood=1
@@ -12,10 +16,6 @@
 [working positions]
 fisher=1
 
-[aihints]
-build_material=false
-needs_water=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/empire/fishing_rod/conf'
--- tribes/empire/fishing_rod/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/fishing_rod/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_Fishing rods are needed by fishers, to catch fish. Produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=4 5

=== modified file 'tribes/empire/foresters_house/conf'
--- tribes/empire/foresters_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/foresters_house/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,9 @@
 size=small
 
+[aihints]
+space_consumer=true
+renews_map_resource=log
+
 [buildcost]
 log=1
 wood=1
@@ -12,10 +16,6 @@
 [working positions]
 forester=1
 
-[aihints]
-space_consumer=true
-renews_map_resource=log
-
 [programs]
 work=_Work
 

=== modified file 'tribes/empire/fortress/conf'
--- tribes/empire/fortress/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/fortress/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,10 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the fortress.
 defeated_you_string=_Your soldiers defeated the enemy at the fortress.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
 
 [buildcost]
 wood=5
@@ -32,8 +36,3 @@
 [build]
 pics=fortress_b_??.png
 hotspot=90 105
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true

=== modified file 'tribes/empire/gold/conf'
--- tribes/empire/gold/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/gold/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Gold is the most valuable of all metals; armor and weapons are embellished with it. It is produced in the smelting works out of gold ore and processed in the armor smithy and the weapon smithy.
 
+default_target_quantity=20
 preciousness=2
-default_target_quantity=10
 
 [idle]
 pics=idle.png

=== modified file 'tribes/empire/goldmine/conf'
--- tribes/empire/goldmine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/goldmine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,11 @@
 output=goldore
 enhancement=deep_goldmine
 
+[aihints]
+build_material=false
+mines=gold
+mines_percent=50
+
 [buildcost]
 log=4
 wood=2
@@ -13,11 +18,6 @@
 [working positions]
 miner=1
 
-[aihints]
-build_material=false
-mines=gold
-mines_percent=50
-
 [inputs]
 ration=6
 wine=6
@@ -27,8 +27,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs goldore or not economy needs ration
-return=skipped unless economy needs goldore or not economy needs wine
+return=skipped unless economy needs goldore
 consume=ration wine
 animate=working 20000
 mine=gold 2 50 5 17

=== modified file 'tribes/empire/goldore/conf'
--- tribes/empire/goldore/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/goldore/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Gold ore is mined in a goldmine. Smelted in a smelting works, it turns into gold which is used as a precious building material and to produce weapons and armor.
 
+default_target_quantity=15
 preciousness=2
 
 [idle]

=== modified file 'tribes/empire/grape/conf'
--- tribes/empire/grape/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/grape/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_These grapes are the base for a tasty wine. They are harvested in a vineyard and processed in a winery.
 
+default_target_quantity=20 # currently not used
 preciousness=2
 
 [idle]

=== modified file 'tribes/empire/hammer/conf'
--- tribes/empire/hammer/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/hammer/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,5 @@
 help=_The hammer is an essential tool. It is needed by geologists, builders, weaponsmiths and armorsmiths. Make sure you always got some in reserve! It is produced by the toolsmith.
+
 default_target_quantity=2
 preciousness=1
 

=== modified file 'tribes/empire/heavy_lance/conf'
--- tribes/empire/heavy_lance/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/heavy_lance/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,6 @@
 help=_This is a strong lance with a steel-tip and a little blade. It is produced in the weapon smithy and used in the training camp – together with food – train soldiers from attack level 2 to level 3.
+
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/helm/conf'
--- tribes/empire/helm/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/helm/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,6 @@
 help=_The helmet is the basic defense of a warrior. It is produced in an armor smithy. In combination with a wood lance, it is the equipment to fit out young soldiers. Helmets are also used in training camps – together with food – to train soldiers from health level 0 to level 1.
 
-
-
-default_target_quantity=15
+default_target_quantity=30
 preciousness=2
 
 [idle]

=== modified file 'tribes/empire/hunters_house/conf'
--- tribes/empire/hunters_house/conf	2014-07-20 21:23:10 +0000
+++ tribes/empire/hunters_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=small
 output=meat
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=1
 wood=1
@@ -9,9 +12,6 @@
 [return_on_dismantle]
 stone=1
 
-[aihints]
-build_material=false
-
 [working positions]
 hunter=1
 

=== modified file 'tribes/empire/hunting_spear/conf'
--- tribes/empire/hunting_spear/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/hunting_spear/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This spear is light enough to be thrown, but heavy enough to kill any animal in one blow. It is only used by hunters.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 5

=== modified file 'tribes/empire/ironore/conf'
--- tribes/empire/ironore/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/ironore/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Iron ore needs to be smelted in the smelting works to yield iron. Iron ore is produced in iron mines.
 
+default_target_quantity=15
 preciousness=4
 
 [idle]

=== modified file 'tribes/empire/kitchen_tools/conf'
--- tribes/empire/kitchen_tools/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/kitchen_tools/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_How can one create a ration or meal if there are no kitchen tools? They are produced in a toolsmithy and used in taverns and inns.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=8 8

=== modified file 'tribes/empire/lance/conf'
--- tribes/empire/lance/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/lance/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_This lance has an iron spike. It is produced in a weapon smithy and used in a training camp – together with food – to train soldiers from attack level 0 to attack level 1.
 
+default_target_quantity=1
 preciousness=0
 
 [idle]

=== modified file 'tribes/empire/log/conf'
--- tribes/empire/log/conf	2014-03-15 11:54:07 +0000
+++ tribes/empire/log/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 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.
 
-
+default_target_quantity=40
 preciousness=14
-default_target_quantity=40
 
 [idle]
 pics=idle.png

=== modified file 'tribes/empire/lumberjacks_house/conf'
--- tribes/empire/lumberjacks_house/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/lumberjacks_house/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=log
 
+[aihints]
+is_basic=true
+logproducer=true
+
 [buildcost]
 log=2
 wood=1
@@ -12,10 +16,6 @@
 [working positions]
 lumberjack=1
 
-[aihints]
-is_basic=true
-logproducer=true
-
 [programs]
 work=_Work
 

=== modified file 'tribes/empire/marble/conf'
--- tribes/empire/marble/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/marble/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Marble is the beautiful stone which is cut out of the mountains or produced in a quarry. Marble is used as building material and gets chiselled into marble columns in the stonemason’s house.
 
+default_target_quantity=30
 preciousness=3
 
 [idle]

=== modified file 'tribes/empire/marblecolumn/conf'
--- tribes/empire/marblecolumn/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/marblecolumn/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Marble columns represent the high culture of the Empire, so they are needed for nearly every larger building. They are produced out of marble at a stonemason’s house.
 
-default_target_quantity=4
+default_target_quantity=10
 preciousness=5
 
 [idle]

=== modified file 'tribes/empire/marblemine/conf'
--- tribes/empire/marblemine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/marblemine/conf	2014-07-28 14:34:07 +0000
@@ -3,6 +3,11 @@
 output=stone
 enhancement=deep_marblemine
 
+[aihints]
+mines=granite
+mines_percent=50
+marbleproducer=true
+
 [buildcost]
 log=4
 wood=2
@@ -14,11 +19,6 @@
 [working positions]
 miner=1
 
-[aihints]
-mines=granite
-mines_percent=50
-marbleproducer=true
-
 [inputs]
 ration=6
 wine=6
@@ -30,6 +30,7 @@
 
 [mine_marble]
 sleep=20000
+return=skipped unless economy needs marble or economy needs stone
 consume=wine ration
 animate=working 20000
 mine=granite 2 50 5 17
@@ -40,6 +41,7 @@
 
 [mine_stone]
 sleep=20000
+return=skipped unless economy needs marble or economy needs stone
 consume=ration wine
 animate=working 20000
 mine=granite 2 50 5 17

=== modified file 'tribes/empire/meat/conf'
--- tribes/empire/meat/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/meat/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,6 @@
 help=_Meat contains a lot of energy. It is used in the inns and taverns to prepare lunch for the miners and is consumed at the training sites (arena, colosseum, training camp). There are two sources of meat: pork from piggeries and the meat of wild game hunted by the hunters. 
 
-
-default_target_quantity=15
+default_target_quantity=20
 preciousness=2
 
 [idle]

=== modified file 'tribes/empire/mill/conf'
--- tribes/empire/mill/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/mill/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=medium
 output=flour
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=3
 stone=3
@@ -11,9 +14,6 @@
 stone=2
 marble=1
 
-[aihints]
-build_material=false
-
 [working positions]
 miller=1
 
@@ -25,17 +25,17 @@
 
 [work]
 sleep=5000
-return=skipped unless economy needs flour or not economy needs wheat
+return=skipped unless economy needs flour
 consume=wheat
 playFX=../../../sound/mill/mill_turning 240
 animate=working 10000
 produce=flour
 
 [idle]
-pics=windmill_i_??.png  # ???
+pics=mill_i_??.png  # ???
 hotspot=41 87
 
 [working]
-pics=windmill_w_??.png  # lets see the mill turn!
+pics=mill_w_??.png  # lets see the mill turn!
 hotspot=41 87
 fps=25

=== renamed file 'tribes/empire/mill/windmill_i_00.png' => 'tribes/empire/mill/mill_i_00.png'
=== renamed file 'tribes/empire/mill/windmill_i_00_pc.png' => 'tribes/empire/mill/mill_i_00_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_00.png' => 'tribes/empire/mill/mill_w_00.png'
=== renamed file 'tribes/empire/mill/windmill_w_00_pc.png' => 'tribes/empire/mill/mill_w_00_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_01.png' => 'tribes/empire/mill/mill_w_01.png'
=== renamed file 'tribes/empire/mill/windmill_w_01_pc.png' => 'tribes/empire/mill/mill_w_01_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_02.png' => 'tribes/empire/mill/mill_w_02.png'
=== renamed file 'tribes/empire/mill/windmill_w_02_pc.png' => 'tribes/empire/mill/mill_w_02_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_03.png' => 'tribes/empire/mill/mill_w_03.png'
=== renamed file 'tribes/empire/mill/windmill_w_03_pc.png' => 'tribes/empire/mill/mill_w_03_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_04.png' => 'tribes/empire/mill/mill_w_04.png'
=== renamed file 'tribes/empire/mill/windmill_w_04_pc.png' => 'tribes/empire/mill/mill_w_04_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_05.png' => 'tribes/empire/mill/mill_w_05.png'
=== renamed file 'tribes/empire/mill/windmill_w_05_pc.png' => 'tribes/empire/mill/mill_w_05_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_06.png' => 'tribes/empire/mill/mill_w_06.png'
=== renamed file 'tribes/empire/mill/windmill_w_06_pc.png' => 'tribes/empire/mill/mill_w_06_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_07.png' => 'tribes/empire/mill/mill_w_07.png'
=== renamed file 'tribes/empire/mill/windmill_w_07_pc.png' => 'tribes/empire/mill/mill_w_07_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_08.png' => 'tribes/empire/mill/mill_w_08.png'
=== renamed file 'tribes/empire/mill/windmill_w_08_pc.png' => 'tribes/empire/mill/mill_w_08_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_09.png' => 'tribes/empire/mill/mill_w_09.png'
=== renamed file 'tribes/empire/mill/windmill_w_09_pc.png' => 'tribes/empire/mill/mill_w_09_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_10.png' => 'tribes/empire/mill/mill_w_10.png'
=== renamed file 'tribes/empire/mill/windmill_w_10_pc.png' => 'tribes/empire/mill/mill_w_10_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_11.png' => 'tribes/empire/mill/mill_w_11.png'
=== renamed file 'tribes/empire/mill/windmill_w_11_pc.png' => 'tribes/empire/mill/mill_w_11_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_12.png' => 'tribes/empire/mill/mill_w_12.png'
=== renamed file 'tribes/empire/mill/windmill_w_12_pc.png' => 'tribes/empire/mill/mill_w_12_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_13.png' => 'tribes/empire/mill/mill_w_13.png'
=== renamed file 'tribes/empire/mill/windmill_w_13_pc.png' => 'tribes/empire/mill/mill_w_13_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_14.png' => 'tribes/empire/mill/mill_w_14.png'
=== renamed file 'tribes/empire/mill/windmill_w_14_pc.png' => 'tribes/empire/mill/mill_w_14_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_15.png' => 'tribes/empire/mill/mill_w_15.png'
=== renamed file 'tribes/empire/mill/windmill_w_15_pc.png' => 'tribes/empire/mill/mill_w_15_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_16.png' => 'tribes/empire/mill/mill_w_16.png'
=== renamed file 'tribes/empire/mill/windmill_w_16_pc.png' => 'tribes/empire/mill/mill_w_16_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_17.png' => 'tribes/empire/mill/mill_w_17.png'
=== renamed file 'tribes/empire/mill/windmill_w_17_pc.png' => 'tribes/empire/mill/mill_w_17_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_18.png' => 'tribes/empire/mill/mill_w_18.png'
=== renamed file 'tribes/empire/mill/windmill_w_18_pc.png' => 'tribes/empire/mill/mill_w_18_pc.png'
=== renamed file 'tribes/empire/mill/windmill_w_19.png' => 'tribes/empire/mill/mill_w_19.png'
=== renamed file 'tribes/empire/mill/windmill_w_19_pc.png' => 'tribes/empire/mill/mill_w_19_pc.png'
=== modified file 'tribes/empire/oremine/conf'
--- tribes/empire/oremine/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/oremine/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,11 @@
 output=ironore
 enhancement=deep_oremine
 
+[aihints]
+build_material=false
+mines=iron
+mines_percent=50
+
 [buildcost]
 log=4
 wood=2
@@ -13,11 +18,6 @@
 [working positions]
 miner=1
 
-[aihints]
-build_material=false
-mines=iron
-mines_percent=50
-
 [inputs]
 ration=6
 beer=6
@@ -27,8 +27,7 @@
 
 [work]
 sleep=45000
-return=skipped unless economy needs ironore or not economy needs ration
-return=skipped unless economy needs ironore or not economy needs beer
+return=skipped unless economy needs ironore
 consume=ration beer
 animate=working 20000
 mine=iron 2 50 5 17

=== modified file 'tribes/empire/outpost/conf'
--- tribes/empire/outpost/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/outpost/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,8 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the outpost.
 defeated_you_string=_Your soldiers defeated the enemy at the outpost.
 
+[aihints]
+expansion=true
 
 [buildcost]
 log=1
@@ -24,6 +26,3 @@
 [idle]
 pics=outpost_i_??.png
 hotspot=57 77
-
-[aihints]
-expansion=true

=== modified file 'tribes/empire/pick/conf'
--- tribes/empire/pick/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/pick/conf	2014-07-28 14:34:07 +0000
@@ -1,4 +1,5 @@
 help=_This pick is used by the stonemasons and the miners. It is produced by the toolsmith.
+
 default_target_quantity=2
 preciousness=1
 

=== modified file 'tribes/empire/piggery/conf'
--- tribes/empire/piggery/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/piggery/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,9 @@
 size=big
 output=meat
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=2
 stone=2
@@ -11,9 +14,6 @@
 stone=1
 marble=1
 
-[aihints]
-build_material=false
-
 [working positions]
 pig-breeder=1
 
@@ -26,8 +26,7 @@
 
 [work]
 sleep=25000
-return=skipped unless economy needs meat or not economy needs water
-return=skipped unless economy needs meat or not economy needs wheat
+return=skipped unless economy needs meat
 consume=water wheat
 playFX=../../../sound/farm/farm_animal 180
 animate=working 30000

=== modified file 'tribes/empire/plate_armor/conf'
--- tribes/empire/plate_armor/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/plate_armor/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_The plate armor is the strongest armor an Empire soldier can have. It is produced in the armor smithy and used in the training camp – together with food – to train soldiers from health level 3 to level 4.
 
-
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/port/conf'
--- tribes/empire/port/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/port/conf	2014-07-28 14:34:07 +0000
@@ -19,11 +19,11 @@
 cloth=1
 gold=1
 
-[build]
-pics=port_b_??.png  # 4 frames
-hotspot=74 96
-
 [idle]
 pics=port_i_??.png  # 20 frames
 hotspot=74 96
 fps=10
+
+[build]
+pics=port_b_??.png  # 4 frames
+hotspot=74 96

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/quarry/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,10 @@
 output=stone
 output=marble
 
+[aihints]
+is_basic=true
+stoneproducer=true
+
 [buildcost]
 log=2
 wood=1
@@ -12,10 +16,6 @@
 [working positions]
 stonemason=1
 
-[aihints]
-is_basic=true
-stoneproducer=true
-
 [programs]
 mine_stone=_Mine stone
 mine_marble=_Mine marble

=== modified file 'tribes/empire/ration/conf'
--- tribes/empire/ration/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/ration/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,5 @@
 help=_A small bite to keep miners strong and working. Rations are also consumed by the scout on his scouting trips. They are produced in a tavern out of fish or meat or bread.
 
-
 default_target_quantity=20
 preciousness=5
 

=== modified file 'tribes/empire/saw/conf'
--- tribes/empire/saw/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/saw/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_This saw is needed by the sawyer. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=7 5

=== modified file 'tribes/empire/scouts_house/conf'
--- tribes/empire/scouts_house/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/scouts_house/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,8 @@
 size=small
 
+[aihints]
+build_material=false
+
 [buildcost]
 log=2
 stone=1
@@ -7,9 +10,6 @@
 [return_on_dismantle]
 log=1
 
-[aihints]
-build_material=false
-
 [working positions]
 scout=1
 

=== modified file 'tribes/empire/scythe/conf'
--- tribes/empire/scythe/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/scythe/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The Scythe is the tool of the farmer. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=6 2

=== modified file 'tribes/empire/sentry/conf'
--- tribes/empire/sentry/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/sentry/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,10 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the sentry.
 defeated_you_string=_Your soldiers defeated the enemy at the sentry.
 
+[aihints]
+expansion=true
+fighting=true
+mountain_conqueror=true
 
 [buildcost]
 wood=1
@@ -30,8 +34,3 @@
 [idle]
 pics=sentry_i_??.png
 hotspot=37 60
-
-[aihints]
-expansion=true
-fighting=true
-mountain_conqueror=true

=== modified file 'tribes/empire/shovel/conf'
--- tribes/empire/shovel/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/shovel/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,7 @@
 help=_The shovel is needed for the proper handling of plants. Therefore the forester and the vinefarmer use it. It is produced by the toolsmith.
 
+default_target_quantity=1
+
 [idle]
 pics=idle.png
 hotspot=4 5

=== modified file 'tribes/empire/smelting_works/conf'
--- tribes/empire/smelting_works/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/smelting_works/conf	2014-07-28 14:34:07 +0000
@@ -47,14 +47,14 @@
 call=smelt_iron
 return=skipped
 
+[idle]
+pics=smelting_works_i_??.png  # ???
+hotspot=39 53
+
 [build]
 pics=smelting_works_b_??.png  # ???
 hotspot=39 53
 
-[idle]
-pics=smelting_works_i_??.png  # ???
-hotspot=39 53
-
 [working]
 pics=smelting_works_w_??.png  # ???
 hotspot=39 53

=== modified file 'tribes/empire/stone/conf'
--- tribes/empire/stone/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/stone/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_Stones are a basic building material of the Empire. They are produced in quarries and marble mines.
 
-preciousness=10
+preciousness=30
 
 # The roman workers know how to work on stones.
 # These stones will last for long time.

=== modified file 'tribes/empire/tavern/conf'
--- tribes/empire/tavern/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/tavern/conf	2014-07-28 14:34:07 +0000
@@ -2,6 +2,10 @@
 output=ration
 enhancement=inn
 
+[aihints]
+build_material=false
+is_food_basic=true
+
 [buildcost]
 wood=2
 stone=2
@@ -12,10 +16,6 @@
 stone=1
 marble=1
 
-[aihints]
-build_material=false
-is_food_basic=true
-
 [working positions]
 innkeeper=1
 

=== modified file 'tribes/empire/toolsmithy/conf'
--- tribes/empire/toolsmithy/conf	2014-07-15 10:02:22 +0000
+++ tribes/empire/toolsmithy/conf	2014-07-28 14:34:07 +0000
@@ -12,6 +12,10 @@
 output=basket
 output=saw
 
+[aihints]
+build_material=false
+is_basic=true
+
 [buildcost]
 log=1
 stone=2
@@ -22,10 +26,6 @@
 stone=1
 marble=2
 
-[aihints]
-build_material=false
-is_basic=true
-
 [working positions]
 toolsmith=1
 
@@ -34,20 +34,36 @@
 log=8
 
 [programs]
+produce_ax=_Produce ax
+produce_basket=_Produce basket
 produce_bread_paddle=_Produce bread paddle
 produce_fire_tongs=_Produce fire tongs
 produce_fishing_rod=_Produce fishing rod
 produce_hammer=_Produce hammer
+produce_hunting_spear=_Produce hunting spear
 produce_kitchen_tools=_Produce kitchen tools
 produce_pick=_Produce pick
+produce_saw=_Produce saw
 produce_scythe=_Produce scythe
 produce_shovel=_Produce shovel
-produce_hunting_spear=_Produce hunting spear
-produce_basket=_Produce basket
-produce_saw=_Produce saw
-produce_ax=_Produce ax
 work=_Work
 
+[produce_ax]
+return=skipped unless economy needs ax
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=ax
+
+[produce_basket]
+return=skipped unless economy needs basket
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=basket
+
 [produce_bread_paddle]
 return=skipped unless economy needs bread_paddle
 sleep=32000
@@ -80,6 +96,14 @@
 animate=working 35000
 produce=hammer
 
+[produce_hunting_spear]
+return=skipped unless economy needs hunting_spear
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=hunting_spear
+
 [produce_kitchen_tools]
 return=skipped unless economy needs kitchen_tools
 sleep=32000
@@ -96,6 +120,14 @@
 animate=working 35000
 produce=pick
 
+[produce_saw]
+return=skipped unless economy needs saw
+sleep=32000
+consume=iron log
+playFX=../../../sound/smiths/toolsmith 192
+animate=working 35000
+produce=saw
+
 [produce_scythe]
 return=skipped unless economy needs scythe
 sleep=32000
@@ -112,51 +144,19 @@
 animate=working 35000
 produce=shovel
 
-[produce_hunting_spear]
-return=skipped unless economy needs hunting_spear
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=hunting_spear
-
-[produce_basket]
-return=skipped unless economy needs basket
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=basket
-
-[produce_saw]
-return=skipped unless economy needs saw
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=saw
-
-[produce_ax]
-return=skipped unless economy needs ax
-sleep=32000
-consume=iron log
-playFX=../../../sound/smiths/toolsmith 192
-animate=working 35000
-produce=ax
-
 [work]
+call=produce_ax
+call=produce_basket
 call=produce_bread_paddle
 call=produce_fire_tongs
 call=produce_fishing_rod
 call=produce_hammer
+call=produce_hunting_spear
 call=produce_kitchen_tools
 call=produce_pick
+call=produce_saw
 call=produce_scythe
 call=produce_shovel
-call=produce_hunting_spear
-call=produce_basket
-call=produce_saw
-call=produce_ax
 return=skipped
 
 [idle]

=== modified file 'tribes/empire/tower/conf'
--- tribes/empire/tower/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/tower/conf	2014-07-28 14:34:07 +0000
@@ -10,6 +10,8 @@
 defeated_enemy_string=_The enemy defeated your soldiers at the tower.
 defeated_you_string=_Your soldiers defeated the enemy at the tower.
 
+[aihints]
+mountain_conqueror=true
 
 [buildcost]
 log=2
@@ -29,6 +31,3 @@
 [build]
 pics=tower_b_??.png
 hotspot=53 81
-
-[aihints]
-mountain_conqueror=true

=== modified file 'tribes/empire/war_lance/conf'
--- tribes/empire/war_lance/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/war_lance/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_This is the best and sharpest weapon the Empire weaponsmith creates for the warriors. It is used in the training camp – together with food – to train soldiers from attack level 3 to level 4.
 
+default_target_quantity=1
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/water/conf'
--- tribes/empire/water/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/water/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,7 @@
 help=_Water is the essence of life! It is used in the bakery and the brewery. The donkey farm, the sheep farm and the piggery also need to be supplied with water.
 
+default_target_quantity=25 # currently not used
 preciousness=7
-default_target_quantity=25
 
 [idle]
 pics=water_idle.png

=== modified file 'tribes/empire/weaving-mill/conf'
--- tribes/empire/weaving-mill/conf	2014-07-14 10:45:44 +0000
+++ tribes/empire/weaving-mill/conf	2014-07-28 14:34:07 +0000
@@ -26,6 +26,10 @@
 animate=working 15000 # unsure of balancing CW
 produce=cloth
 
+[idle]
+pics=weaving_mill_i_??.png  # ???
+hotspot=65 62
+
 [build]
 pics=weaving_mill_b_??.png  # ???
 hotspot=65 62
@@ -34,10 +38,6 @@
 pics=weaving_mill_u_??.png  # ???
 hotspot=65 62
 
-[idle]
-pics=weaving_mill_i_??.png  # ???
-hotspot=65 62
-
 [working]
 pics=weaving_mill_w_??.png  # ???
 hotspot=65 62

=== modified file 'tribes/empire/well/conf'
--- tribes/empire/well/conf	2014-07-21 09:30:12 +0000
+++ tribes/empire/well/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,10 @@
 size=small
 output=water
 
+[aihints]
+build_material=false
+mines_water=true
+
 [buildcost]
 log=2
 stone=1
@@ -10,10 +14,6 @@
 log=1
 marble=1
 
-[aihints]
-build_material=false
-mines_water=true
-
 [working positions]
 carrier=1
 

=== modified file 'tribes/empire/wheat/conf'
--- tribes/empire/wheat/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/wheat/conf	2014-07-28 14:34:07 +0000
@@ -1,8 +1,7 @@
 help=_Wheat is essential for surviving. It is produced by farms and used by mills and breweries. Donkey farms, sheep farms and piggeries also need to be supplied with wheat.
 
-
+default_target_quantity=25 # currently not used
 preciousness=12
-default_target_quantity=25
 
 [idle]
 pics=wheat_idle.png

=== modified file 'tribes/empire/wine/conf'
--- tribes/empire/wine/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/wine/conf	2014-07-28 14:34:07 +0000
@@ -1,6 +1,6 @@
 help=_This tasty wine is drunk by the miners working the marble and gold mines. It is produced in a winery. 
 
-default_target_quantity=10
+default_target_quantity=20 # currently not used
 preciousness=2
 
 [idle]

=== modified file 'tribes/empire/wood/conf'
--- tribes/empire/wood/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/wood/conf	2014-07-28 14:34:07 +0000
@@ -3,9 +3,6 @@
 default_target_quantity=40
 preciousness=7
 
-# These are planks created out of logs.
-# The roman sawmiller know exactly, howto cut the logs.
-
 [idle]
 pics=idle.png
 hotspot=10 12

=== modified file 'tribes/empire/wood_lance/conf'
--- tribes/empire/wood_lance/conf	2014-03-16 20:55:15 +0000
+++ tribes/empire/wood_lance/conf	2014-07-28 14:34:07 +0000
@@ -1,7 +1,6 @@
 help=_This wooden lance is the basic weapon in the Empire military system. It is produced in the weapon smithy. In combination with a helmet, it is the equipment to fit out young soldiers.
 
-
-default_target_quantity=15
+default_target_quantity=30
 preciousness=1
 
 [idle]

=== modified file 'tribes/empire/wool/conf'
--- tribes/empire/wool/conf	2013-07-23 19:04:12 +0000
+++ tribes/empire/wool/conf	2014-07-28 14:34:07 +0000
@@ -1,5 +1,6 @@
 help=_Wool is the hair of sheep. Weaving mills use it to make cloth.
-default_target_quantity=4
+
+default_target_quantity=10
 preciousness=2
 
 [idle]