[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands

2016-11-01 Thread noreply
The proposal to merge lp:~7010622-q/widelands/topple-production-logic-4 into 
lp:widelands has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.

___
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


[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands

2016-11-01 Thread GunChleoc
The proposal to merge lp:~7010622-q/widelands/topple-production-logic-4 into 
lp:widelands has been updated.

Commit Message changed to:

Adjusted 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

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
-- 
Your team Widelands Developers is requested to review the proposed merge of 
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.

___
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


[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands

2016-10-31 Thread bunnybot
Continuous integration builds have changed state:

Travis build 1543. State: passed. Details: 
https://travis-ci.org/widelands/widelands/builds/171917046.
Appveyor build 1384. State: success. Details: 
https://ci.appveyor.com/project/widelands-dev/widelands/build/_7010622_q_widelands_topple_production_logic_4-1384.
-- 
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
Your team Widelands Developers is requested to review the proposed merge of 
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.

___
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


[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands

2016-10-31 Thread toptopple
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  OldNew  Change  Factor
--
BA AxeWo : Axe  57  73  16  0.28
BA AxeWo : Axe-Sharp57  76  19  0.33
BA AxeWo : Axe-Broad57  79  22  0.38

BA Warmill : Axe57  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-D77  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 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua	2016-10-31 07:27:05 +
@@ -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=5",  -- +18 enlarge
+"animate=working 6",  -- +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 +
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua	2016-10-31 07:27:05 +
@@ -72,11 +72,12 @@
  -- TRANSLATORS: Completed/Skipped/Did not start forging a light trident because ...
  descname = _"forging