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

[cghislai]

Some issues were raised in the bug report with the current handling of skip conditions.
I reverted them to the opposite. I tested some game and it doesn't seem to cause any issue. If needed this can easily be reverted during the release candidate cycles.

I also increased the default target quantities of some essential wares.

[SirVer (sirver)]

Peter (Nasenbaer), could you review this?

[Nasenbaer (nasenbaer)]

I am between "Approve" and "Needs fixing" therefore I set it "Needs information"

"Approve", because the patch is fine as it is and if you (and nobody else) want to do the job described below, we can just merge it as it is

"Needs fixing" because as we change the "skipped" parts, we should improve the performance of those checks as well and there is quite some room for improvement :)

E.g. file 'tribes/atlanteans/coalmine/conf':
return=skipped unless economy needs coal or not economy needs bread
return=skipped unless economy needs coal or not economy needs smoked_fish

equals
return=skipped unless economy needs coal or not economy needs bread
return=skipped unless not economy needs smoked_fish

difference is, that Widelands won't doublecheck whether the economy needs coal, which (even if little) costs a bit of performance - the more production sites are running the more performance...

cghislai, do you take this task? :)

review: Needs Information

[cghislai (charlyghislain)]

I knew it would be spotted :)
sed is not smarted than its user... ill fix that

[Nasenbaer (nasenbaer)]

Oh me... I hope I was the first who found my own error ;)
Of course
return=skipped unless economy needs coal or not economy needs bread
return=skipped unless economy needs coal or not economy needs smoked_fish

equals
return=skipped unless economy needs coal or not economy needs bread
return=skipped unless not economy needs smoked_fish

is not equal... :(

I merge your branch... oh my I am a double work generation machine.
Hope you did not put to much work already in it.
I guess I owe you a beer or coffee :)

review: Approve

[cghislai (charlyghislain)]

Ah, you merged already
I am pretty sure that it IS equal, but anyway in the last commit I put a when condition, as its more readable.
The best imho would be to put the 3 lines separatelty and only and complex conditions if it is really needed.

[Nasenbaer (nasenbaer)]

well it is not equal because:
* take the case where coal is needed, but at least the economy needs smoked_fish (bread does not matter in that case)

return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal
return=skipped unless not economy needs smoked_fish -> no skip because of coal

return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal
return=skipped unless not economy needs smoked_fish -> skipped because smoked_fish is needed

the only real equivalent would be:

return=skipped unless economy needs coal or not economy needs bread or not economy needs smoked_fish

but I do not know if that is accepted by the Widelands skip logic - if yes, that would be a real alternative because it would reduce the number of checks maximally :)

[Nasenbaer (nasenbaer)]

I go to bed... worked to long ;) the FIRST is of course

return=skipped unless economy needs coal or not economy needs bread -> no skip because of coal
return=skipped unless economy needs coal or not economy needs smoked_fish -> no skip because of coal

[cghislai (charlyghislain)]

Ah yeah you are right. I prefer it this way as well because it is easier to revert back to the and condition if needed

=== modified file 'tribes/atlanteans/burners_house/conf'
--- tribes/atlanteans/burners_house/conf	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/burners_house/conf	2013-07-14 21:49:27 +0000
@@ -19,7 +19,7 @@
 work=_Work
 
 [work]
-return=skipped when economy needs trunk and not economy needs coal
+return=skipped unless economy needs coal or not economy needs trunk
 consume=trunk:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 
=== modified file 'tribes/atlanteans/coalmine/conf'
--- tribes/atlanteans/coalmine/conf	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/coalmine/conf	2013-07-14 21:49:27 +0000
@@ -21,8 +21,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs bread and not economy needs coal
-return=skipped when economy needs smoked_fish and not economy needs coal
+return=skipped unless economy needs coal or not economy needs bread
+return=skipped unless economy needs coal or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
 
=== modified file 'tribes/atlanteans/crystalmine/conf'
--- tribes/atlanteans/crystalmine/conf	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/crystalmine/conf	2013-07-14 21:49:27 +0000
@@ -26,8 +26,8 @@
 work=_Work
 
 [mine_stone]
-return=skipped when economy needs bread and not economy needs stone
-return=skipped when economy needs smoked_fish and not economy needs stone
+return=skipped unless economy needs stone or not economy needs bread
+return=skipped unless economy needs stone or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
@@ -44,8 +44,8 @@
 produce=quartz
 
 [mine_quartz]
