Changeset 4570

Timestamp:

Jan 28, 2007, 10:45:36 AM (17 years ago)

Author:

snellen

Message:

updated cutscene

Location:

data/trunk

Files:

• levels/sp_cutscene_intro.oxw (modified) (3 diffs)
• scripts/cutscene/cutscene.lua (modified) (5 diffs)

data/trunk/levels/sp_cutscene_intro.oxw

@@ -22 +22 @@
         <NPC>
           <name>shutleOne</name>
-          <model>models/spaceships/noxon_spaceship_fighter.obj, 0.2</model>
-          <abs-coor>110, 0, 175</abs-coor>
+          <model>models/spaceships/human_spaceship_fighter.obj,0.2</model>
+          <abs-coor>200, 0, 175</abs-coor>
           <abs-dir> 3.14,0,1,0 </abs-dir>
         </NPC>
@@ -29 +29 @@
         <Planet>
             <name>Earth</name>
-            <size>400</size>
+            <size>325</size>
             <abs-coor>-75, 0, 400</abs-coor>
             <texture>textures/planets/mars.png</texture>
@@ -90 +90 @@
      <Track>
        <mode>1</mode>
-       <speed>0.25</speed>
+       <speed>0.1</speed>
        <addPoint>0,0,-200</addPoint>
        <addPoint>0,0,-150</addPoint>

data/trunk/scripts/cutscene/cutscene.lua

@@ -19 +19 @@
 triggerTwo:setScript("cutscene.lua")
 triggerTwo:setFunction("switchCamToSpaceship")
-triggerTwo:setAbsCoor(0, 0 , 125)
+triggerTwo:setAbsCoor(0, 0 , 150)
 triggerTwo:setTarget("CameraOne")
 triggerTwo:setRadius(5)
@@ -42 +42 @@
 -- Global Variables
 time = 0
+stationReached = false
+fadeout = false
 bInit = 0
 bInit2 = 0
@@ -76 +78 @@
 function switchCamToStation(timestep)
 cameraManager:atachCurrCameraToWorldEntity("Building", "zhara")
-
+stationReached = true
+time = 0
 --cameraManager:detachCurrCamera()
 return true
@@ -87 +90 @@
 time = time + timestep
 
+shutle:tick(timestep)
+
 if bInit == 0 then
   cameraManager:initFadeBlack()
+  gameWorld:showText("Earth Solar System");
   bInit = 1
 end
 
-if time > 1 and bInit2 == 0 then
+if time > 2 and bInit2 == 0 then
    cameraManager:toggleFade()
-   gameWorld:showText("Earth Solar System");
    bInit2 = 1
 end
-
-shutle:tick(timestep)
 
 if not cameraSwitched then
@@ -107 +110 @@
 end
 
-if time > 4 then
---cameraManager:toggleFade()
---return true
+if time > 4  and stationReached and not fadeout then
+cameraManager:toggleFade()
+fadeout = true
+end
+
+if time > 6 and stationReached then
+gameWorld:setNextStoryName( "Space Station 1" ) 
+gameWorld:stop()
+return true
 end