Changeset 4765

Timestamp:

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

Author:

snellen

Message:

adapted all the scripts to the new trunk

Location:

data/trunk/scripts

Files:

• cutscene/cutscene.lua (modified) (10 diffs)
• spacestation/spaceship_hangar.lua (modified) (2 diffs)
• spacestation/spaceship_tower.lua (modified) (2 diffs)
• spacestation/switchtohangar.lua (modified) (1 diff)
• spacestation/switchtotower.lua (modified) (1 diff)
• vertical_scroller/vs1.lua (modified) (8 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" ) 

data/trunk/scripts/spacestation/spaceship_hangar.lua

@@ -1 +1 @@
  -- Create the trigger
-trigger = ScriptTrigger()
+trigger = TickTrigger()
 trigger:setName("maintrigger")
 trigger:setScript("spaceship_hangar.lua")
 trigger:setFunction("tick")
-trigger:setActiveOnCreation(true)
+
  
-triggerZero = ScriptTrigger()
+triggerZero = SpaceTrigger()
 triggerZero:setScript("spaceship_hangar.lua")
 triggerZero:setFunction("startQuestThree")
@@ -16 +16 @@
 
 
-triggerOne = ScriptTrigger()
+triggerOne = SpaceTrigger()
 triggerOne:setScript("spaceship_hangar.lua")
 triggerOne:setFunction("startQuestTwo")

data/trunk/scripts/spacestation/spaceship_tower.lua

@@ -1 +1 @@
  -- Create the trigger
-trigger = ScriptTrigger()
+trigger = TickTrigger()
 trigger:setName("maintrigger")
 trigger:setScript("spaceship_tower.lua")
 trigger:setFunction("tick")
-trigger:setActiveOnCreation(true)
-
-triggerOne = ScriptTrigger()
+
+triggerOne = SpaceTrigger()
 triggerOne:setScript("spaceship_tower.lua")
 triggerOne:setFunction("startSecondQuest")
@@ -14 +13 @@
 --triggerOne:setDebugDraw(true)
 
-triggerTwo = ScriptTrigger()
+triggerTwo = SpaceTrigger()
 triggerTwo:setScript("spaceship_tower.lua")
 triggerTwo:setFunction("startThirdQuest")

data/trunk/scripts/spacestation/switchtohangar.lua

@@ -1 +1 @@
  -- Create the trigger
-trigger = ScriptTrigger()
+trigger = SpaceTrigger()
 trigger:setScript("switchtohangar.lua")
 trigger:setFunction("tick")

data/trunk/scripts/spacestation/switchtotower.lua

@@ -1 +1 @@
   -- Create the trigger
-trigger = ScriptTrigger()
+trigger = SpaceTrigger()
 trigger:setScript("switchtotower.lua")
 trigger:setFunction("tick")

data/trunk/scripts/vertical_scroller/vs1.lua

@@ -42 +42 @@
 -- thisscript:addObjectAsName("GameWorld", "Mission 1", "gameWorld")
 
-triggerInit = ScriptTrigger()
+triggerInit = TickTrigger()
 triggerInit:setScript("vs1.lua")
 triggerInit:setFunction("init")
-triggerInit:setActiveOnCreation(true)
 
 -- Create the cutscene trigger
-triggerCutscene = ScriptTrigger()
+triggerCutscene = SpaceTrigger()
 triggerCutscene:setScript("vs1.lua")
 triggerCutscene:setFunction("startSequence")
@@ -55 +54 @@
 triggerCutscene:setAbsCoor(2300 , 0 , 0)
 triggerCutscene:setDebugDraw(false)
-triggerCutscene:setActiveOnCreation(false)
 
 -- Create another cutscene trigger
-triggerCutscene02 = ScriptTrigger()
+triggerCutscene02 = TickTrigger()
 triggerCutscene02:setScript("vs1.lua")
 triggerCutscene02:setFunction("switchToOtherPirate")
-triggerCutscene02:setActiveOnCreation(true)
 
 -- Create another cutscene trigger
-triggerCutscene03 = ScriptTrigger()
+triggerCutscene03 = TickTrigger()
 triggerCutscene03:setScript("vs1.lua")
 triggerCutscene03:setFunction("surviver")
-triggerCutscene03:setActiveOnCreation(true)
 
 -- Create another cutscene trigger
-triggerCutscene04 = ScriptTrigger()
+triggerCutscene04 = TickTrigger()
 triggerCutscene04:setScript("vs1.lua")
 triggerCutscene04:setFunction("onNoxons")
-triggerCutscene04:setActiveOnCreation(true)
 
 -- Create another cutscene trigger
-triggerCutscene05 = ScriptTrigger()
+triggerCutscene05 = TickTrigger()
 triggerCutscene05:setScript("vs1.lua")
 triggerCutscene05:setFunction("changeFromNoxon")
-triggerCutscene05:setActiveOnCreation(true)
+
 
 -- Create another trigger
-triggerStop = ScriptTrigger()
+triggerStop = SpaceTrigger()
 triggerStop:setScript("vs1.lua")
 triggerStop:setFunction("stopPlayer")
@@ -89 +84 @@
 triggerStop:setAbsCoor(8000 , 0 , -2000)
 triggerStop:setDebugDraw(false)
-triggerStop:setActiveOnCreation(false)
 
 -- Create the cool Ragnar trigger
-triggerRagnar = ScriptTrigger()
+triggerRagnar = SpaceTrigger()
 triggerRagnar:setScript("vs1.lua")
 triggerRagnar:setFunction("startRagnar")
@@ -99 +93 @@
 triggerRagnar:setAbsCoor(3600 , 0 , -15)
 triggerRagnar:setDebugDraw(false)
-triggerRagnar:setActiveOnCreation(false)
 
 -- Create a great AI activater
---triggerAI01 = ScriptTrigger()
+--triggerAI01 = SpaceTrigger()
 --triggerAI01:setScript("vs1.lua")
 --triggerAI01:setFunction("activateGroup1")
@@ -112 +105 @@
 
 -- Create another great AI activater
---triggerAI02 = ScriptTrigger()
+--triggerAI02 = SpaceTrigger()
 --triggerAI02:setScript("vs1.lua")
 --triggerAI02:setFunction("activateGroup2")
@@ -119 +112 @@
 --triggerAI02:setAbsCoor(4900, 0, -45)
 --triggerAI02:setDebugDraw(false)
---triggerAI02:setActiveOnCreation(false)
 
 -- Create another great AI activater
---triggerAI03 = ScriptTrigger()
+--triggerAI03 = SpaceTrigger()
 --triggerAI03:setScript("vs1.lua")
 --triggerAI03:setFunction("activateGroup3")
@@ -129 +121 @@
 --triggerAI03:setAbsCoor(5850, 0, -170)
 --triggerAI03:setDebugDraw(false)
---triggerAI03:setActiveOnCreation(false)
 
 -- Create another great AI activater
---triggerAI04 = ScriptTrigger()
+--triggerAI04 = SpaceTrigger()
 --triggerAI04:setScript("vs1.lua")
 --triggerAI04:setFunction("startRagnar2")
@@ -139 +130 @@
 --triggerAI04:setAbsCoor(6500, 0, -350)
 --triggerAI04:setDebugDraw(false)
---triggerAI04:setActiveOnCreation(false)
+