Index: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	(revision 11620)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	(revision 11624)
@@ -5,9 +5,6 @@
  screenshot = "orxonoxArcade.png"
 />
-<FlappyOrx
-      spawnDistance=50 
-      Speed = 700 />
+
 <?lua
-  include("includes/notifications.oxi")
   include("templates/lodInformation.oxt")
   include("templates/spaceshipFlappyOrx.oxt")
@@ -50,5 +47,5 @@
             collisionType = dynamic
             linearDamping = 0.8
-            angularDamping = 0
+            angularDamping = 1
             scale = "<?lua print(j) ?>"
             collisiondamage = 10000
@@ -60,5 +57,5 @@
             </attached>
             <collisionShapes>
-              <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
+              <SphereCollisionShape radius="<?lua print(j + 7) ?>" />
             </collisionShapes>
           </MovableEntity>
Index: code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeapon.oxi
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeapon.oxi	(revision 11620)
+++ 	(revision )
@@ -1,30 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-9.2,2,-13" />
-      <WeaponSlot position=" 9.2,2,-13" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weaponpacks>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="laserbeam.mesh" />
-        </Weapon>
-        <Weapon>
-          <InvaderWeapon mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="laserbeam.mesh" />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-      </WeaponPack>
-    </weaponpacks>
-    <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
-    </munition>
Index: code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeaponEnemy.oxi
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/includes/FlappyOrxWeaponEnemy.oxi	(revision 11620)
+++ 	(revision )
@@ -1,30 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-9.2,2,-13" />
-      <WeaponSlot position=" 9.2,2,-13" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weaponpacks>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <InvaderWeaponEnemy mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="laserbeam.mesh" />
-        </Weapon>
-        <Weapon>
-          <InvaderWeaponEnemy mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="laserbeam.mesh" />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-      </WeaponPack>
-    </weaponpacks>
-    <munition>
-      <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
-    </munition>
Index: code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	(revision 11620)
+++ code/branches/FlappyOrx_HS17/data/levels/templates/spaceshipFlappyOrx.oxt	(revision 11624)
@@ -23,16 +23,13 @@
 
   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" />
