toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
These are the adjustment time values for weapon and armour production sites
(all races) which were changed recently for more efficient use of their
schemes. The new values are required to compensate increased production speed
in the "mixed resources" cases, which must be considered standard. Mixed
resources means there are not all resources supplied for the entire set of
products the economy needs.
Though these changes may appear voluminous to some, actually they are still
rather weak. I test-played them all and they render nicely. With only 2 houses
"weapon-smith" (and 2 for armour) you receive a constant flow of equipment and
can run your training camp at 100% if all raw resources are supplied.
The effects are two-fold:
1) production time values are lifted (e.g.t o allow for resupplies of raw
material)
2) times of products are diversified according to their value. That means for a
higher product more time is invested than for a lower. Values in seconds.
Site : Product Old New Change Factor
------------------------------------------------------
BA AxeWo : Axe 57 73 16 0.28
BA AxeWo : Axe-Sharp 57 76 19 0.33
BA AxeWo : Axe-Broad 57 79 22 0.38
BA Warmill : Axe 57 73 16 0.28
BA Warmill : Axe-Sharp 57 76 19 0.33
BA Warmill : Axe-Broad 57 79 22 0.38
BA Warmill : Axe-Bronze 57 82 25 0.44
BA Warmill : Axe-Battle 57 87 30 0.53
BA Warmill : Axe-Warrio 57 92 35 0.61
BA Helms : Helmet 67 80 13 0.19
BA Helms : Mask 77 90 15 0.18
BA Helms : Warhelm 87 100 17 0.15
EM Weapons : Wood Spear 50 64 14 0.28
EM Weapons : Spear 77 102 25 0.32
EM Weapons : Adv. Spear 77 110 33 0.43
EM Weapons : Hv. Spear 77 115 38 0.49
EM Weapons : War-Spear 77 120 43 0.56
EM Armors : Helmet 67 80 13 0.19
EM Armors : Armor 77 90 13 0.17
EM Armors : Chain Armor 77 108 31 0.40
EM Armors : Guild Armor 77 115 38 0.49
AT Weapons : Tri Light 50 64 14 0.28
AT Weapons : Tri Long 77 102 25 0.32
AT Weapons : Tri Steel 77 110 33 0.43
AT Weapons : Tri Double 77 115 38 0.49
AT Weapons : Tri H-D 77 120 43 0.56
AT Armors : Shld Steel 67 90 23 0.34
AT Armors : Shld Adv. 77 110 33 0.43
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-31 07:27:05 +0000
@@ -132,10 +132,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
descname = _"forging a steel shield",
actions = {
+ -- time total: 90
"return=skipped unless economy needs shield_steel",
- "sleep=32000",
+ "sleep=45000", -- +13 enlarge
"consume=iron:2 coal:2",
- "animate=working 35000",
+ "animate=working 45000", -- +10 enlarge
"produce=shield_steel"
}
},
@@ -143,10 +144,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
descname = _"forging an advanced shield",
actions = {
+ -- time total: 110
"return=skipped unless economy needs shield_advanced",
"consume=iron:2 coal:2 gold",
- "sleep=32000",
- "animate=working 45000",
+ "sleep=50000", -- +18 enlarge
+ "animate=working 60000", -- +15 enlarge
"produce=shield_advanced"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-10-31 07:27:05 +0000
@@ -72,11 +72,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
descname = _"forging a light trident",
actions = {
+ -- time total: 64
"return=skipped unless economy needs trident_light",
- "sleep=20000",
+ "sleep=27000", -- +7 enlarge
"consume=iron planks",
"play_sound=sound/smiths smith 192",
- "animate=working 21000",
+ "animate=working 28000", -- +7 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=trident_light"
@@ -86,11 +87,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a long trident because ...
descname = _"forging a long trident",
actions = {
+ -- time total: 102
"return=skipped unless economy needs trident_long",
"consume=iron coal planks",
- "sleep=32000",
+ "sleep=47000", -- +15 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 46000", -- +10 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=trident_long"
@@ -100,11 +102,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel trident because ...
descname = _"forging a steel trident",
actions = {
+ -- time total: 110
"return=skipped unless economy needs trident_steel",
"consume=iron:2 coal planks",
- "sleep=32000",
+ "sleep=50000", -- +18 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 51000", -- +15 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=trident_steel"
@@ -114,11 +117,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a double trident because ...
descname = _"forging a double trident",
actions = {
+ -- time total: 115
"return=skipped unless economy needs trident_double",
"consume=iron coal:2 planks gold",
- "sleep=32000",
+ "sleep=55000", -- +23 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 51000", -- +15 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=trident_double"
@@ -128,11 +132,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a heavy double trident because ...
descname = _"forging a heavy double trident",
actions = {
- "return=skipped unless economy needs trident_heavy_double",
+ -- time total: 120
+ "return=skipped unless economy needs trident_heavy_double",
"consume=iron:2 coal:2 planks gold",
- "sleep=32000",
+ "sleep=55000", -- +23 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 56000", -- +20 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=trident_heavy_double"
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-10-31 07:27:05 +0000
@@ -74,11 +74,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
descname = _"forging an ax",
actions = {
+ -- time total: 73
"return=skipped unless economy needs ax",
- "sleep=26000",
+ "sleep=36000", -- +10 enlarge
"consume=coal iron",
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 28000", -- +6 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax"
@@ -88,11 +89,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
descname = _"forging a sharp ax",
actions = {
+ -- time total: 76
"return=skipped unless economy needs ax_sharp",
"consume=coal iron:2",
- "sleep=26000",
+ "sleep=37000", -- +11 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 30000", -- +8 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_sharp"
@@ -102,11 +104,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
descname = _"forging a broad ax",
actions = {
+ -- time total: 79
"return=skipped unless economy needs ax_broad",
"consume=coal:2 iron:2",
- "sleep=26000",
+ "sleep=38000", -- +12 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 32000", -- +10 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_broad"
=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua'
--- data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/barbarians/helmsmithy/init.lua 2016-10-31 07:27:05 +0000
@@ -77,10 +77,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
descname = _"forging a helmet",
actions = {
+ -- time total: 80
"return=skipped unless economy needs helmet",
- "sleep=32000",
+ "sleep=40000", -- +8 enlarge
"consume=coal iron",
- "animate=working 35000",
+ "animate=working 40000", -- +5 enlarge
"produce=helmet"
}
},
@@ -88,10 +89,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a mask because ...
descname = _"forging a mask",
actions = {
+ -- time total: 90
"return=skipped unless economy needs helmet_mask",
"consume=coal iron:2",
- "sleep=32000",
- "animate=working 45000",
+ "sleep=40000", -- +8 enlarge
+ "animate=working 50000", -- +5 enlarge
"produce=helmet_mask"
}
},
@@ -99,10 +101,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a warhelm because ...
descname = _"forging a warhelm",
actions = {
+ -- time total: 100
"return=skipped unless economy needs helmet_warhelm",
"consume=coal gold iron:2",
- "sleep=32000",
- "animate=working 55000",
+ "sleep=40000", -- +8 enlarge
+ "animate=working 60000", -- +5 enlarge
"produce=helmet_warhelm"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-10-31 07:27:05 +0000
@@ -81,11 +81,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an ax because ...
descname = _"forging an ax",
actions = {
+ -- time total: 73
"return=skipped unless economy needs ax",
- "sleep=26000",
+ "sleep=36000", -- +10 enlarge
"consume=coal iron",
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 28000", -- +6 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax"
@@ -95,11 +96,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a sharp ax because ...
descname = _"forging a sharp ax",
actions = {
+ -- time total: 76
"return=skipped unless economy needs ax_sharp",
"consume=coal iron:2",
- "sleep=26000",
+ "sleep=37000", -- +11 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 30000", -- +8 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_sharp"
@@ -109,11 +111,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a broad ax because ...
descname = _"forging a broad ax",
actions = {
+ -- time total: 79
"return=skipped unless economy needs ax_broad",
"consume=coal:2 iron:2",
- "sleep=26000",
+ "sleep=38000", -- +12 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 32000", -- +10 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_broad"
@@ -123,11 +126,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a bronze ax because ...
descname = _"forging a bronze ax",
actions = {
+ -- time total: 82
"return=skipped unless economy needs ax_bronze",
"consume=coal:2 iron:2",
- "sleep=26000",
+ "sleep=39000", -- +13 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 34000", -- +12 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_bronze"
@@ -137,11 +141,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a battle ax because ...
descname = _"forging a battle ax",
actions = {
+ -- time total: 87
"return=skipped unless economy needs ax_battle",
"consume=coal gold iron:2",
- "sleep=26000",
+ "sleep=41000", -- +15 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 37000", -- +15 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_battle"
@@ -151,11 +156,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a warrior’s ax because ...
descname = _"forging a warrior’s ax",
actions = {
+ -- time total: 92
"return=skipped unless economy needs ax_warriors",
"consume=coal:2 gold:2 iron:2",
- "sleep=26000",
+ "sleep=43000", -- +17 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 22000",
+ "animate=working 40000", -- +18 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=ax_warriors"
=== modified file 'data/tribes/buildings/productionsites/empire/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/empire/armorsmithy/init.lua 2016-10-31 07:27:05 +0000
@@ -79,10 +79,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a helmet because ...
descname = _"forging a helmet",
actions = {
+ -- time total: 80
"return=skipped unless economy needs armor_helmet",
- "sleep=32000",
+ "sleep=40000", -- +8 enlarge
"consume=iron coal",
- "animate=working 35000",
+ "animate=working 40000", -- +5 enlarge
"produce=armor_helmet"
}
},
@@ -90,10 +91,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a suit of armor because ...
descname = _"forging a suit of armor",
actions = {
+ -- time total: 90
"return=skipped unless economy needs armor",
"consume=iron coal cloth",
- "sleep=32000",
- "animate=working 45000",
+ "sleep=40000", -- +8 enlarge
+ "animate=working 50000", -- +5 enlarge
"produce=armor"
}
},
@@ -101,10 +103,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a suit of chain armor because ...
descname = _"forging a suit of chain armor",
actions = {
+ -- time total: 108
"return=skipped unless economy needs armor_chain",
"consume=iron:2 coal cloth",
- "sleep=32000",
- "animate=working 45000",
+ "sleep=47000", -- +15 enlarge
+ "animate=working 61000", -- +16 enlarge
"produce=armor_chain"
}
},
@@ -112,10 +115,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a suit of gilded armor because ...
descname = _"forging a suit of gilded armor",
actions = {
+ -- time total: 115
"return=skipped unless economy needs armor_gilded",
"consume=iron:2 coal:2 cloth gold",
- "sleep=32000",
- "animate=working 45000",
+ "sleep=51000", -- +19 enlarge
+ "animate=working 64000", -- +19 enlarge
"produce=armor_gilded"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2016-10-24 10:09:01 +0000
+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2016-10-31 07:27:05 +0000
@@ -77,11 +77,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a wooden spear because ...
descname = _"forging a wooden spear",
actions = {
+ -- time total: 64
"return=skipped unless economy needs spear_wooden",
- "sleep=20000",
+ "sleep=27000", -- +7 enlarge
"consume=planks",
"play_sound=sound/smiths smith 192",
- "animate=working 21000",
+ "animate=working 28000", -- +7 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=spear_wooden"
@@ -91,11 +92,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a spear because ...
descname = _"forging a spear",
actions = {
+ -- time total: 102
"return=skipped unless economy needs spear",
"consume=coal iron planks",
- "sleep=32000",
+ "sleep=47000", -- +15 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 46000", -- +10 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=spear"
@@ -105,11 +107,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced spear because ...
descname = _"forging an advanced spear",
actions = {
+ -- time total: 110
"return=skipped unless economy needs spear_advanced",
"consume=coal iron:2 planks",
- "sleep=32000",
+ "sleep=50000", -- +18 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 51000", -- +15 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=spear_advanced"
@@ -119,11 +122,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a heavy spear because ...
descname = _"forging a heavy spear",
actions = {
+ -- time total: 115
"return=skipped unless economy needs spear_heavy",
"consume=coal:2 gold iron planks",
- "sleep=32000",
+ "sleep=55000", -- +23 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 51000", -- +15 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=spear_heavy"
@@ -133,11 +137,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a war spear because ...
descname = _"forging a war spear",
actions = {
+ -- time total: 120
"return=skipped unless economy needs spear_war",
"consume=coal:2 gold iron:2 planks",
- "sleep=32000",
+ "sleep=55000", -- +23 enlarge
"play_sound=sound/smiths smith 192",
- "animate=working 36000",
+ "animate=working 56000", -- +20 enlarge
"play_sound=sound/smiths sharpening 120",
"sleep=9000",
"produce=spear_war"
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
