Index: code/branches/tgidronFS16/data/levels/Hover.oxw
===================================================================
--- code/branches/tgidronFS16/data/levels/Hover.oxw	(revision 11184)
+++ code/branches/tgidronFS16/data/levels/Hover.oxw	(revision 11192)
@@ -25,30 +25,4 @@
 MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
 ?>
-<!--
-<Template name=mediumdamagehoverpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.95,0.10,0.05" material="Sphere2" scale=0.1 >
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.70,0.10,0.10" material="Damage" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=damagehover baseclass=DamageBoostPickup>
-  <DamageBoostPickup
-    representation = "mediumdamagehoverpickup"
-    duration = 10.0
-    damageMultiplier = 5.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template> -->
 
 <!-- Shrink Pickup Representation -->
@@ -59,5 +33,5 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,50,0" colour="1.0,0.55,1.0" material="Sphere2" scale=1>
+                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.5>
                         <attached>
                             <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.35 />
@@ -75,5 +49,5 @@
     representation = "smallshrinkpickup"
     duration = 10.0
-    shrinkFactor = 2.5
+    shrinkFactor = 2
     activaionType = "immediate"
     durationType = "continuous"
@@ -88,5 +62,5 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,50,0" colour="0.99,0.96,0.52" material="Sphere2" scale=1>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5>
                         <attached>
                             <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
@@ -104,5 +78,5 @@
     duration = 10.0
     speedAdd = 0.0
-    SpeedMultiply = 50.0
+    SpeedMultiply = 5.0
     activationType = "immediate"
     durationType = "continuous"
@@ -117,5 +91,5 @@
             <StaticEntity>
                 <attached>
-                    <Billboard position="0,50,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=1>
+                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.5>
                         <attached>
                             <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Asterisk" scale=0.65 />
@@ -135,7 +109,7 @@
 
 <Template name=obstacle baseclass=Pawn>
-    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
+    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=10000000000000 name=box RVName = "Box 4" >
         <attached>
-            <Model position="0,50,0" mesh="crate.mesh" scale3D="15,15,15" />
+            <Model position="0,0,0" mesh="crate.mesh" scale3D="15,15,15" />
         </attached>
         <collisionShapes>
@@ -145,4 +119,16 @@
 </Template>
 
+<!-- Ground Template -->
+
+<Template name=ground baseclass=StaticEntity>
+    <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000000 friction=0.01 >
+      <attached> 
+        <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="300,20,300" /> 
+      </attached> 
+      <collisionShapes> 
+        <BoxCollisionShape position="0,0,0" halfExtents="300,10,300" /> 
+      </collisionShapes> 
+    </StaticEntity>
+</Template>
 
 <Level
@@ -156,36 +142,4 @@
   <?lua include("includes/notifications.oxi") ?>
 
-
-  <?lua
-      for i = 1, 10, 1 do
-          for j = 1,10 ,1 do
-  ?>
-
-  <StaticEntity position="0,0,0" collisionType="static">
-    <attached>
-      <Model
-        position="<?lua print(MAZE_CELL_SIZE*i)?>, -16, <?lua print(MAZE_CELL_SIZE*j)?>" 
-        scale3D="<?lua print(MAZE_CELL_SIZE*i)?>, 16, <?lua print(MAZE_CELL_SIZE*j)?>"
-        mesh="CubeGround.mesh"
-        />
-    </attached> 
-      <collisionShapes>
-        <BoxCollisionShape
-          position="<?lua print(MAZE_CELL_SIZE*i)?>, <?lua print(MAZE_CELL_HEIGHT+1)?>, <?lua print(MAZE_CELL_SIZE*j)?>"
-          halfExtents="<?lua print(MAZE_CELL_SIZE*i)?>,1,<?lua print(MAZE_CELL_SIZE*j)?>"
-        />
-        <BoxCollisionShape
-          position="<?lua print(MAZE_CELL_SIZE*i)?>,-1,<?lua print(MAZE_CELL_SIZE*j)?>"
-          halfExtents="<?lua print(MAZE_CELL_SIZE*i)?>,1,<?lua print(MAZE_CELL_SIZE*j)?>"
-        />
-      </collisionShapes>
-
-  <?lua
-      end
-    end
-   ?>
-
-  </StaticEntity>
-
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
@@ -217,12 +171,4 @@
       inventoryRepresentation = "SmallShrink"
     />
