Changeset 11624 for code/branches/FlappyOrx_HS17/data

Timestamp:

Dec 4, 2017, 2:38:03 PM (6 years ago)

Author:

merholzl

Message:

More clean-up, particle fix, deleting unnecessary files, adding quotes

Location:

code/branches/FlappyOrx_HS17/data

Files:

• levels/FlappyOrx.oxw (modified) (3 diffs)
• levels/includes/FlappyOrxWeapon.oxi (deleted)
• levels/includes/FlappyOrxWeaponEnemy.oxi (deleted)
• levels/templates/spaceshipFlappyOrx.oxt (modified) (1 diff)
• overlays/FlappyOrxHUD.oxo (modified) (1 diff)
• particle/fire3.particle (modified) (1 diff)

code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw

@@ -5 +5 @@
  screenshot = "orxonoxArcade.png"
 />
-<FlappyOrx
-      spawnDistance=50 
-      Speed = 700 />
+
 <?lua
-  include("includes/notifications.oxi")
   include("templates/lodInformation.oxt")
   include("templates/spaceshipFlappyOrx.oxt")
@@ -50 +47 @@
             collisionType = dynamic
             linearDamping = 0.8
-            angularDamping = 0
+            angularDamping = 1
             scale = "<?lua print(j) ?>"
             collisiondamage = 10000
@@ -60 +57 @@
             </attached>
             <collisionShapes>
-              <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
+              <SphereCollisionShape radius="<?lua print(j + 7) ?>" />
             </collisionShapes>
           </MovableEntity>

code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt

@@ -23 +23 @@
 
   speedBase = 100
-  speedIncrease = 2
-  tubeDistanceBase = 300
-  tubeDistanceIncrease = -3
+  speedIncrease = 0.5
+  tubeDistanceBase = 200
+  tubeDistanceIncrease = -1
 
-  upwardThrust = 200
-  gravity = 500
+  upwardThrust = 210
+  gravity = 700
 
   >
-    <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipFlappyOrxengine />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipFlappyOrxengine />
-    </engines>
+   
     <attached>
       <Model position="0,0,0" yaw=180 pitch=90 roll=270 scale=9 mesh="FlappyOrxShip.mesh" />

code/branches/FlappyOrx_HS17/data/overlays/FlappyOrxHUD.oxo

@@ -1 @@
-
-
+<Template name="spectatorhud">
+  <OverlayGroup name = "spectatorhud" scale = "1, 1">
+  </OverlayGroup>
+</Template>
 <Template name="FlappyOrxHUD">
   <OverlayGroup name="FlappyOrxHUD" scale = "1, 1">

code/branches/FlappyOrx_HS17/data/particle/fire3.particle

@@ -65 +65 @@
                 colour3 0 0 0 0
                 time3   1
-                colour4 0.5 0.5 0.5 0
-                time4   1
-                colour5 0.5 0.5 0.5 0
-                time5   1
+                
         }
 }