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
1=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
2--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-05-29 18:29:28 +0000
3+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2019-09-08 15:40:58 +0000
4@@ -41,10 +41,11 @@
5 barbarians_innkeeper = 2
6 },
7
8+ -- The input order affects the production program logic.
9 inputs = {
10 { name = "fish", amount = 4 },
11+ { name = "barbarians_bread", amount = 4 },
12 { name = "meat", amount = 4 },
13- { name = "barbarians_bread", amount = 4 },
14 { name = "beer", amount = 4 },
15 { name = "beer_strong", amount = 4 }
16 },
17
18=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
19--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-05-29 18:29:28 +0000
20+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2019-09-08 15:40:58 +0000
21@@ -41,10 +41,11 @@
22 barbarians_innkeeper = 1
23 },
24
25+ -- The input order affects the production program logic.
26 inputs = {
27 { name = "fish", amount = 4 },
28+ { name = "barbarians_bread", amount = 4 },
29 { name = "meat", amount = 4 },
30- { name = "barbarians_bread", amount = 4 },
31 { name = "beer", amount = 4 }
32 },
33 outputs = {
34
35=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
36--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-05-29 18:29:28 +0000
37+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2019-09-08 15:40:58 +0000
38@@ -46,10 +46,11 @@
39 barbarians_innkeeper = 1
40 },
41
42+ -- The input order affects the production program logic.
43 inputs = {
44 { name = "fish", amount = 4 },
45- { name = "meat", amount = 4 },
46- { name = "barbarians_bread", amount = 4 }
47+ { name = "barbarians_bread", amount = 4 },
48+ { name = "meat", amount = 4 }
49 },
50 outputs = {
51 "ration"
52
53=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
54--- data/tribes/buildings/productionsites/empire/inn/init.lua 2019-05-29 18:29:28 +0000
55+++ data/tribes/buildings/productionsites/empire/inn/init.lua 2019-09-08 15:40:58 +0000
56@@ -38,10 +38,11 @@
57 empire_innkeeper = 1
58 },
59
60+ -- The input order affects the production program logic.
61 inputs = {
62 { name = "fish", amount = 6 },
63- { name = "meat", amount = 6 },
64- { name = "empire_bread", amount = 6 }
65+ { name = "empire_bread", amount = 6 },
66+ { name = "meat", amount = 6 }
67 },
68 outputs = {
69 "ration",
70
71=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
72--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-05-29 18:29:28 +0000
73+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2019-09-08 15:40:58 +0000
74@@ -41,10 +41,11 @@
75 empire_innkeeper = 1
76 },
77
78+ -- The input order affects the production program logic.
79 inputs = {
80 { name = "fish", amount = 5 },
81- { name = "meat", amount = 5 },
82- { name = "empire_bread", amount = 5 }
83+ { name = "empire_bread", amount = 5 },
84+ { name = "meat", amount = 5 }
85 },
86 outputs = {
87 "ration"
88
89=== modified file 'data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua'
90--- data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-05-30 13:41:54 +0000
91+++ data/tribes/buildings/trainingsites/barbarians/trainingcamp/init.lua 2019-09-08 15:40:58 +0000
92@@ -49,10 +49,11 @@
93 barbarians_trainer = 1
94 },
95
96+ -- The input order affects the production program logic.
97 inputs = {
98+ { name = "barbarians_bread", amount = 10 },
99 { name = "fish", amount = 6 },
100 { name = "meat", amount = 6 },
101- { name = "barbarians_bread", amount = 10 },
102 { name = "ax_sharp", amount = 2 },
103 { name = "ax_broad", amount = 2 },
104 { name = "ax_bronze", amount = 2 },
105
106=== modified file 'data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua'
107--- data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2019-05-30 13:41:54 +0000
108+++ data/tribes/buildings/trainingsites/empire/trainingcamp/init.lua 2019-09-08 15:40:58 +0000
109@@ -43,10 +43,11 @@
110 empire_trainer = 1
111 },
112
113+ -- The input order affects the production program logic.
114 inputs = {
115+ { name = "empire_bread", amount = 10 },
116 { name = "fish", amount = 6 },
117 { name = "meat", amount = 6 },
118- { name = "empire_bread", amount = 10 },
119 { name = "spear", amount = 2 },
120 { name = "spear_advanced", amount = 2 },
121 { name = "spear_heavy", amount = 2 },

Subscribers

People subscribed via source and target branches

to status/vote changes: