Merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune into lp:widelands

Proposed by Teppo Mäenpää
Status: Merged
Merged at revision: 8593
Proposed branch: lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune
Merge into: lp:widelands
Diff against target: 74 lines (+8/-8)
6 files modified
data/maps/Last_Bastion_v2.wmf/elemental (+1/-1)
data/maps/Last_Bastion_v2.wmf/objective (+1/-1)
data/maps/Last_Bastion_v2.wmf/player_names (+1/-1)
data/maps/Last_Bastion_v2.wmf/player_position (+1/-1)
data/maps/Last_Bastion_v2.wmf/port_spaces (+1/-1)
data/maps/Last_Bastion_v2.wmf/version (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1669230-lastbastion-finetune
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+337083@code.launchpad.net

Commit message

Minor fixes to Last Bastion map. See LP bug 1669230 for details.

Description of the change

Last bastion map modified:

The red player now has a way to expand around a tower at 10/57. It is not very convenient, but at least the blue can no longer (easily) block the red for good.

Also moved the yellow slot at 26/0 south. Now the players should no longer be able to block each other.

To post a comment you must log in.
Revision history for this message
Teppo Mäenpää (kxq) wrote :

I tried to keep the changes small. However, if this is ever merged, and people play network with pre-merge and post-merge versions, there are desyncs. That could be avoided by renaming the map (like v2 -> v3). I do not think a rename is needed. Using different bzr versions can act like this.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 3128. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/336637447.
Appveyor build 2935. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1669230_lastbastion_finetune-2935.

Revision history for this message
kaputtnik (franku) wrote :

Since this is a change of the map it should be clear that this is a new version, imho.

Revision history for this message
GunChleoc (gunchleoc) wrote :

You lost the localization markup in the elemental packet. This happens because our profile class doesn't support saving that when you update a map.

Having desyncs is fine, we do not guarantee multiplayer compatibility between versions.

Revision history for this message
Teppo Mäenpää (kxq) wrote :

@GunChleoc: Thanks for spotting, is this okay now?

Revision history for this message
GunChleoc (gunchleoc) wrote :

Yes, code is OK now. Somebody should still test to make sure that the issue is resolved.

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

I have left a comment in the bug - I think we need one more small building plot.

If you want to rename the map directory, please use bzr mv.

Revision history for this message
kaputtnik (franku) wrote :

I think this is ok.

@bunnybot merge

Revision history for this message
Teppo Mäenpää (kxq) wrote :

When may I conclude that bunnybot has, once again, decided not to merge. What is the problem this time?

Revision history for this message
Teppo Mäenpää (kxq) wrote :

Oh, I forgot that you did a merge. We might be waiting for travis and appveyor.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Yep, Travis still has some catching up to do, because Bunnybot had indeed gotten confused due to problems with Launchpad.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Codecheck failure is already in trunk, so it needs to be fixed there

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/maps/Last_Bastion_v2.wmf/binary/heights'
2Binary files data/maps/Last_Bastion_v2.wmf/binary/heights 2016-03-21 19:29:24 +0000 and data/maps/Last_Bastion_v2.wmf/binary/heights 2018-02-18 07:19:08 +0000 differ
3=== modified file 'data/maps/Last_Bastion_v2.wmf/binary/terrain'
4Binary files data/maps/Last_Bastion_v2.wmf/binary/terrain 2016-03-21 19:29:24 +0000 and data/maps/Last_Bastion_v2.wmf/binary/terrain 2018-02-18 07:19:08 +0000 differ
5=== modified file 'data/maps/Last_Bastion_v2.wmf/elemental'
6--- data/maps/Last_Bastion_v2.wmf/elemental 2016-09-18 07:01:55 +0000
7+++ data/maps/Last_Bastion_v2.wmf/elemental 2018-02-18 07:19:08 +0000
8@@ -1,4 +1,4 @@
9-# Automatically created by Widelands bzr7890[trunk] (Debug)
10+# Automatically created by Widelands bzr8578[trunk] (Release)
11
12 [global]
13 packet_version="1"
14
15=== modified file 'data/maps/Last_Bastion_v2.wmf/minimap.png'
16Binary files data/maps/Last_Bastion_v2.wmf/minimap.png 2016-03-21 19:29:24 +0000 and data/maps/Last_Bastion_v2.wmf/minimap.png 2018-02-18 07:19:08 +0000 differ
17=== modified file 'data/maps/Last_Bastion_v2.wmf/objective'
18--- data/maps/Last_Bastion_v2.wmf/objective 2016-03-21 19:29:24 +0000
19+++ data/maps/Last_Bastion_v2.wmf/objective 2018-02-18 07:19:08 +0000
20@@ -1,4 +1,4 @@
21-# Automatically created by Widelands bzr7890[trunk] (Debug)
22+# Automatically created by Widelands bzr8578[trunk] (Release)
23
24 [global]
25 packet_version="2"
26
27=== modified file 'data/maps/Last_Bastion_v2.wmf/player_names'
28--- data/maps/Last_Bastion_v2.wmf/player_names 2016-03-21 19:29:24 +0000
29+++ data/maps/Last_Bastion_v2.wmf/player_names 2018-02-18 07:19:08 +0000
30@@ -1,4 +1,4 @@
31-# Automatically created by Widelands bzr7890[trunk] (Debug)
32+# Automatically created by Widelands bzr8578[trunk] (Release)
33
34 [global]
35 packet_version="2"
36
37=== modified file 'data/maps/Last_Bastion_v2.wmf/player_position'
38--- data/maps/Last_Bastion_v2.wmf/player_position 2016-03-21 19:29:24 +0000
39+++ data/maps/Last_Bastion_v2.wmf/player_position 2018-02-18 07:19:08 +0000
40@@ -1,4 +1,4 @@
41-# Automatically created by Widelands bzr7890[trunk] (Debug)
42+# Automatically created by Widelands bzr8578[trunk] (Release)
43
44 [global]
45 packet_version="2"
46
47=== modified file 'data/maps/Last_Bastion_v2.wmf/port_spaces'
48--- data/maps/Last_Bastion_v2.wmf/port_spaces 2016-03-21 19:29:24 +0000
49+++ data/maps/Last_Bastion_v2.wmf/port_spaces 2018-02-18 07:19:08 +0000
50@@ -1,4 +1,4 @@
51-# Automatically created by Widelands bzr7890[trunk] (Debug)
52+# Automatically created by Widelands bzr8578[trunk] (Release)
53
54 [global]
55 packet_version="1"
56
57=== modified file 'data/maps/Last_Bastion_v2.wmf/version'
58--- data/maps/Last_Bastion_v2.wmf/version 2016-03-21 19:29:24 +0000
59+++ data/maps/Last_Bastion_v2.wmf/version 2018-02-18 07:19:08 +0000
60@@ -1,11 +1,11 @@
61-# Automatically created by Widelands bzr7890[trunk] (Debug)
62+# Automatically created by Widelands bzr8578[trunk] (Release)
63
64 [global]
65 map_source_url=
66 map_release=
67-map_creator_version="bzr7890[trunk]"
68+map_creator_version="bzr8578[trunk]"
69 map_version_major="0"
70 map_version_minor="1"
71-map_version_timestamp="1458237592"
72+map_version_timestamp="1517587055"
73 packet_version="1"
74 packet_compatibility="1"

Subscribers

People subscribed via source and target branches

to status/vote changes: