Changeset 4090

Timestamp:

Jul 4, 2006, 1:39:11 PM (18 years ago)

Author:

bensch

Message:

orxonox/presentation better player

Location:

data/branches/presentation

Files:

• scripts/spaceship_flight.lua (copied) (copied from data/branches/presentation/scripts/thestranger.lua) (1 diff)
• worlds/DefaultCampaign.oxc (modified) (1 diff)
• worlds/sp_level_ambush_at_jupiter.oxw (modified) (6 diffs)

data/branches/presentation/scripts/spaceship_flight.lua

@@ -1 +1 @@
 -- Global Variables
-panic = false             -- True if thestranger panics.
-walkingRouteOne = false   -- True if thestranger is walking route one
+thisscript:addObject("GameWorld", "Ambush_at_Jupiter")
 
 
-function togglePanic(timestep)
-panic = not panic
-return false
-end
-
-
-function walkRouteOne()
-
-
-end
-
-function flee()
-
-
-end
 
 
 function tick(timestep)
 
-if not walkingRouteOne then
-walkRouteOne()
-routeOneTriggered = true
+ Ambush_at_Jupiter:setPlaymode("Horizontal")
+
+ return true
 end
-
-if panic then
-flee(timestep)
-end
-
-
-return false
-end

data/branches/presentation/worlds/DefaultCampaign.oxc

@@ -24 +24 @@
       <identifier>2</identifier>
       <nextid>3</nextid>
-      <name>Ambush at Jupiter</name>
+      <name>Ambush_at_Jupiter</name>
       <path>worlds/sp_level_ambush_at_jupiter.oxw</path>
       <menu-entry>1</menu-entry>

data/branches/presentation/worlds/sp_level_ambush_at_jupiter.oxw

@@ -1 +1 @@
 <WorldDataFile>
-  <name>Ambush at Jupiter</name>
+  <name>Ambush_at_Jupiter</name>
   <menu-item-image>pictures/menu/Scienceproject_512x512.jpg</menu-item-image>
   <screenshoot>pictures/menu/Scienceproject_512x512.jpg</screenshoot>
@@ -45 +45 @@
     </Script>
 
+    <Script>
+     <file>spaceship_flight.lua</file>
+    </Script>
+
    </Scripts>
 
@@ -115 +119 @@
     </ScriptTrigger>
 
+    <ScriptTrigger>
+     <name>spaceship_flight_trigger</name>
+     <file>spaceship_flight.lua</file>
+     <function>tick</function>
+     <abs-coor>1300, -21.959781, -1695</abs-coor>
+     <radius>100</radius>
+     <worldentity>SPACE_CRAFT</worldentity>
+     <debugdraw>true</debugdraw>
+    </ScriptTrigger>
+
    </ScriptTriggers>
 
@@ -125 +139 @@
      <name>Sky</name>
      <Materialset>pictures/sky/simple_space</Materialset>
-     <Size>10000</Size>
+     <Size>100000</Size>
     </SkyBox>
 
@@ -229 +243 @@
 
     <Spacecraft2D>
-      <name>spaceship</name>
-      <model>models/ships/mantawing.obj, 10</model>
+      <name>SPACE_CRAFT</name>
+      <model>models/ships/mantawing.obj, 5</model>
       <abs-coor>1600, 0.004610, -1700.0</abs-coor>
       <enter-radius>100000</enter-radius>
-      <travel-speed>10</travel-speed>
-      <travel-height>-30</travel-height>
+      <travel-speed>20</travel-speed>
+      <travel-height>5</travel-height>
     </Spacecraft2D>
 
@@ -258 +272 @@
 
 
-   <SpaceShip>
+    <SpaceShip>
       <name>spaceship3</name>
       <model>models/ships/powerdrifter.obj,15</model>