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

Proposed by GunChleoc
Status: Merged
Merged at revision: 8889
Proposed branch: lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix
Merge into: lp:widelands
Diff against target: 23 lines (+6/-6)
1 file modified
data/scripting/win_conditions/collectors.lua (+6/-6)
To merge this branch: bzr merge lp:~widelands-dev/widelands/worldsavior-frisians-collectors-fix
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+356118@code.launchpad.net

Commit message

Collectors points update for the Frisians by Worldsavior

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

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
8869. By GunChleoc

Corrections from worldsavior.

8870. By GunChleoc

Merged trunk.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Looks good now.

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/scripting/win_conditions/collectors.lua'
2--- data/scripting/win_conditions/collectors.lua 2018-05-23 07:00:23 +0000
3+++ data/scripting/win_conditions/collectors.lua 2018-10-13 08:53:06 +0000
4@@ -78,13 +78,13 @@
5
6 frisians = {
7 gold = 3,
8- sword_short = 1,
9+ sword_short = 2,
10 sword_long = 3,
11- sword_broad = 7,
12- sword_double = 10,
13- helmet = 3,
14- helmet_golden = 6,
15- fur_garment = 1,
16+ sword_broad = 6,
17+ sword_double = 7,
18+ helmet = 2,
19+ helmet_golden = 7,
20+ fur_garment = 2,
21 fur_garment_studded = 3,
22 fur_garment_golden = 6,
23 },

Subscribers

People subscribed via source and target branches

to status/vote changes: