Merge lp:~7010622-q-deactivatedaccount/widelands/topple-production-logic-2 into lp:widelands

[toptopple]

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

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.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1058. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1058.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[Klaus Halfmann (klaus-halfmann)]

Code llooks +/- equal for all tribes, lets do some testing.

[SirVer (sirver)]

same as other branch: really good change, but since it affects logic and is not a targetted bug fix, it has to wait till after b19.

https://wl.widelands.org/wiki/ReleasingWidelands/

[Klaus Halfmann (klaus-halfmann)]

Mhh, I have been testing this all the weekend now and found "only" that AI beat me even faster then before. Everything elese was fine for me.

SirVer is correct about that freeze. OTOH if we do not merge it in now,
it may become more difficult wit RC 20.

May the Widelands Gururs ponder abut this merege.

review: Approve (testing)

[toptopple (7010622-q-deactivatedaccount)]

I don't mind when this branch is merged! I don't think it can be avoided. ;)

Actually it may hold new strategic values, you can try to dedicate a building to certain product types without penalty times. E.g. Empire Armor-Smithy can be set to produce only the Helmet by switching out Cloth and Gold resource. Same holds for Weapon-Smithy and Wooden-Spear, which needs only Planks. So you can dedicate an even larger industry sections to only producing recruitment tools. Formerly this wasn't as easy. I surmise the Barbarians could get further into disadvantage because of their heavy resource consumption for the advanced weapons and armour. Some rebalancing of building times and building costs of products may be required in the aftermath of these new production logic!

[SirVer (sirver)]

> Actually it may hold new strategic values, you can try to dedicate a building to certain product types without penalty times.

That sounds cool, but is an even stronger argument against merging it before b19. We have a lot of experience with the balance of b19 and while not perfect, it seems to be fine for now. If we merge this, we might completely break the balance of the game which would be a problem for as long as b19 is the main release. So I think this should be first merge after b19 - which is unfortunatel a few months away still :(

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr pull --overwrite' failed. Output:

bzr: ERROR: Server sent an unexpected error: ('error', 'xmlrpclib.ProtocolError', '<ProtocolError for xmlrpc.lp.internal:8097/codehosting: 504 Gateway Time-out>')
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~7010622-q/widelands/topple-production-logic-2/

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

''

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr pull --overwrite' failed. Output:

bzr: ERROR: Server sent an unexpected error: ('error', 'xmlrpclib.Fault', "<Fault -1: 'OOPS-aa431c6855f2b0652a68b6c2c848699e'>")
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~7010622-q/widelands/topple-production-logic-2/

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr pull --overwrite' failed. Output:

ssh_exchange_identification: Connection closed by remote host
ConnectionReset reading response for 'BzrDir.open_2.1', retrying
ssh_exchange_identification: Connection closed by remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist.
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~7010622-q/widelands/topple-production-logic-2/

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

Running 'bzr pull --overwrite' failed. Output:

ssh_exchange_identification: Connection closed by remote host
ConnectionReset reading response for 'BzrDir.open_2.1', retrying
ssh_exchange_identification: Connection closed by remote host
bzr: ERROR: Connection closed: Unexpected end of message. Please check connectivity and permissions, and report a bug if problems persist.
Using saved parent location: bzr+ssh://bazaar.launchpad.net/~7010622-q/widelands/topple-production-logic-2/

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1219. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/148288911.
Appveyor build 1059. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_2-1059.

[GunChleoc (gunchleoc)]

@bunnybot merge

[SirVer (sirver)]

Bunnybot is offline for the day. I moved it to another computer to get around the inode starvation issue, but it is not fully operational yet.

> Am 24.10.2016 um 10:12 schrieb GunChleoc <email address hidden>:
>
> @bunnybot merge
> --
> https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-2/+merge/301477
> You are subscribed to branch lp:widelands.

[toptopple (7010622-q-deactivatedaccount)]

So you have decided to integrate the "production-logic" changes into release 19. Very good, I don't think you will regret it. I have played it in one of my "heavy economy" save-games and it runs very nice, speeding up the relevant because needed product manufacturing. The real bottleneck of economy always tends to lie in raw resources, so the effects of these modifications must not be over-estimated! However, it is nice to see production now functions more intuitively.

To mitigate the speeding of weapon production I suggest to enlarge the production wait-times for weapons and armors. Otherwise the player may sail too easily with only one or two smithies and on top encounter continuous "out-of-resource" states on them. Therefore I suggest to extend production times for all weapons and armors by 1/3 of their current values. Then we can see how it renders. As these enhancements are now in the release, the extended production times should be, too, if possible.

If you agree I can perform the changes.

[SirVer (sirver)]

> So you have decided to integrate the "production-logic" changes into release 19.

No, that is a misconception. We branched b19 before this was merged, so this will be in b20 as originally planned.

> Therefore I suggest to extend production times for all weapons and armors by 1/3 of their current values.

Now is the time to play around with these balance suggestions - till b20 is still a long time to fix any undesired effects that might come with this.

=== 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",