X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=data%2Flevels%2Fworld1%2Fintro.nut;h=60f7e3171ea1144c4853e5a8cdc124b8aed9a971;hb=05168beefeda31176ad7ed5ef4879819e9b6af43;hp=3f33f6c7820205baf4e099fa455244a327e708b1;hpb=984eb094d90cf88e9178fa63761830324daaf427;p=supertux.git

diff --git a/data/levels/world1/intro.nut b/data/levels/world1/intro.nut
index 3f33f6c78..60f7e3171 100644
--- a/data/levels/world1/intro.nut
+++ b/data/levels/world1/intro.nut
@@ -1,7 +1,7 @@
 function intro()
 {  
   //initialize
-  SUPERTUX.set_action("stand-right");
+  SUPERTUX.set_action("big-walk-right");
   RADIO.set_action("quiet");  
   PENNY.set_action("stand-left");
   NOLOK.set_visible(false);
@@ -13,33 +13,37 @@ function intro()
   //begin scrolling sequence
   Effect.fade_in(2);
   Camera.scroll_to(0, 945, 15);
-  Sound.play("music/intro.ogg");
   wait(3);
-  Text.set_text("Somewhere at the shores\nof Antarctica...");
+  Text.set_text(translate ("Somewhere at the shores\nof Antarctica..."));
   Text.fade_in(2);
   wait(3);
   Text.fade_out(2);
   wait(10);
   SUPERTUX.set_velocity(50,0);
   Camera.scroll_to(3100, 945, 18);
-  wait(10);
+  wait(6);
   logo.set_anchor_point(ANCHOR_TOP);
-  logo.set_pos(0, 50);
+  logo.set_pos(0, -120);
   logo.set_visible(true);
-  wait(5);
-  logo.set_visible(false);
+  logo.fade_in(2);
+  logo_in();
   wait(6);
+  logo.fade_out(2);
+  wait(2);
+  logo.set_visible(false);
+  wait(5.3);
   
   //begin conversation and Tux rap
   SUPERTUX.set_velocity(0,0);
-  Sound.play("speech/tux_hello.ogg");
+  SUPERTUX.set_action("big-stand-right");
+  play_sound("speech/tux_hello.ogg");
   wait(3);
-  Sound.play("speech/penny_runt_01.ogg");
+  play_sound("speech/penny_runt_01.ogg");
   wait(1);
-  Sound.play("speech/tux_murp_01.ogg");
+  play_sound("speech/tux_murp_01.ogg");
   wait(1);
   RADIO.set_action("loud");
-  Sound.play("speech/tux_rap.ogg");
+  play_sound("speech/tux_rap.ogg");
   wait(15);
   shake_bush();
   wait(2);
@@ -63,13 +67,13 @@ function intro()
   //wake up, Tux...
   Effect.fade_in(4);
   wait(4);
-  Sound.play("speech/tux_upset.ogg");
+  play_sound("speech/tux_upset.ogg");
   wait(3);
   tux_upset();
   wait(1);
   tux_upset();
   wait(4);
-  SUPERTUX.set_action("stand-right");
+  SUPERTUX.set_action("big-walk-right");
   SUPERTUX.set_velocity(300,0);
   wait(2);
   
@@ -81,24 +85,34 @@ function intro()
 
 function shake_bush()
 {
-  //Sound.play("sounds/rustle.wav");
+  //play_sound("sounds/rustle.wav");
   local bushx = BUSH.get_pos_x();
   local bushy = BUSH.get_pos_y();
   for(local i = 0; i < 20; ++i) {
-    BUSH.set_pos(bushx + rand() % 6 - 3, bushy);
+    BUSH.set_pos(bushx + ( rand() % 6 ) - 3, bushy);
     wait(0.05);
   }
 }
 
 function tux_upset()
 {
-  SUPERTUX.set_action("stand-right");
+  SUPERTUX.set_action("big-walk-right");
   SUPERTUX.set_velocity(200,0);
   wait(0.3);
+  SUPERTUX.set_action("big-stand-right");
   SUPERTUX.set_velocity(0,0);
   wait(0.4);
-  SUPERTUX.set_action("stand-left");
+  SUPERTUX.set_action("big-walk-left");
   SUPERTUX.set_velocity(-200,0);
   wait(0.3);
+  SUPERTUX.set_action("big-stand-left");
 }
 
+function logo_in()
+{
+  local i;
+  for(local i = -120; i <= 90; i+=2) {
+    logo.set_pos(0, i);
+    wait(0.01);
+  }
+}