widelands-dev team mailing list archive

[toptopple <7010622@xxxxxx>]

toptopple has proposed merging lp:~7010622-q/widelands/topple-production-logic-2 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-2/+merge/301477

Modified LUA scripts for weapon- and armour-smithies of all races to omit all wait times for complex products if their resource restraints are not met. 

The effect of this is that all products which can be produced in a production run are produced without penalty times for products which cannot be produced due to resource shortage.


-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-production-logic-2 into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2016-07-29 11:40:20 +0000
@@ -76,8 +76,8 @@
          descname = _"forging an advanced shield",
          actions = {
             "return=skipped unless economy needs shield_advanced",
-            "sleep=32000",
             "consume=iron:2 coal:2 gold",
+            "sleep=32000",
             "animate=working 45000",
             "produce=shield_advanced"
          }

=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2016-07-07 09:58:30 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2016-07-29 11:40:20 +0000
@@ -87,8 +87,8 @@
          descname = _"forging a long trident",
          actions = {
             "return=skipped unless economy needs trident_long",
-            "sleep=32000",
             "consume=iron coal planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -101,8 +101,8 @@
          descname = _"forging a steel trident",
          actions = {
             "return=skipped unless economy needs trident_steel",
-            "sleep=32000",
             "consume=iron:2 coal planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -115,8 +115,8 @@
          descname = _"forging a double trident",
          actions = {
             "return=skipped unless economy needs trident_double",
-            "sleep=32000",
             "consume=iron coal:2 planks gold",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -129,8 +129,8 @@
          descname = _"forging a heavy double trident",
          actions = {
             "return=skipped unless economy needs trident_heavy_double",
-            "sleep=32000",
             "consume=iron:2 coal:2 planks gold",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",

=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2016-07-07 09:58:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua	2016-07-29 11:40:20 +0000
@@ -89,8 +89,8 @@
          descname = _"forging a sharp ax",
          actions = {
             "return=skipped unless economy needs ax_sharp",
-            "sleep=26000",
             "consume=coal iron:2",
+            "sleep=26000",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",
@@ -103,8 +103,8 @@
          descname = _"forging a broad ax",
          actions = {
             "return=skipped unless economy needs ax_broad",
-            "sleep=26000",
             "consume=coal:2 iron:2",
+            "sleep=26000",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",

=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua	2016-07-29 11:40:20 +0000
@@ -89,8 +89,8 @@
          descname = _"forging a mask",
          actions = {
             "return=skipped unless economy needs helmet_mask",
-            "sleep=32000",
             "consume=coal iron:2",
+            "sleep=32000",
             "animate=working 45000",
             "produce=helmet_mask"
          }
@@ -100,8 +100,8 @@
          descname = _"forging a warhelm",
          actions = {
             "return=skipped unless economy needs helmet_warhelm",
-            "sleep=32000",
             "consume=coal gold iron:2",
+            "sleep=32000",
             "animate=working 55000",
             "produce=helmet_warhelm"
          }

=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2016-07-08 18:02:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua	2016-07-29 11:40:20 +0000
@@ -96,8 +96,8 @@
          descname = _"forging a sharp ax",
          actions = {
             "return=skipped unless economy needs ax_sharp",
-            "sleep=26000",
             "consume=coal iron:2",
+            "sleep=26000",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",
@@ -110,8 +110,8 @@
          descname = _"forging a broad ax",
          actions = {
             "return=skipped unless economy needs ax_broad",
+            "consume=coal:2 iron:2",
             "sleep=26000",
-            "consume=coal:2 iron:2",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",
@@ -124,8 +124,8 @@
          descname = _"forging a bronze ax",
          actions = {
             "return=skipped unless economy needs ax_bronze",
+            "consume=coal:2 iron:2",
             "sleep=26000",
-            "consume=coal:2 iron:2",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",
@@ -138,8 +138,8 @@
          descname = _"forging a battle ax",
          actions = {
             "return=skipped unless economy needs ax_battle",
-            "sleep=26000",
             "consume=coal gold iron:2",
+            "sleep=26000",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",
@@ -152,8 +152,8 @@
          descname = _"forging a warrior’s ax",
          actions = {
             "return=skipped unless economy needs ax_warriors",
-            "sleep=26000",
             "consume=coal:2 gold:2 iron:2",
+            "sleep=26000",
             "play_sound=sound/smiths smith 192",
             "animate=working 22000",
             "play_sound=sound/smiths sharpening 120",

=== modified file 'data/tribes/buildings/productionsites/empire/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/armorsmithy/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua	2016-07-29 11:40:20 +0000
@@ -91,8 +91,8 @@
          descname = _"forging a suit of armor",
          actions = {
             "return=skipped unless economy needs armor",
-            "sleep=32000",
             "consume=iron coal cloth",
+            "sleep=32000",
             "animate=working 45000",
             "produce=armor"
          }
@@ -102,8 +102,8 @@
          descname = _"forging a suit of chain armor",
          actions = {
             "return=skipped unless economy needs armor_chain",
-            "sleep=32000",
             "consume=iron:2 coal cloth",
+            "sleep=32000",
             "animate=working 45000",
             "produce=armor_chain"
          }
@@ -113,8 +113,8 @@
          descname = _"forging a suit of gilded armor",
          actions = {
             "return=skipped unless economy needs armor_gilded",
-            "sleep=32000",
             "consume=iron:2 coal:2 cloth gold",
+            "sleep=32000",
             "animate=working 45000",
             "produce=armor_gilded"
          }

=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2016-06-17 07:41:37 +0000
+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua	2016-07-29 11:40:20 +0000
@@ -92,8 +92,8 @@
          descname = _"forging a spear",
          actions = {
             "return=skipped unless economy needs spear",
-            "sleep=32000",
             "consume=coal iron planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -106,8 +106,8 @@
          descname = _"forging an advanced spear",
          actions = {
             "return=skipped unless economy needs spear_advanced",
-            "sleep=32000",
             "consume=coal iron:2 planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -120,8 +120,8 @@
          descname = _"forging a heavy spear",
          actions = {
             "return=skipped unless economy needs spear_heavy",
-            "sleep=32000",
             "consume=coal:2 gold iron planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",
@@ -134,8 +134,8 @@
          descname = _"forging a war spear",
          actions = {
             "return=skipped unless economy needs spear_war",
-            "sleep=32000",
             "consume=coal:2 gold iron:2 planks",
+            "sleep=32000",
             "play_sound=sound/smiths smith 192",
             "animate=working 36000",
             "play_sound=sound/smiths sharpening 120",