GunChleoc has proposed merging
lp:~widelands-dev/widelands/bug-1545647-upgraded-workers into lp:widelands.
Commit message:
Fixed problem with requesting chief miners.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1545647 in widelands: "Upgraded workers not requested properly in
productionsites"
https://bugs.launchpad.net/widelands/+bug/1545647
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1545647-upgraded-workers/+merge/287890
The attached branch fixes the immediate problem - seems like whether this works
or not depends on the order of the working positions in the init.lua. Not good,
so we should definitely look into this code for Build 20.
So, let's leave the bug open after merging.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1545647-upgraded-workers into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -44,8 +44,8 @@
},
working_positions = {
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/coalmine_deeper/init.lua 2016-03-03 08:36:15 +0000
@@ -42,9 +42,9 @@
},
working_positions = {
+ barbarians_miner_master = 1,
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
- barbarians_miner_master = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -44,8 +44,8 @@
},
working_positions = {
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/goldmine_deeper/init.lua 2016-03-03 08:36:15 +0000
@@ -42,9 +42,9 @@
},
working_positions = {
+ barbarians_miner_master = 1,
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
- barbarians_miner_master = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -44,8 +44,8 @@
},
working_positions = {
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ironmine_deeper/init.lua 2016-03-03 08:36:15 +0000
@@ -42,9 +42,9 @@
},
working_positions = {
+ barbarians_miner_master = 1,
+ barbarians_miner_chief = 1,
barbarians_miner = 1,
- barbarians_miner_chief = 1,
- barbarians_miner_master = 1,
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-03-03 08:36:15 +0000
@@ -45,8 +45,8 @@
aihints = {},
working_positions = {
+ barbarians_blacksmith_master = 1,
barbarians_blacksmith = 1,
- barbarians_blacksmith_master = 1
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/coalmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -39,8 +39,8 @@
},
working_positions = {
+ empire_miner_master = 1,
empire_miner = 1,
- empire_miner_master = 1
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/goldmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -39,8 +39,8 @@
},
working_positions = {
+ empire_miner_master = 1,
empire_miner = 1,
- empire_miner_master = 1
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/ironmine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -39,8 +39,8 @@
},
working_positions = {
+ empire_miner_master = 1,
empire_miner = 1,
- empire_miner_master = 1
},
inputs = {
=== modified file 'data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua'
--- data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/marblemine_deep/init.lua 2016-03-03 08:36:15 +0000
@@ -39,8 +39,8 @@
},
working_positions = {
+ empire_miner_master = 1,
empire_miner = 1,
- empire_miner_master = 1
},
inputs = {
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
