widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07954
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
toptopple has proposed merging lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-1/+merge/301359
Modified the LUA scripts for all races' smelting_works so that the penalty production time for not supplying iron-ore or gold-ore are reduced to 10 seconds for each kind of resource per production run.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2016-07-28 06:45:41 +0000
@@ -66,8 +66,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
- "sleep=25000",
+ "sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=iron_ore coal",
+ "sleep=20000",
"animate=working 35000",
"produce=iron"
}
@@ -77,8 +78,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
- "sleep=25000",
+ "sleep=10000", -- penalty for unavailable gold_ore
"consume=gold_ore coal",
+ "sleep=15000",
"animate=working 35000",
"produce=gold"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-06-17 07:41:37 +0000
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-07-28 06:45:41 +0000
@@ -69,8 +69,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
- "sleep=32000",
+ "sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=coal iron_ore",
+ "sleep=27000",
"play_sound=sound/metal furnace 192",
"animate=working 35000",
"play_sound=sound/metal ironping 80",
@@ -82,8 +83,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
- "sleep=32000",
+ "sleep=10000", -- penalty for unavailable gold_ore
"consume=coal gold_ore",
+ "sleep=22000",
"play_sound=sound/metal furnace 192",
"animate=working 35000",
"play_sound=sound/metal goldping 80",
=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-06-18 07:31:14 +0000
+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-07-28 06:45:41 +0000
@@ -71,8 +71,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
- "sleep=25000",
+ "sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=iron_ore coal",
+ "sleep=20000",
"play_sound=sound/metal fizzle 150",
"animate=working 35000",
"play_sound=sound/metal ironping 80",
@@ -84,8 +85,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
- "sleep=25000",
+ "sleep=10000", -- penalty for unavailable gold_ore
"consume=gold_ore coal",
+ "sleep=15000",
"play_sound=sound/metal fizzle 150",
"animate=working 35000",
"play_sound=sound/metal goldping 80",
Follow ups
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-09-19
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-09-19
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-09-10
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-09-10
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-09-10
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-14
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-13
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-09
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-09
-
Re: [Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: SirVer, 2016-08-07
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-08-01
-
[Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
From: bunnybot, 2016-07-28