-<!--
-    <PickupRepresentation
-      name = "damagehover"
-      pickupName = "Medium Damage Hover Pickup"
-      pickupDescription = "Multiplies the ship damage with 5."
-      spawnerTemplate = "mediumdamagehoverpickupRepresentation"
-      inventoryRepresentation = "MediumDamageHover"
-    /> -->
 
     <StaticEntity position="0,0,0" collisionType="static">
@@ -239,7 +185,9 @@
           pickuptemplateshrink=smallshrinkpickup
           pickuprepresentationtemplateshrink=smallshrinkpickupRepresentation
+          groundtemplate=ground
         />
-        </attached> 
-       
+
+      </attached> 
+     
     </StaticEntity>
 
@@ -262,22 +210,2 @@
   </Scene>
 </Level>
-
-
-
-<!--<<Model
-          position="<?lua print(MAZE_SIZE/2)?>,-16,<?lua print(MAZE_SIZE/2)?>"
-          scale3D="<?lua print(MAZE_SIZE/2)?>,16,<?lua print(MAZE_SIZE/2)?>"
-          mesh="ss_wall.mesh"
-        /> 
-      </attached> 
-      
-      <collisionShapes>
-        <BoxCollisionShape
-          position="<?lua print(MAZE_SIZE/2)?>,<?lua print(MAZE_CELL_HEIGHT+1)?>,<?lua print(MAZE_SIZE/2)?>"
-          halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
-        />
-        <BoxCollisionShape
-          position="<?lua print(MAZE_SIZE/2)?>,-1,<?lua print(MAZE_SIZE/2)?>"
-          halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
-        />
-      </collisionShapes> -->
Index: code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi
===================================================================
--- code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi	(revision 11184)
+++ code/branches/tgidronFS16/data/levels/includes/weaponSettingsHover.oxi	(revision 11192)
@@ -14,8 +14,8 @@
     </links>
     <Weapon>
-      <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1, 1,-18 " projectileMesh="LaserBeam2.mesh" />
+      <HsW01 mode=0 munitionpershot=0 delay=0.125 speed=2000.0f damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1, 1,-50 " projectileMesh="LaserBeam2.mesh" />
     </Weapon>
     <Weapon>
-      <EnergyDrink mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.8, 1, -18.0" projectileMesh="LaserBeam2.mesh" />
+      <HsW01 mode=0 munitionpershot=0 delay=0.125 speed=2000.0f damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.8, 1,-50" projectileMesh="LaserBeam2.mesh" />
     </Weapon>
   </WeaponPack>
@@ -27,5 +27,4 @@
 </weaponpacks>  
 <munition>
-  <LaserMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
-  <FusionMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
+  <LaserMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=20/>
 </munition>
Index: code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt
===================================================================
--- code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt	(revision 11184)
+++ code/branches/tgidronFS16/data/levels/templates/spaceshipHover.oxt	(revision 11192)
@@ -22,5 +22,5 @@
    rotationThrust    = 45
 
-   jumpBoost = 230
+   jumpBoost = 450
 
    lift = 1;
@@ -33,5 +33,5 @@
 
    collisionType     = "dynamic"
-   mass              = 100000
+   mass              = 1000000
    linearDamping     = 0.2
    angularDamping    = 0.9999999
@@ -47,9 +47,9 @@
     </attached>
     <collisionShapes>
-      <BoxCollisionShape position="0,-12, 42" halfExtents="42, 24 ,180" />
+      <BoxCollisionShape position="0,-12, 42" halfExtents="49, 24 ,180" />
     </collisionShapes>
     <explosion>
       <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
-      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=2 />
+      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=12 />
       <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
 
@@ -81,11 +81,11 @@
    speedfront     = 1400
    speedback      =  800
-   speedleftright =  600
-   speedupdown    =  600
+   speedleftright =  700
+   speedupdown    =  700
 
    accelerationfront     = 1000
    accelerationbrake     = 1000
    accelerationback      =  250
-   accelerationleftright =  250
+   accelerationleftright =  350
    accelerationupdown    =  125
   >
Index: code/branches/tgidronFS16/data/overlays/HoverHUD.oxo
===================================================================
--- code/branches/tgidronFS16/data/overlays/HoverHUD.oxo	(revision 11184)
+++ code/branches/tgidronFS16/data/overlays/HoverHUD.oxo	(revision 11192)
@@ -45,13 +45,4 @@
     </HUDHealthBar>
 
-    
-    <HUDNavigation
-     name          = "Navigation"
-     correctaspect = true
-     font          = "Monofur"
-     textsize      = 0.02
-     navMarkerSize = 0.03
-     aimMarkerSize = 0.02
-    />
 
 
