Merge lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix into lp:widelands

[GunChleoc]

Collectors points update for the Frisians by Worldsavior

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4091. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/437004766.
Appveyor build 3887. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_worldsavior_frisians_collectors_fix-3887.

[hessenfarmer (stephan-lutz)]

Ok I had a look into the points of all tribes. All of the tablkes have following schemnein common

gold is always 3 points whether used in weapons or not (+ 1 extra point if it has to be refined i.e. atlantean goldthread)
coal and smelted iron in weapons give 1 point each.
every other ware used in weapon (planks, spidercloth, etc. ) gives 1 point

from this scheme I think the points for Frisian swords should be changed like in this branch, but the following should be changed as well

helmet_golden from 6 to 7 (same costs as a double sword)
fur_garment to 2 (needs 2 fur)
fur_garment_studded and fur_garment_golden should stay as they are

review: Needs Fixing

[hessenfarmer (stephan-lutz)]

Looks good now.

@bunnybot merge

review: Approve

=== modified file 'data/scripting/win_conditions/collectors.lua'
--- data/scripting/win_conditions/collectors.lua	2018-05-23 07:00:23 +0000
+++ data/scripting/win_conditions/collectors.lua	2018-10-13 08:53:06 +0000
@@ -78,13 +78,13 @@
 
       frisians = {
          gold = 3,
-         sword_short = 1,
+         sword_short = 2,
          sword_long = 3,
-         sword_broad = 7,
-         sword_double = 10,
-         helmet = 3,
-         helmet_golden = 6,
-         fur_garment = 1,
+         sword_broad = 6,
+         sword_double = 7,
+         helmet = 2,
+         helmet_golden = 7,
+         fur_garment = 2,
          fur_garment_studded = 3,
          fur_garment_golden = 6,
       },