[Super-tux-commit] supertux/data/levels/world1 extro.txt,NONE,1.1 intro.txt,NONE,1.1 de.po,1.1,1.2 worldmap.stwm,1.1,1.2

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/data/levels/world1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16796/data/levels/world1

Modified Files:
	de.po worldmap.stwm 
Added Files:
	extro.txt intro.txt 
Log Message:
-Incorporated Marcin Kościelnicki patch that reintroduces the flying
 snowball, thanks
-Changed worldmapfile format to support intro texts
-Moved intro.txt extro.txt and extro-bonus.txt to levels/world1 and
 levels/bonus1
-Added a new text mode to the textfile system display that aligns the text at
 the left side. This is alot easier to read than all text centered.
 Still the current font is hard to read for long texts and should be
 improved/replaced somehow...
-Use new translation system in the .txt files


Index: de.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.po	2 Dec 2004 01:41:55 -0000	1.1
+++ de.po	5 Dec 2004 16:57:12 -0000	1.2
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: world 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-02 02:10+0100\n"
+"POT-Creation-Date: 2004-12-05 17:38+0100\n"
 "PO-Revision-Date: 2004-12-02 02:25+0100\n"
 "Last-Translator:  <ma...@br...>\n"
 "Language-Team: German <de...@li...>\n"
@@ -17,6 +17,57 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: data/levels/world1/intro.txt:5
+msgid ""
+"-Penny gets captured!\n"
+"\n"
+"#Tux and Penny were out having a nice\n"
+"#picnic on the ice fields of Antarctica.\n"
+"#Suddenly, a creature jumped from\n"
+"#behind an ice bush, there was a flash,\n"
+"#and Tux fell asleep!\n"
+"\n"
+"#When Tux wakes up, he finds that Penny\n"
+"#is missing. Where she lay before now\n"
+"#lies a letter. \"Tux, my arch enemy!\"\n"
+"#says the letter. \"I have captured\n"
+"#your beautiful Penny and have taken her\n"
+"#to my fortress. The path to my fortress\n"
+"#is littered with my minions. Give up on\n"
+"#the thought of trying to reclaim her,\n"
+"#you haven't a chance! -Nolok\"\n"
+"\n"
+"#Tux looks and see Nolok's fortress in\n"
+"#the distance. Determined to save his\n"
+"#beloved Penny, he begins his journey."
+msgstr ""
+"-Penny ist verschwunden!\n"
+"\n"
+"#Tux und Penny sassen gemütlich beim Picknick\n"
+"#in den eisigen Ebenen der Antarktis.\n"
+"#Plötzlich sprang eine dunkle Kreatur hinter\n"
+"#einem Felsen hervor. Tux sah einen grellen\n"
+"#Blitz, dann wurde er ohnmächtig.\n"
+"\n"
+"#Als er aufwachte bemerkte er, dass Penny\n"
+"#verschwunden war. Wo sie eben noch gesessen\n"
+"#hatte lag jetzt ein Zettel:\n"
+"\n"
+"#\"Tux, mein Erzfeind!\n"
+"#Ich habe deine Freundinn Penny entführt und\n"
+"#halte sie in meiner Festung gefangen. Den Weg\n"
+"#dorthin bewachen meine finsteren Kreaturen!\n"
+"#Versuche gar nicht erst sie zu retten, du\n"
+"#hast keine Chance! -Nolok\"\n"
+"\n"
+"#Tux blickte auf und sah Noloks Festung in\n"
+"#der Ferne. Fest entschlossen seine gelibte\n"
+"#Penny zu retten machte er sich auf den Weg.\n"
+
+#: data/levels/world1/worldmap.stwm:4
+msgid "Icyisland"
+msgstr ""
+
 #: data/levels/world1/level1.stl:5
 msgid "Welcome to Antarctica"
 msgstr "Willkommen in Antarktika"
@@ -24,3 +75,78 @@
 #: data/levels/world1/level2.stl:5
 msgid "The Journey Begins"
 msgstr "Die Reise Beginnt"
+
+#: data/levels/world1/level3.stl:5
+msgid "Via Nostalgica"
+msgstr ""
+
+#: data/levels/world1/extro.txt:7
+#, fuzzy
+msgid ""
+"-Entering Nolok's Throne Room!\n"
+"\n"
+"#Tux ran into Nolok's throne room,\n"
+"#frantically searching for his beloved.\n"
+"#Alas, he found neither Penny nor Nolok\n"
+"#there, but instead, another note.\n"
+"\n"
+"#\"Well done, Tux, well done. If you are\n"
+"#reading this, you have removed my\n"
+"#control over this icy fortress. But as\n"
+"#you can see, your beloved Penny is not\n"
+"#here. What you did not realize is that\n"
+"#this is just one of my many fortresses,\n"
+"#spread far across the lands!\n"
+"\n"
+"#\"Tux, your ambition is most honorable,\n"
+"#but futile nonetheless. With every\n"
+"#fortress you conquer of mine, I will\n"
+"#escape to another, and take Penny with\n"
+"#me. Do not be silly... it is best that\n"
+"#you give up now.\"\n"
+"\n"
+"#Tux was sadly leaving the room, when he\n"
+"#felt something beneath his foot... an\n"
+"#envelope, addressed to him! Inside was\n"
+"#a roughly sketched map with fortresses\n"
+"#drawn in various lands. On the corner\n"
+"#of the map was Penny's signature, a\n"
+"#drawing of the ice flower.\n"
+"\n"
+"#Tux ran out of the fortress, map in\n"
+"#hand. No, he decided, he would not give\n"
+"#up. Penny was counting on him."
+msgstr ""
+"-In Noloks Thronsaal\n"
+"#Tux betrat Noloks Thronsaal und\n"
+"#suchte verzweifelt nach seiner Geliebten,\n"
+"#leider konnte er weder Penny noch Nolok\n"
+"#dort entdecken, stattdessen fand er eine\n"
+"#weitere Nachricht.\n"
+"\n"
+"#\"Gut gemaacht mein leiber Tux, sehr gut.\n"
+"#Wenn du dies hier liest, hast du diese\n"
+"#eisige Festung von mir befreit. Aber wie\n"
+"#du siehst ist deine geliebte Penny nicht\n"
+"#hier. Hast du nicht gemerkt, dass dies\n"
+"#nur eine meiner vielen Festungen ist,\n"
+"#die über die ganze Welt verteilt sind!\n"
+"\n"
+"#\"Tux, dein Bestreben ist ehrenwert, und\n"
+"#dennoch vergeblich. Mit jeder meiner\n"
+"#Festungen die du eroberst, werde ich zu\n"
+"#einer weiteren fliehen. Sei nicht dumm,\n"
+"#es wäre das beste jetzt aufzugeben.\n"
+"\n"
+"#Tux verliess traurig den Sall, als etwas\n"
+"#unter seinem Fuss raschelte...\n"
+"#Ein Briefumschlag mit seinem Namen!\n"
+"#In dem Umschlag war eine grobe Karte,\n"
+"#die Festungen in verschiedenen Ländern\n"
+"#zeigte. Auf der Rückseite der Karte war\n"
+"#Pennys Zeichen, das Bild einer Eisblume.\n"
+"\n"
+"#Tux nahm die Karte in die Hand und rannte\n"
+"#aus der Festung. Nein, er würde nicht\n"
+"#einfach aufgeben. Penny verliess sich auf\n"
+"#ihn.\n"

Index: worldmap.stwm
===================================================================
RCS file: /cvsroot/super-tux/supertux/data/levels/world1/worldmap.stwm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- worldmap.stwm	2 Dec 2004 00:25:26 -0000	1.1
+++ worldmap.stwm	5 Dec 2004 16:57:12 -0000	1.2
@@ -1,10 +1,11 @@
 ;; Generated with Flexlay Editor
 (supertux-worldmap
   (properties 
-    (name  "Icyisland")
+    (name (_ "Icyisland"))
     (name-pt_PT  "Ilha Gelada")
     (name-de "Eisige Insel")
     (name-es "Isla de hielo")
+    (intro-filename "intro.txt")
     (music "salcon.mod")
     (start_pos_x 4)
     (start_pos_y 5))

--- NEW FILE: intro.txt ---
; Introduction text
(supertux-text
  (background "arctis.jpg")

  (text (_ "-Penny gets captured!

#Tux and Penny were out having a nice
#picnic on the ice fields of Antarctica.
#Suddenly, a creature jumped from
#behind an ice bush, there was a flash,
#and Tux fell asleep!

#When Tux wakes up, he finds that Penny
#is missing. Where she lay before now
#lies a letter. \"Tux, my arch enemy!\"
#says the letter. \"I have captured
#your beautiful Penny and have taken her
#to my fortress. The path to my fortress
#is littered with my minions. Give up on
#the thought of trying to reclaim her,
#you haven't a chance! -Nolok\"

#Tux looks and see Nolok's fortress in
#the distance. Determined to save his
#beloved Penny, he begins his journey."))
)


--- NEW FILE: extro.txt ---
; Ending text
(supertux-text
  (background "extro.jpg")
  (music "theme.mod")
  (show-after "CREDITS")

  (text (_ "-Entering Nolok's Throne Room!

#Tux ran into Nolok's throne room,
#frantically searching for his beloved.
#Alas, he found neither Penny nor Nolok
#there, but instead, another note.

#\"Well done, Tux, well done. If you are
#reading this, you have removed my
#control over this icy fortress. But as
#you can see, your beloved Penny is not
#here. What you did not realize is that
#this is just one of my many fortresses,
#spread far across the lands!

#\"Tux, your ambition is most honorable,
#but futile nonetheless. With every
#fortress you conquer of mine, I will
#escape to another, and take Penny with
#me. Do not be silly... it is best that
#you give up now.\"

#Tux was sadly leaving the room, when he
#felt something beneath his foot... an
#envelope, addressed to him! Inside was
#a roughly sketched map with fortresses
#drawn in various lands. On the corner
#of the map was Penny's signature, a
#drawing of the ice flower.

#Tux ran out of the fortress, map in
#hand. No, he decided, he would not give
#up. Penny was counting on him."))
)