widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/wares_queues_taverns_trainingsites into lp:widelands.

Commit message:
Reverted wares queue order for Barbarian & Empire taverns and training camps, because this has a logic change in the production programs as a side effect.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/wares_queues_taverns_trainingsites/+merge/324363
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/wares_queues_taverns_trainingsites into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2016-10-27 15:33:35 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua	2017-05-20 08:46:21 +0000
@@ -41,10 +41,11 @@
       barbarians_innkeeper = 2
    },
 
+   -- The input order affects the production program logic.
    inputs = {
       { name = "fish", amount = 4 },
+      { name = "barbarians_bread", amount = 4 },
       { name = "meat", amount = 4 },
-      { name = "barbarians_bread", amount = 4 },
       { name = "beer", amount = 4 },
       { name = "beer_strong", amount = 4 }
    },

=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua	2016-10-26 19:21:32 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua	2017-05-20 08:46:21 +0000
@@ -41,10 +41,11 @@
       barbarians_innkeeper = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
       { name = "fish", amount = 4 },
+      { name = "barbarians_bread", amount = 4 },
       { name = "meat", amount = 4 },
-      { name = "barbarians_bread", amount = 4 },
       { name = "beer", amount = 4 }
    },
    outputs = {

=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2016-10-24 10:10:06 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua	2017-05-20 08:46:21 +0000
@@ -45,10 +45,11 @@
       barbarians_innkeeper = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
       { name = "fish", amount = 4 },
-      { name = "meat", amount = 4 },
-      { name = "barbarians_bread", amount = 4 }
+      { name = "barbarians_bread", amount = 4 },
+      { name = "meat", amount = 4 }
    },
    outputs = {
       "ration"

=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua	2016-10-26 19:21:32 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua	2017-05-20 08:46:21 +0000
@@ -39,10 +39,11 @@
       empire_innkeeper = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
       { name = "fish", amount = 6 },
-      { name = "meat", amount = 6 },
-      { name = "empire_bread", amount = 6 }
+      { name = "empire_bread", amount = 6 },
+      { name = "meat", amount = 6 }
    },
    outputs = {
       "ration",

=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua	2016-10-26 19:21:32 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua	2017-05-20 08:46:21 +0000
@@ -41,10 +41,11 @@
       empire_innkeeper = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
       { name = "fish", amount = 5 },
-      { name = "meat", amount = 5 },
-      { name = "empire_bread", amount = 5 }
+      { name = "empire_bread", amount = 6 },
+      { name = "meat", amount = 5 }
    },
    outputs = {
       "ration"

=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2017-02-10 09:40:17 +0000
+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua	2017-05-20 08:46:21 +0000
@@ -50,10 +50,11 @@
       barbarians_trainer = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
+      { name = "barbarians_bread", amount = 10 },
       { name = "fish", amount = 6 },
       { name = "meat", amount = 6 },
-      { name = "barbarians_bread", amount = 10 },
       { name = "ax_sharp", amount = 2 },
       { name = "ax_broad", amount = 2 },
       { name = "ax_bronze", amount = 2 },

=== modified file 'data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua	2017-02-10 09:40:17 +0000
+++ data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua	2017-05-20 08:46:21 +0000
@@ -44,10 +44,11 @@
       empire_trainer = 1
    },
 
+   -- The input order affects the production program logic.
    inputs = {
+      { name = "empire_bread", amount = 10 },
       { name = "fish", amount = 6 },
       { name = "meat", amount = 6 },
-      { name = "empire_bread", amount = 10 },
       { name = "spear", amount = 2 },
       { name = "spear_advanced", amount = 2 },
       { name = "spear_heavy", amount = 2 },