-return=skipped when economy needs bread and not economy needs quartz
-return=skipped when economy needs smoked_fish and not economy needs quartz
+return=skipped unless economy needs quartz or not economy needs bread
+return=skipped unless economy needs quartz or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
@@ -59,8 +59,8 @@
 produce=quartz:2
 
 [mine_diamond]
-return=skipped when economy needs bread and not economy needs diamond
-return=skipped when economy needs smoked_fish and not economy needs diamond
+return=skipped unless economy needs diamond or not economy needs bread
+return=skipped unless economy needs diamond or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
 
=== modified file 'tribes/atlanteans/goldmine/conf'
--- tribes/atlanteans/goldmine/conf	2011-09-12 17:29:32 +0000
+++ tribes/atlanteans/goldmine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs bread and not economy needs goldore
-return=skipped when economy needs smoked_fish and not economy needs goldore
+return=skipped unless economy needs goldore or not economy needs bread
+return=skipped unless economy needs goldore or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
 
=== modified file 'tribes/atlanteans/horsefarm/conf'
--- tribes/atlanteans/horsefarm/conf	2013-03-02 20:35:18 +0000
+++ tribes/atlanteans/horsefarm/conf	2013-07-14 21:49:27 +0000
@@ -21,8 +21,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs water and not economy needs horse
-return=skipped when economy needs corn and not economy needs horse
+return=skipped unless economy needs horse or not economy needs water
+return=skipped unless economy needs horse or not economy needs corn
 consume=corn water
 playFX=../../../sound/farm/horse 192
 animate=working 30000 # feeding cute little foals ;)
 
=== modified file 'tribes/atlanteans/ironmine/conf'
--- tribes/atlanteans/ironmine/conf	2012-02-15 21:25:34 +0000
+++ tribes/atlanteans/ironmine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs bread and not economy needs ironore
-return=skipped when economy needs smoked_fish and not economy needs ironore
+return=skipped unless economy needs ironore or not economy needs bread
+return=skipped unless economy needs ironore or not economy needs smoked_fish
 consume=smoked_fish,smoked_meat:2 bread:2
 sleep=45000
 animate=working 20000
 
=== modified file 'tribes/atlanteans/mill/conf'
--- tribes/atlanteans/mill/conf	2011-09-12 17:29:32 +0000
+++ tribes/atlanteans/mill/conf	2013-07-14 21:49:27 +0000
@@ -24,7 +24,7 @@
 
 [produce_cornflour]
 return=skipped when site has blackroot and economy needs blackrootflour and not economy needs cornflour
-return=skipped when economy needs corn and not economy needs cornflour
+return=skipped unless economy needs cornflour or not economy needs corn
 consume=corn
 sleep=3500
 animate=working 15000
 
=== modified file 'tribes/atlanteans/smokery/conf'
--- tribes/atlanteans/smokery/conf	2010-08-01 14:35:38 +0000
+++ tribes/atlanteans/smokery/conf	2013-07-14 21:49:27 +0000
@@ -27,14 +27,14 @@
 work=_Work
 
 [smoke_meat]
-return=skipped when economy needs trunk and not economy needs smoked_meat
+return=skipped unless economy needs smoked_meat or not economy needs trunk
 consume=meat:2 trunk
 sleep=30000
 animate=working 30000
 produce=smoked_meat:2
 
 [smoke_fish]
-return=skipped when economy needs trunk and not economy needs smoked_fish
+return=skipped unless economy needs smoked_fish or not economy needs trunk
 consume=fish:2 trunk
 sleep=30000
 animate=working 30000
 
=== modified file 'tribes/atlanteans/spiderfarm/conf'
--- tribes/atlanteans/spiderfarm/conf	2009-12-03 11:58:28 +0000
+++ tribes/atlanteans/spiderfarm/conf	2013-07-14 21:49:27 +0000
@@ -18,8 +18,8 @@
 
 [work]
 sleep=25000
-return=skipped when economy needs corn and not economy needs spideryarn
-return=skipped when economy needs water and not economy needs spideryarn
+return=skipped unless economy needs spideryarn or not economy needs corn
+return=skipped unless economy needs spideryarn or not economy needs water
 consume=corn water
 animate=working 30000
 produce=spideryarn
 
=== modified file 'tribes/atlanteans/spideryarn/conf'
--- tribes/atlanteans/spideryarn/conf	2010-11-02 12:13:56 +0000
+++ tribes/atlanteans/spideryarn/conf	2013-07-14 21:49:27 +0000
@@ -1,5 +1,6 @@
 help=_This yarn is produced by spiders, which are bred on spiderfarms. It is processed to spidercloth in a weaving-mill.
 
