widelands-dev team mailing list archive

[Benedikt Straub <benedikt-straub@xxxxxx>]

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 +0000 and data/campaigns/fri01.wmf/binary/mapobjects	2018-07-24 13:59:44 +0000 differ
=== modified file 'data/campaigns/fri01.wmf/binary/resource'
Binary files data/campaigns/fri01.wmf/binary/resource	2018-02-19 08:50:22 +0000 and data/campaigns/fri01.wmf/binary/resource	2018-07-24 13:59:44 +0000 differ
=== modified file 'data/campaigns/fri01.wmf/binary/terrain'
Binary files data/campaigns/fri01.wmf/binary/terrain	2018-02-19 08:50:22 +0000 and data/campaigns/fri01.wmf/binary/terrain	2018-07-24 13:59:44 +0000 differ
=== modified file 'data/campaigns/fri01.wmf/elemental'
--- data/campaigns/fri01.wmf/elemental	2018-02-23 09:25:47 +0000
+++ data/campaigns/fri01.wmf/elemental	2018-07-24 13:59:44 +0000
@@ -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 +0000
+++ data/campaigns/fri01.wmf/objective	2018-07-24 13:59:44 +0000
@@ -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 +0000
+++ data/campaigns/fri01.wmf/player_names	2018-07-24 13:59:44 +0000
@@ -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 +0000
+++ data/campaigns/fri01.wmf/player_position	2018-07-24 13:59:44 +0000
@@ -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 +0000
+++ data/campaigns/fri01.wmf/port_spaces	2018-07-24 13:59:44 +0000
@@ -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 +0000
+++ data/campaigns/fri01.wmf/scripting/init.lua	2018-07-24 13:59:44 +0000
@@ -16,7 +16,6 @@
 first_to_flood = map:get_field(9, 89)
 expansion_mark = map:get_field(68, 68)
 warehouse_mark = map:get_field(44, 77)
-port_space = map:get_field(210, 10)
 
 -- Time in ms that elapses between the drowning of two fields when flooding
 flood_speed = 430

=== modified file 'data/campaigns/fri01.wmf/scripting/mission_thread.lua'
--- data/campaigns/fri01.wmf/scripting/mission_thread.lua	2018-04-03 15:12:46 +0000
+++ data/campaigns/fri01.wmf/scripting/mission_thread.lua	2018-07-24 13:59:44 +0000
@@ -418,14 +418,7 @@
 
    campaign_message_box(rising_water_3)
    campaign_message_box(rising_water_4)
-    -- Make the port space immediately accessible if it is blocked with trees etc
-    -- (but not buildings)
-   for i,f in ipairs(port_space:region(3)) do
-      if f.immovable and f.immovable.descr.type_name == "immovable" then
-         f.immovable:remove()
-      end
-   end
-   scroll_to_field(port_space)
+   scroll_to_field(map.player_slots[2].starting_field)
    p1:allow_buildings {"frisians_port", "frisians_weaving_mill", "frisians_shipyard"}
    o = add_campaign_objective(obj_escape)
 

=== modified file 'data/campaigns/fri01.wmf/scripting/texts.lua'
--- data/campaigns/fri01.wmf/scripting/texts.lua	2018-05-23 05:05:34 +0000
+++ data/campaigns/fri01.wmf/scripting/texts.lua	2018-07-24 13:59:44 +0000
@@ -114,7 +114,8 @@
    title=_"Escape from the floods",
    number = 1,
    body = objective_text(_"Flee from the Floods",
-      li(_[[Build a port, a weaving mill and a shipyard, then start an expedition to flee before the storm flood drowns the island.]])
+      li(_[[Build a port, a weaving mill and a shipyard, then start an expedition to flee before the storm flood drowns the island.]]) ..
+      li_arrow(_[[You can build the port either on the easternmost tip of the island or in the place where the enemy’s headquarters stood.]])
    ),
 }
 
@@ -398,7 +399,7 @@
    title =_ "Storm Flood",
    body=hauke(_"The island is flooding!",
       -- TRANSLATORS: Hauke – rising water
-      _([[Despair not, I did espy some hope! The easternmost tip of the island seems well suited to build a port on. If we manage to construct a ship, and fill it with all we need to build a new settlement, we may be able to escape.]])
+      _([[Despair not, I did espy some hope! The easternmost tip of the island, as well as the space where the fiends’ headquarters stood, seems well suited to build a port on. If we manage to construct a ship, and fill it with all we need to build a new settlement, we may be able to escape.]])
      .. paragraphdivider() ..
       -- TRANSLATORS: Hauke – rising water
       _([[The storm flood seems to be coming from the west. If we hurry, we will just make it! We only need to build a port and a shipyard – oh, and a weaving mill to weave the durable cloth, which is made from reed and fur, for the sails. Then we can launch an expedition from the port. Pray to the gods and make haste!]]))

=== modified file 'data/campaigns/fri01.wmf/version'
--- data/campaigns/fri01.wmf/version	2018-02-19 08:50:22 +0000
+++ data/campaigns/fri01.wmf/version	2018-07-24 13:59:44 +0000
@@ -1,11 +1,11 @@
-# Automatically created by Widelands bzr8485[frisians] (Release)
+# Automatically created by Widelands bzr8766[widelands] (Release)
 
 [global]
 map_source_url=
 map_release=
-map_creator_version="bzr8485[frisians]"
+map_creator_version="bzr8766[widelands]"
 map_version_major="0"
 map_version_minor="1"
-map_version_timestamp="1518977682"
+map_version_timestamp="1532429659"
 packet_version="1"
 packet_compatibility="1"