Merge lp:~widelands-dev/widelands/frisian-buildings into lp:widelands

[Benedikt Straub]

Improved graphics for the frisian sentinel

Graphics-only change. The sentinel looks too similar to the outpost for my liking, so I downgraded it a bit.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4153. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/443117571.
Appveyor build 3950. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_buildings-3950.

[GunChleoc (gunchleoc)]

Looks good :)

@bunnybot merge

review: Approve

=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_0.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_0_pc.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_1.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_1_pc.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_2.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_2_pc.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_3.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/idle_3_pc.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/init.lua'
--- data/tribes/buildings/militarysites/frisians/sentinel/init.lua	2018-07-12 19:37:48 +0000
+++ data/tribes/buildings/militarysites/frisians/sentinel/init.lua	2018-10-19 14:27:33 +0000
@@ -23,12 +23,12 @@
    animations = {
       idle = {
          pictures = path.list_files (dirname .. "idle_?.png"),
-         hotspot = {41, 53},
+         hotspot = {33, 53},
          fps = 10,
       },
       unoccupied = {
          pictures = path.list_files (dirname .. "unoccupied_?.png"),
-         hotspot = {41, 53},
+         hotspot = {33, 53},
       },
    },
 

=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/menu.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/menu.png	2018-07-15 11:28:49 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/menu.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png'
Binary files data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png	2018-07-12 19:37:48 +0000 and data/tribes/buildings/militarysites/frisians/sentinel/unoccupied_0_pc.png	2018-10-19 14:27:33 +0000 differ
=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua	2018-07-29 13:49:09 +0000
+++ data/tribes/frisians.lua	2018-10-19 14:27:33 +0000
@@ -237,12 +237,13 @@
       "frisians_resi_gold_2",
       "frisians_resi_stones_2",
       "frisians_shipconstruction",
-      --These non-frisian immovables can be used by bee-keepers
+      -- These non-frisian immovables can be used by bee-keepers
       "field_medium",
       "cornfield_medium",
       "blackrootfield_medium",
       "grapevine_medium",
-      "grapevine_ripe", --used by the fruit collector
+      -- Used by the fruit collector
+      "grapevine_ripe",
    },
 
    -- The order here also determines the order in lists on screen.
@@ -331,6 +332,7 @@
       "Langeneß",
       "Norderoog",
       "Norderoogsand",
+      "Nordstrand",
       "Nordstrandischmoor",
       "Oland",
       "Pellworm",