+default_target_quantity=10
 preciousness=2
 
 [idle]
 
=== modified file 'tribes/barbarians/bakery/conf'
--- tribes/barbarians/bakery/conf	2011-09-12 17:29:32 +0000
+++ tribes/barbarians/bakery/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 
 [work]
 sleep=20000
-return=skipped when economy needs water and not economy needs pittabread
-return=skipped when economy needs wheat and not economy needs pittabread
+return=skipped unless economy needs pittabread or not economy needs water
+return=skipped unless economy needs pittabread or not economy needs wheat
 consume=water:3 wheat:3
 animate=working 20000
 produce=pittabread
 
=== modified file 'tribes/barbarians/brewery/conf'
--- tribes/barbarians/brewery/conf	2011-09-12 17:29:32 +0000
+++ tribes/barbarians/brewery/conf	2013-07-14 21:49:27 +0000
@@ -20,8 +20,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs water and not economy needs strongbeer
-return=skipped when economy needs wheat and not economy needs strongbeer
+return=skipped unless economy needs strongbeer or not economy needs water
+return=skipped unless economy needs strongbeer or not economy needs wheat
 consume=water wheat
 sleep=30000
 animate=working 30000
 
=== modified file 'tribes/barbarians/burners_house/conf'
--- tribes/barbarians/burners_house/conf	2011-09-12 17:29:32 +0000
+++ tribes/barbarians/burners_house/conf	2013-07-14 21:49:27 +0000
@@ -19,7 +19,7 @@
 work=_Work
 
 [work]
-return=skipped when economy needs trunk and not economy needs coal
+return=skipped unless economy needs coal or not economy needs trunk
 consume=trunk:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 
=== modified file 'tribes/barbarians/cattlefarm/conf'
--- tribes/barbarians/cattlefarm/conf	2013-03-02 20:35:18 +0000
+++ tribes/barbarians/cattlefarm/conf	2013-07-14 21:49:27 +0000
@@ -21,8 +21,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs wheat and not economy needs ox
-return=skipped when economy needs water and not economy needs ox
+return=skipped unless economy needs ox or not economy needs wheat
+return=skipped unless economy needs ox or not economy needs water
 consume=wheat water
 playFX=../../../sound/farm/ox 192
 animate=working 30000 # animation of feeding the cattles
 
=== modified file 'tribes/barbarians/thatchreed/conf'
--- tribes/barbarians/thatchreed/conf	2010-11-02 12:13:56 +0000
+++ tribes/barbarians/thatchreed/conf	2013-07-14 21:49:27 +0000
@@ -1,5 +1,7 @@
 help=_Thatch reed is produced in a fernery and used to make the roofs of buildings waterproof.
+
 preciousness=5
+default_target_quantity=10
 
 # Reed is growing near by watersides.
 
 
=== modified file 'tribes/barbarians/weaving-mill/conf'
--- tribes/barbarians/weaving-mill/conf	2012-02-15 21:25:34 +0000
+++ tribes/barbarians/weaving-mill/conf	2013-07-14 21:49:27 +0000
@@ -19,7 +19,7 @@
 work=_Work
 
 [work]
-return=skipped when economy needs thatchreed and not economy needs cloth
+return=skipped unless economy needs cloth or not economy needs thatchreed
 animate=working 45000
 consume=thatchreed
 produce=cloth
 
=== modified file 'tribes/empire/brewery/conf'
--- tribes/empire/brewery/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/brewery/conf	2013-07-14 21:49:27 +0000
@@ -20,8 +20,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs water and not economy needs beer
-return=skipped when economy needs wheat and not economy needs beer
+return=skipped unless economy needs beer or not economy needs water
+return=skipped unless economy needs beer or not economy needs wheat
 consume=water wheat
 sleep=30000
 animate=working 30000
 
=== modified file 'tribes/empire/burners_house/conf'
--- tribes/empire/burners_house/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/burners_house/conf	2013-07-14 21:49:27 +0000
@@ -19,7 +19,7 @@
 work=_Work
 
 [work]
-return=skipped when economy needs trunk and not economy needs coal
+return=skipped unless economy needs coal or not economy needs trunk
 consume=trunk:6
 sleep=30000
 animate=working 90000 # charcoal fires are burning some days in real life
 
=== modified file 'tribes/empire/coalmine/conf'
--- tribes/empire/coalmine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/coalmine/conf	2013-07-14 21:49:27 +0000
@@ -21,8 +21,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs ration and not economy needs coal
-return=skipped when economy needs beer and not economy needs coal
+return=skipped unless economy needs coal or not economy needs ration
+return=skipped unless economy needs coal or not economy needs beer
 sleep=45000
 consume=beer ration
 animate=working 20000
 
=== modified file 'tribes/empire/deep_coalmine/conf'
--- tribes/empire/deep_coalmine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/deep_coalmine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs meal and not economy needs coal
-return=skipped when economy needs beer and not economy needs coal
+return=skipped unless economy needs coal or not economy needs meal
+return=skipped unless economy needs coal or not economy needs beer
 sleep=42000
 consume=beer meal
 animate=working 18000
 
=== modified file 'tribes/empire/deep_goldmine/conf'
--- tribes/empire/deep_goldmine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/deep_goldmine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs meal and not economy needs goldstone
-return=skipped when economy needs wine and not economy needs goldstone
+return=skipped unless economy needs goldstone or not economy needs meal
+return=skipped unless economy needs goldstone or not economy needs wine
 sleep=43000
 consume=meal wine
 animate=working 18000
 
=== modified file 'tribes/empire/deep_oremine/conf'
--- tribes/empire/deep_oremine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/deep_oremine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs meal and not economy needs ironore
-return=skipped when economy needs beer and not economy needs ironore
+return=skipped unless economy needs ironore or not economy needs meal
+return=skipped unless economy needs ironore or not economy needs beer
 sleep=43000
 consume=meal beer
 animate=working 18000
 
=== modified file 'tribes/empire/donkeyfarm/conf'
--- tribes/empire/donkeyfarm/conf	2013-03-02 20:35:18 +0000
+++ tribes/empire/donkeyfarm/conf	2013-07-14 21:49:27 +0000
@@ -21,8 +21,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs wheat and not economy needs donkey
-return=skipped when economy needs water and not economy needs donkey
+return=skipped unless economy needs donkey or not economy needs wheat
+return=skipped unless economy needs donkey or not economy needs water
 consume=wheat water
 playFX=../../../sound/farm/donkey 192
 animate=working 30000 # feeding cute little baby donkeys ;)
 
=== modified file 'tribes/empire/goldmine/conf'
--- tribes/empire/goldmine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/goldmine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs ration and not economy needs goldstone
-return=skipped when economy needs wine and not economy needs goldstone
+return=skipped unless economy needs goldstone or not economy needs ration
+return=skipped unless economy needs goldstone or not economy needs wine
 sleep=45000
 consume=ration wine
 animate=working 20000
 
=== modified file 'tribes/empire/mill/conf'
--- tribes/empire/mill/conf	2013-03-02 20:35:18 +0000
+++ tribes/empire/mill/conf	2013-07-14 21:49:27 +0000
@@ -19,7 +19,7 @@
 work=_Work
 
 [work]
-return=skipped when economy needs wheat and not economy needs flour
+return=skipped unless economy needs flour or not economy needs wheat
 consume=wheat
 sleep=5000
 playFX=../../../sound/mill/mill_turning 240
 
=== modified file 'tribes/empire/oremine/conf'
--- tribes/empire/oremine/conf	2011-09-02 12:36:04 +0000
+++ tribes/empire/oremine/conf	2013-07-14 21:49:27 +0000
@@ -22,8 +22,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs ration and not economy needs ironore
-return=skipped when economy needs beer and not economy needs ironore
+return=skipped unless economy needs ironore or not economy needs ration
+return=skipped unless economy needs ironore or not economy needs beer
 sleep=45000
 consume=ration beer
 animate=working 20000
 
=== modified file 'tribes/empire/piggery/conf'
--- tribes/empire/piggery/conf	2013-03-02 20:35:18 +0000
+++ tribes/empire/piggery/conf	2013-07-14 21:49:27 +0000
@@ -20,8 +20,8 @@
 work=_Work
 
 [work]
-return=skipped when economy needs water and not economy needs meat
-return=skipped when economy needs wheat and not economy needs meat
+return=skipped unless economy needs meat or not economy needs water
+return=skipped unless economy needs meat or not economy needs wheat
 sleep=25000
 consume=water wheat
 playFX=../../../sound/farm/farm_animal 180
 
=== modified file 'tribes/empire/wine/conf'
--- tribes/empire/wine/conf	2010-11-02 12:13:56 +0000
+++ tribes/empire/wine/conf	2013-07-14 21:49:27 +0000
@@ -1,6 +1,6 @@
 help=_This tasty wine is consumed in marble and gold mines. It is produced in a winery. 
 
-
+default_target_quantity=10
 preciousness=2
 
 [idle]