widelands

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

  1. wares_queues_taverns_trainingsites
  2. Merge into trunk
Proposed by GunChleoc
Status: Work in progress
Proposed branch: lp:~widelands-dev/widelands/wares_queues_taverns_trainingsites
Merge into: lp:widelands
Diff against target: 121 lines (+17/-10)
7 files modified
data/tribes/buildings/productionsites/barbarians/big_inn/init.lua (+2/-1)
data/tribes/buildings/productionsites/barbarians/inn/init.lua (+2/-1)
data/tribes/buildings/productionsites/barbarians/tavern/init.lua (+3/-2)
data/tribes/buildings/productionsites/empire/inn/init.lua (+3/-2)
data/tribes/buildings/productionsites/empire/tavern/init.lua (+3/-2)
data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua (+2/-1)
data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua (+2/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/wares_queues_taverns_trainingsites
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+324363@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 2220. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/234277133.
Appveyor build 2055. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_wares_queues_taverns_trainingsites-2055.

Reply

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-09-08 15:40:58 +0000
@@ -41,10 +41,11 @@
41 barbarians_innkeeper = 241 barbarians_innkeeper = 2
42 },42 },
4343
44 -- The input order affects the production program logic.
44 inputs = {45 inputs = {
45 { name = "fish", amount = 4 },46 { name = "fish", amount = 4 },
47 { name = "barbarians_bread", amount = 4 },
46 { name = "meat", amount = 4 },48 { name = "meat", amount = 4 },
47 { name = "barbarians_bread", amount = 4 },
48 { name = "beer", amount = 4 },49 { name = "beer", amount = 4 },
49 { name = "beer_strong", amount = 4 }50 { name = "beer_strong", amount = 4 }
50 },51 },
5152
=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-09-08 15:40:58 +0000
@@ -41,10 +41,11 @@
41 barbarians_innkeeper = 141 barbarians_innkeeper = 1
42 },42 },
4343
44 -- The input order affects the production program logic.
44 inputs = {45 inputs = {
45 { name = "fish", amount = 4 },46 { name = "fish", amount = 4 },
47 { name = "barbarians_bread", amount = 4 },
46 { name = "meat", amount = 4 },48 { name = "meat", amount = 4 },
47 { name = "barbarians_bread", amount = 4 },
48 { name = "beer", amount = 4 }49 { name = "beer", amount = 4 }
49 },50 },
50 outputs = {51 outputs = {
5152
=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-09-08 15:40:58 +0000
@@ -46,10 +46,11 @@
46 barbarians_innkeeper = 146 barbarians_innkeeper = 1
47 },47 },
4848
49 -- The input order affects the production program logic.
49 inputs = {50 inputs = {
50 { name = "fish", amount = 4 },51 { name = "fish", amount = 4 },
51 { name = "meat", amount = 4 },52 { name = "barbarians_bread", amount = 4 },
52 { name = "barbarians_bread", amount = 4 }53 { name = "meat", amount = 4 }
53 },54 },
54 outputs = {55 outputs = {
55 "ration"56 "ration"
5657
=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua 2019-09-08 15:40:58 +0000
@@ -38,10 +38,11 @@
38 empire_innkeeper = 138 empire_innkeeper = 1
39 },39 },
4040
41 -- The input order affects the production program logic.
41 inputs = {42 inputs = {
42 { name = "fish", amount = 6 },43 { name = "fish", amount = 6 },
43 { name = "meat", amount = 6 },44 { name = "empire_bread", amount = 6 },
44 { name = "empire_bread", amount = 6 }45 { name = "meat", amount = 6 }
45 },46 },
46 outputs = {47 outputs = {
47 "ration",48 "ration",
4849
=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-09-08 15:40:58 +0000
@@ -41,10 +41,11 @@
41 empire_innkeeper = 141 empire_innkeeper = 1
42 },42 },
4343
44 -- The input order affects the production program logic.
44 inputs = {45 inputs = {
45 { name = "fish", amount = 5 },46 { name = "fish", amount = 5 },
46 { name = "meat", amount = 5 },47 { name = "empire_bread", amount = 5 },
47 { name = "empire_bread", amount = 5 }48 { name = "meat", amount = 5 }
48 },49 },
49 outputs = {50 outputs = {
50 "ration"51 "ration"
5152
=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-05-30 13:41:54 +0000
+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-09-08 15:40:58 +0000
@@ -49,10 +49,11 @@
49 barbarians_trainer = 149 barbarians_trainer = 1
50 },50 },
5151
52 -- The input order affects the production program logic.
52 inputs = {53 inputs = {
54 { name = "barbarians_bread", amount = 10 },
53 { name = "fish", amount = 6 },55 { name = "fish", amount = 6 },
54 { name = "meat", amount = 6 },56 { name = "meat", amount = 6 },
55 { name = "barbarians_bread", amount = 10 },
56 { name = "ax_sharp", amount = 2 },57 { name = "ax_sharp", amount = 2 },
57 { name = "ax_broad", amount = 2 },58 { name = "ax_broad", amount = 2 },
58 { name = "ax_bronze", amount = 2 },59 { name = "ax_bronze", amount = 2 },
5960
=== modified file 'data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua'
--- data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2019-05-30 13:41:54 +0000
+++ data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2019-09-08 15:40:58 +0000
@@ -43,10 +43,11 @@
43 empire_trainer = 143 empire_trainer = 1
44 },44 },
4545
46 -- The input order affects the production program logic.
46 inputs = {47 inputs = {
48 { name = "empire_bread", amount = 10 },
47 { name = "fish", amount = 6 },49 { name = "fish", amount = 6 },
48 { name = "meat", amount = 6 },50 { name = "meat", amount = 6 },
49 { name = "empire_bread", amount = 10 },
50 { name = "spear", amount = 2 },51 { name = "spear", amount = 2 },
51 { name = "spear_advanced", amount = 2 },52 { name = "spear_advanced", amount = 2 },
52 { name = "spear_heavy", amount = 2 },53 { name = "spear_heavy", amount = 2 },

Subscribers

People subscribed via source and target branches

to status/vote changes: