widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1377394 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1377394 in widelands: "Map background images refactoring"
  https://bugs.launchpad.net/widelands/+bug/1377394

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1377394/+merge/237172

Uniform names for campaign background images.

I tested that they will load, i.e. no snafus in the conf files.
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1377394/+merge/237172
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1377394 into lp:widelands.

=== modified file 'campaigns/atl01.wmf/elemental'
--- campaigns/atl01.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/atl01.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -9,4 +9,4 @@
 name=_"01 – From Nemesis to Genesis"
 author="SirVer,Nasenbaer"
 descr=_ "After landing on a mysterious island close to Atlantis, the remaining Atlanteans struggle to make a new home for themselves."
-background="campaigns/atl01.wmf/pics/everythinglost.jpg"
+background="campaigns/atl01.wmf/pics/background.jpg"

=== renamed file 'campaigns/atl01.wmf/pics/everythinglost.jpg' => 'campaigns/atl01.wmf/pics/background.jpg'
=== modified file 'campaigns/emp01.wmf/elemental'
--- campaigns/emp01.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/emp01.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -7,4 +7,4 @@
 name=_"01 – The Strands of Malac’ Mor"
 author=Nasenbaer
 descr=_"After losing an important battle against the barbarians which lead to the loss of a big part of the Empire’s territory, Lutius leaves Fremil to start a new life. But his destiny takes his ship into a heavy storm, which nearly destroys it. Only with a lot of luck he manages to beach his damaged ship on an unknown desert strand and save his people. For now."
-background="tribes/empire/pics/campmap-emp01.jpg"
+background="campaigns/emp01.wmf/pics/background.jpg"

=== renamed file 'tribes/empire/pics/campmap-emp01.jpg' => 'campaigns/emp01.wmf/pics/background.jpg'
=== modified file 'campaigns/emp02.wmf/elemental'
--- campaigns/emp02.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/emp02.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -9,4 +9,4 @@
 name=_"02 – An Outpost for Exile"
 author=Nasenbaer
 descr=_"Finally the ship was repaired, so Lutius and his people returned to the quest to find a good place for a new beginning. Only a few days later, they land on a green, Mediterranean island, looking like paradise. Overjoyed, they set out to explore this new living space."
-background="tribes/empire/pics/campmap-emp02.jpg"
+background="campaigns/emp01.wmf/pics/background.jpg"

=== renamed file 'tribes/empire/pics/campmap-emp02.jpg' => 'campaigns/emp02.wmf/pics/background.jpg'
=== modified file 'campaigns/t01.wmf/elemental'
--- campaigns/t01.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/t01.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -7,4 +7,4 @@
 name=_"01 – Eyes in the Dark"
 author=Winterwind
 descr=_"In this tutorial, the basic gameplay and control as well as basic production buildings of the Barbarians are introduced."
-background="tribes/barbarians/pics/campmap-tut1+2.jpg"
+background="campaigns/t01.wmf/pics/background.jpg"

=== added file 'campaigns/t01.wmf/pics/background.jpg'
Binary files campaigns/t01.wmf/pics/background.jpg	1970-01-01 00:00:00 +0000 and campaigns/t01.wmf/pics/background.jpg	2014-10-04 18:39:03 +0000 differ
=== modified file 'campaigns/t02.wmf/elemental'
--- campaigns/t02.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/t02.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -7,4 +7,4 @@
 name=_"02 – A Place to Call Home"
 author=Winterwind
 descr=_"In this scenario, the higher production buildings including mining and military expansions will be introduced."
-background="tribes/barbarians/pics/campmap-tut1+2.jpg"
+background="campaigns/t02.wmf/pics/background.jpg"

=== added file 'campaigns/t02.wmf/pics/background.jpg'
Binary files campaigns/t02.wmf/pics/background.jpg	1970-01-01 00:00:00 +0000 and campaigns/t02.wmf/pics/background.jpg	2014-10-04 18:39:03 +0000 differ
=== modified file 'campaigns/tutorial01.wmf/elemental'
--- campaigns/tutorial01.wmf/elemental	2014-02-25 10:47:47 +0000
+++ campaigns/tutorial01.wmf/elemental	2014-10-04 18:39:03 +0000
@@ -7,4 +7,4 @@
 name=_"Tutorial 1"
 author="Winterwind, SirVer, Nasenbaer"
 descr=_"Basic Tutorial – a map based on Winterwind’s tutorial 1 for the Barbarians"
-background="tribes/barbarians/pics/campmap-tut1+2.jpg"
+background="campaigns/tutorial01.wmf/pics/background.jpg"

=== added directory 'campaigns/tutorial01.wmf/pics'
=== renamed file 'tribes/barbarians/pics/campmap-tut1+2.jpg' => 'campaigns/tutorial01.wmf/pics/background.jpg'