Changeset 4597 for data/trunk

Timestamp:

Jan 28, 2007, 9:58:32 PM (18 years ago)

Author:

snellen

Message:

cutscene continued

Location:

data/trunk

Files:

• levels/sp_cutscene_intro.oxw (modified) (7 diffs)
• scripts/cutscene/cutscene.lua (modified) (2 diffs)
• textures/planets/earth_no_clouds_2048.jpg (added)

data/trunk/levels/sp_cutscene_intro.oxw

@@ -26 +26 @@
             <mode>1</mode>
             <speed>10</speed>
-             <addPoint>625, 0, -25</addPoint>
+             <addPoint>610, 0, -25</addPoint>
              <addPoint>-1000,0,-25</addPoint>
           </Track>
@@ -62 +62 @@
             <mode>1</mode>
             <speed>13</speed>
-             <addPoint>-490,-5,-160</addPoint>
+             <addPoint>-475,-5,-160</addPoint>
              <addPoint>1000,-5,-160</addPoint>
           </Track>
@@ -86 +86 @@
             <mode>1</mode>
             <speed>12.8</speed>
-             <addPoint>10,-5,-1500</addPoint>
-             <addPoint>10,-5,100</addPoint>
-             <addPoint>10,0,150</addPoint>
-             <addPoint>10,0,200</addPoint>
-             <addPoint>100,20,500</addPoint>
+             <addPoint>3,2,-730</addPoint>
+             <addPoint>3,2,100</addPoint>
+             <addPoint>3,2,150</addPoint>
+             <addPoint>7,2,200</addPoint>
+             <addPoint>15,5,500</addPoint>
 
           </Track>
@@ -124 +124 @@
           </Track>
             <Weapons>
-             <AcidLauncher>
+             <LaserCannon>
                <slot>0, 0</slot>
-             </AcidLauncher>
-             <AcidLuncher>
+             </LaserCannon>
+             <LaserCannon>
                <slot>0, 1</slot>
-             </AcidLuncher>
+             </LaserCannon>
             </Weapons>
 
@@ -154 +154 @@
             <size>175</size>
             <abs-coor>-75, 0, 300</abs-coor>
-            <texture>textures/planets/mars.png</texture>
+          <abs-dir>3.1412, 1,0,0</abs-dir>
+            <texture>textures/planets/earth_no_clouds_2048.jpg</texture>
             <cloud-texture>textures/planets/halo.png</cloud-texture>
           </Planet>
@@ -162 +163 @@
          <texture>textures/planets/pluto.png</texture>
          <size>25</size>
-         <abs-coor> 100, 0 , -200</abs-coor>
+         <abs-coor> 100, 0 , -225</abs-coor>
          <abs-dir>3.1412, 0,1,0</abs-dir>
         </Planet>
@@ -232 +233 @@
   </CameraMan>
 
-  <Music>music/task_horizon_-_menu1.ogg</Music>
+  <Music>music/tower01.ogg</Music>
 
   <LightManager>

data/trunk/scripts/cutscene/cutscene.lua

@@ -47 +47 @@
 -- Get objects from orxonox
 thisscript:addObject("CameraMan", "cameraManager")
+thisscript:addObject("NPC", "fighterThree")
 thisscript:addObjectAsName("GameWorld", "Cut Scene", "gameWorld")
 
@@ -101 +102 @@
 end
 
+if time > 3 and time < 4 then
+fighterThree:fire()
+end
+
 if not cameraSwitched then
 cameraManager:setCam("CameraOne")