Index: code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw
===================================================================
--- code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	(revision 11580)
+++ code/branches/FlappyOrx_HS17/data/levels/FlappyOrx.oxw	(revision 11596)
@@ -1,5 +1,5 @@
 <LevelInfo
  name = "Flappy Orx"
- description = "TODO"
+ description = "A clone of the iconic Flappy Bird"
  tags = "minigame"
  screenshot = "orxonoxArcade.png"
@@ -7,14 +7,8 @@
 
 <?lua
-  include("stats.oxo")
   include("templates/lodInformation.oxt")
-?>
+  include("templates/spaceshipFlappyOrx.oxt")
+  include("overlays/FlappyOrxHUD.oxo")
 
-<?lua
-  include("templates/spaceshipAssff2.oxt")
-  include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipFlappyOrx.oxt")
-  include("templates/enemyFlappyOrx.oxt")
-  include("overlays/FlappyOrxHUD.oxo")
 ?>
 
@@ -26,13 +20,9 @@
     <Template link=lodtemplate_default />
   </templates>
-  <?lua include("includes/notifications.oxi") ?>
 
-    <!-- ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox" -->
   <Scene
     ambientlight = "0.8, 0.7, 0.4"
     skybox     = "Orxonox/skyBoxBasic"
   >
-
   <WorldAmbientSound
     source="Earth.ogg"
@@ -41,6 +31,5 @@
   />
 
-    <!-- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/> -->
-    <Light type=directional position="11000, 11000, -7000" lookat="0, 0, 0" diffuse="1, 1, 1, 1" specular="1.0, 0.9, 0.9, 1.0" />
+ <Light type=directional position="11000, 11000, -7000" lookat="0, 0, 0" diffuse="1, 1, 1, 1" specular="1.0, 0.9, 0.9, 1.0" />
     <SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=FlappyOrxShip pawndesign=spaceshipFlappyOrx />
 
@@ -48,6 +37,4 @@
     <FlappyOrxCenterPoint name=flappyorxcenter />
     
-
-
     <?lua
       for i = 1, 5, 1 do
@@ -55,22 +42,22 @@
     ?>
 
-    <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>>
-      <MovableEntity
-        collisionType = dynamic
-        linearDamping = 0.8
-        angularDamping = 0
-        scale = "<?lua print(j) ?>"
-        collisiondamage = 10000
-        enablecollisiondamage = true
-      >
-      
-        <attached>
-          <Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" />
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
-        </collisionShapes>
-      </MovableEntity>
-    </Template>
+        <Template name=Asteroid<?lua print(j) ?>_<?lua print(i) ?>>
+          <MovableEntity
+            collisionType = dynamic
+            linearDamping = 0.8
+            angularDamping = 0
+            scale = "<?lua print(j) ?>"
+            collisiondamage = 10000
+            enablecollisiondamage = true
+          >
+          
+            <attached>
+              <Model mass="1000" mesh="ast<?lua print(i) ?>.mesh" />
+            </attached>
+            <collisionShapes>
+              <SphereCollisionShape radius="<?lua print(j + 5) ?>" />
+            </collisionShapes>
+          </MovableEntity>
+        </Template>
 
     <?lua
@@ -78,53 +65,4 @@
       end
     ?>
-
-    <!--
-     <?lua
-      for i = 1, 30, 1 do
-        j = math.random()
-    ?>
-
-    <MovableEntity
-      position = "<?lua print(i* 300) ?>,0, <?lua print(j* 200) ?>"
-      collisionType = dynamic
-      linearDamping = 0.8
-      angularDamping = 0
-      scale = "<?lua print(10)?>"
-      collisiondamage = 100000
-      enablecollisiondamage = true
-    >
-    
-      <attached>
-        <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(10) ?>" />
-      </collisionShapes>
-    </MovableEntity>
-
-     <MovableEntity
-      position = "<?lua print(i* 300) ?>,0,<?lua print(-150 + j* 200) ?>"
-      collisionType = dynamic
-      linearDamping = 0.8
-      angularDamping = 0
-      scale = "<?lua print(10)?>"
-      collisiondamage = 100000
-      enablecollisiondamage = true
-    >
-    
-      <attached>
-        <Model mass="1000" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(10) ?>" />
-      </collisionShapes>
-    </MovableEntity>
-
-    <?lua
-      end
-    ?>
-  -->
-    
-    
   </Scene>
 </Level>
