Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/fri-01-portspace into lp:widelands.
Commit message:
Adds another port space to scenario fri01 to fix difficulties with finding and
reaching the port space
Requested reviews:
MP (pagel-d)
Related bugs:
Bug #1783115 in widelands: "Frisians 1: relocate port space"
https://bugs.launchpad.net/widelands/+bug/1783115
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fri-01-portspace/+merge/350729
The "old" port space still exists. This branch changes the map´s geography
slightly and adds a port space directly under the enemy HQ. The player can
choose which one to use.
The advisor says this in the text, and the objective now mentions the port
space location.
Not tested, but there should be nothing that can go wrong here.
--
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fri-01-portspace.
=== modified file 'data/campaigns/fri01.wmf/binary/mapobjects'
Binary files data/campaigns/fri01.wmf/binary/mapobjects 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/mapobjects 2018-07-24 13:59:44 + differ
=== modified file 'data/campaigns/fri01.wmf/binary/resource'
Binary files data/campaigns/fri01.wmf/binary/resource 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/resource 2018-07-24 13:59:44 + differ
=== modified file 'data/campaigns/fri01.wmf/binary/terrain'
Binary files data/campaigns/fri01.wmf/binary/terrain 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/terrain 2018-07-24 13:59:44 + differ
=== modified file 'data/campaigns/fri01.wmf/elemental'
--- data/campaigns/fri01.wmf/elemental 2018-02-23 09:25:47 +
+++ data/campaigns/fri01.wmf/elemental 2018-07-24 13:59:44 +
@@ -1,13 +1,13 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
[global]
packet_version="1"
map_w="224"
map_h="128"
nr_players="2"
-name=_"The Great Stormflood"
+name="The Great Stormflood"
author="Nordfriese"
-descr=_"In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here?"
-hint=_"This scenario is set in a historical context, but most of the story line is fiction."
+descr="In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here?"
+hint="This scenario is set in a historical context, but most of the story line is fiction."
background="campaigns/fri01.wmf/pics/background.jpg"
tags="seafaring"
=== modified file 'data/campaigns/fri01.wmf/objective'
--- data/campaigns/fri01.wmf/objective 2018-02-19 08:50:22 +
+++ data/campaigns/fri01.wmf/objective 2018-07-24 13:59:44 +
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
[global]
packet_version="2"
=== modified file 'data/campaigns/fri01.wmf/player_names'
--- data/campaigns/fri01.wmf/player_names 2018-02-19 08:50:22 +
+++ data/campaigns/fri01.wmf/player_names 2018-07-24 13:59:44 +
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
[global]
packet_version="2"
=== modified file 'data/campaigns/fri01.wmf/player_position'
--- data/campaigns/fri01.wmf/player_position 2018-02-19 08:50:22 +
+++ data/campaigns/fri01.wmf/player_position 2018-07-24 13:59:44 +
@@ -1,6 +1,6 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
[global]
packet_version="2"
player_1="24 108"
-player_2="204 18"
+player_2="203 20"
=== modified file 'data/campaigns/fri01.wmf/port_spaces'
--- data/campaigns/fri01.wmf/port_spaces 2018-02-19 08:50:22 +
+++ data/campaigns/fri01.wmf/port_spaces 2018-07-24 13:59:44 +
@@ -1,9 +1,10 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
[global]
packet_version="1"
-number_of_port_spaces="2"
+number_of_port_spaces="3"
[port_spaces]
0="210 10"
-1="22 109"
+1="203 20"
+2="22 109"
=== modified file 'data/campaigns/fri01.wmf/scripting/init.lua'
--- data/campaigns/fri01.wmf/scripting/init.lua 2018-04-03 15:12:46 +
+++ data/campaigns/fri01.wmf/scripting/init.lua 2018-07-24 13:59:44 +
@@ -16,7 +16,6 @@
first_to_flood = map:get_field(9, 89)
expansion_mark = map:get_field(68, 68)
