Changeset 4765 for data/trunk/scripts/cutscene

Timestamp:

Apr 6, 2007, 7:14:55 PM (18 years ago)

Author:

snellen

Message:

adapted all the scripts to the new trunk

File:

• data/trunk/scripts/cutscene/cutscene.lua (modified) (10 diffs)

data/trunk/scripts/cutscene/cutscene.lua

@@ -1 +1 @@
 -- Main trigger
-trigger = ScriptTrigger()                     -- Create the trigger
+trigger = TickTrigger()                     -- Create the trigger
 trigger:setScript("cutscene.lua")             -- Tell the trigger which script to call
 trigger:setFunction("tick")                   -- Tell the trigger which scriptfunction to call
-trigger:setActiveOnCreation(true)      
+ 
 
 
 -- Cameraswitchzero
-triggerZero = ScriptTrigger()
+triggerZero = SpaceTrigger()
 triggerZero:setScript("cutscene.lua")
 triggerZero:setFunction("switchCamToBomber")
@@ -17 +17 @@
 
 -- Cameraswitchone
-triggerOne = ScriptTrigger()
+triggerOne = SpaceTrigger()
 triggerOne:setScript("cutscene.lua")
 triggerOne:setFunction("switchCamTargetToEarth")
@@ -27 +27 @@
 
 -- Cameraswitchtwo
-triggerTwo = ScriptTrigger()
+triggerTwo = SpaceTrigger()
 triggerTwo:setScript("cutscene.lua")
 triggerTwo:setFunction("switchCamToSpaceship")
@@ -36 +36 @@
 
 -- Cameraswitchthree
-triggerThree = ScriptTrigger()
+triggerThree = SpaceTrigger()
 triggerThree:setScript("cutscene.lua")
 triggerThree:setFunction("switchCamToStation")
@@ -46 +46 @@
 
 -- startScenery
-triggerFour = ScriptTrigger()
+triggerFour = SpaceTrigger()
 triggerFour:setScript("cutscene.lua")
 triggerFour:setFunction("startSceneryOne")
@@ -53 +53 @@
 triggerFour:setRadius(5)
 --triggerFour:setDebugDraw(true)  
+
+-- Scroller
+triggerScr = TimeTrigger()                  
+triggerScr:setScript("cutscene.lua")             
+triggerScr:setFunction("startScrolling")
+triggerScr:setDelay(10)
 
 
@@ -104 +110 @@
 end
 
-
 -- Start
 function startSceneryOne(timestep)
@@ -158 +163 @@
 fighterThree:pause(true)
 bomberThree:pause(true)
-bomberFour:pause(false)
-
-return true
-
-end
-
+bomberFour:pause(true)
+
+return true
+
+end
+
+-- Start the scrolling screen
+function startScrolling(timestep)
+scrollingScreen:start()
+return true
+end
 
 -- THE tick function
@@ -169 +179 @@
 function tick(timestep)
 time = time + timestep
+triggerScr:start()
 
 if not sceneryOneStopped then
@@ -204 +215 @@
 end
 
-if time > 10 then
-   scrollingScreen:start()
-end
-
-
 if time > 6 and stationReached then
 gameWorld:setNextStoryName( "Space Station 1" )