Index: code/trunk/data/levels/FPSTest.oxw
===================================================================
--- code/trunk/data/levels/FPSTest.oxw	(revision 7679)
+++ code/trunk/data/levels/FPSTest.oxw	(revision 7679)
@@ -0,0 +1,71 @@
+<LevelInfo
+ name = "FPS testlevel"
+ description = "Level to test First Person Shooter"
+ tags = "test"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "fps"
+ description  = "tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.1, 0.1, 0.1"
+   skybox       = "Orxonox/skypanoramagen1"
+   gravity      = "0,-1000,0"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
+   hasPhysics   = true
+  >
+    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+  <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="10000,10000,1000" />
+      </collisionShapes>
+  </StaticEntity>
+
+<?lua
+for i = 1, 10, 1
+do ?>
+    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,100,<?lua print(math.random() * 1000 - 500) ?>" direction="-1, 0, 0" lookat="0,0,0" spawnclass=FpsPlayer pawndesign=fps />
+<?lua
+end
+?>
+
+
+<?lua
+for i = 1, 200, 1
+do
+j = math.random()
+?>
+  <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
+      <attached>
+        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="<?lua print(j * 100) ?>" />
+      </collisionShapes>
+  </MovableEntity>
+<?lua
+end
+?>
+
+  </Scene>
+</Level>
+
Index: code/trunk/data/levels/Fight in our Back.oxw
===================================================================
--- code/trunk/data/levels/Fight in our Back.oxw	(revision 7677)
+++ 	(revision )
@@ -1,482 +1,0 @@
-<LevelInfo
-  name = "Fight in our Back"
-  description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  tags = "" 
-/>
-
-<?lua
-    include("stats.oxo")
-    include("hudtemplates3.oxo")
-    include("templates/lodinformation.oxt")
-    include("templates/spaceship_assff.oxt")
-    include("templates/spaceship_pirate.oxt")
-    include("templates/spaceship_Transporter.oxt")
-?>
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!--Including Template for triggering on player-->
-
-<Template name=spaceshipassffplayer>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   engine                 = spaceshipassffengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-      <DistanceTriggerBeacon name="PlayerDistanceTrigger" /> <!--added DistanceTrigger-->
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponsettings3.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<!--*****************************************************************************************************************************************************************************************-->
-<Level
-  name="Fight in our back"
-  description="Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  gametype=TeamDeathmatch
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-    <!-- Ausgang: Szene ===> ambientlight/skybox -->
-    <Scene
-     ambientlight="0.8,0.8,0.8"
-     skybox="Orxonox/skypanoramagen1"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <!--Light: noch zu aendern -->
-        <Light type=directional position="0,0,0" direction="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
-
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!--Quests-->
-    <GlobalQuest id="FightInOurBack.DiscoveryMission_">
-        <QuestDescription title="Discovery mission" description="Your team has to scout out this sector." failMessage="You failed!" completeMessage="You won. You have reached the end of this level." />
-        <subquests>
-            <GlobalQuest id="FightInOurBack.FollowYourGroupLeader">
-                <QuestDescription title="Follow your group leader" description="Your task is to follow the team leader and to destroy all the enemy spaceships on your way!" failMessage="You failed!" completeMessage="Good job!" />
-            </GlobalQuest>
-            <GlobalQuest id="FightInOurBack.TransportersAhead">
-                <QuestDescription title="Transporters ahead" description="This is a lucky day for us. We have found supplies that the enemy is transporting in these Transporters. We have to destroy them." failMessage="You failed!" completeMessage="Good job!" />
-            </GlobalQuest>
-            <GlobalQuest id="FightInOurBack.TheySentUsAssistance">
-                <QuestDescription title="They sent us assistance" description="The transporters will surely be heavily protected but our base sent us assistance. It should now be easier to destroy them." failMessage="You failed" completeMessage="Good job!" />
-            </GlobalQuest>
-        </subquests>
-    </GlobalQuest>
-
-
-<!--Quests____END-->
-<!--*****************************************************************************************************************************************************************************************-->
-
-
-<!--Player's Spawnpoints -->
-        <!--Spieler Spawnpoint ===> position/direction--> <!-- funktioniert noch nicht ab naechtem Mal wahrscheinlich-->
-        <SpawnPoint position="0,50,25" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="true" >
-            <events>
-                <activity>
-                    <EventListener event="activateFirstSpawnpoint" />
-                </activity>
-            </events>
-        </SpawnPoint>
-
-        <SpawnPoint position="10000,0,3000" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="false" >
-            <events>
-                <activity>
-                    <EventListener event="activateSecondSpawnpoint" />
-                </activity>
-            </events>
-        </SpawnPoint>
-    
-<!--Player's Spawnpoint END-->
-
-<!--Launching Quests -->
-        <QuestEffectBeacon position="0,50,25" times="1">
-            <effects>
-                <AddQuest questId="FightInOurBack.DiscoveryMission_" />
-                <AddQuest questId="FightInOurBack.FollowYourGroupLeader" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="FightInOurBack_MainStart_FollowStart"/>
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger name="FightInOurBack_MainStart_FollowStart" position="0,0,0" distance="50" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" />
-                <!--<Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />-->
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="8000,0,3100" times=1 >
-            <effects>
-                <AddQuest questID="FightInOurBack.TransportersAhead" />
-                <AddQuest questID="FightInOurBack.TheySentUsAssistance" />
-                <CompleteQuest questID="FightInOurBack.FollowYourGroupLeader" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event="FightInOurBack_FollowEnd_DTranspStart_AssisStart" />
-                </execute>
-            </events>
-            <attached>
-                <!--<Billboard position="0,0,0" colour="1,1,1" material="Examples/Flare" />-->
-                <DistanceTrigger name="FightInOurBack_FollowEnd_DTranspStart_AssisStart" position="0,0,0" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" stayactive=1 activations=1 />
-            </attached>
-        </QuestEffectBeacon>
-    
-<!---->
-    
-<!--Launching Quests END -->
-
-<!--Creating Transporters OK-->
-
-
-<?lua for i=0,0,1 do
-x=800
-health=2750
-?>
-    <!--Transporter 1-->
-    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
-    <events>
-    <trigger>
-        <SpaceShip position="<?lua print(3800-i*x) ?>,0,3000" lookat="<?lua print(4800-i*x) ?>,0,4000" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
-            <templates>
-                   <Template link=spaceshipTransporter />
-             </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=1000 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(14800-i*x) ?>,0,3000"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip><!---->
-    </trigger>
-    </events>
-    </EventTrigger>
-<?lua end ?>
-
-
-<?lua for j=0,1,1 do 
-health=1600
-x=800
-z=j*300
-?>
-    <!--Transporter 2,3-->
-    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
-    <events>
-    <trigger>
-        <SpaceShip position="<?lua print(2600+x) ?>,0,<?lua print(3150-z) ?>" lookat="<?lua print(3500+x) ?>,0,<?lua print(4150-z) ?>" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
-            <templates>
-                   <Template link=spaceshipTransporter />
-             </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=1000 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(13500+x) ?>,0,<?lua print(3150-z) ?>"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip><!---->
-    </trigger>
-    </events>
-    </EventTrigger>
-<?lua end ?>
-
-
-<!--Creating Transporters END _-->
-
-<!--Creating player's team OK-->
-        <!--Spaceships team 0 (player:team=0)-->
-        <SpaceShip position="50,0,0" lookat="2050,0,-1000" health="500" maxhealth="500" initialhealth="500" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2050,0,-1000" />
-                        <Model mesh="cube.mesh" scale=0 position="6050,0,0" />
-                        <Model mesh="cube.mesh" scale=0 position="10050,0,3000" />
-                        <Model mesh="cube.mesh" scale=0 position="3050,0,3000" />
-                        <Model mesh="cube.mesh" scale=0 position="-4050,0,3000" />
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-        <!--Second Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,100" lookat="2000,0,-950" health="400" maxhealth="400" initialhealth="400" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2000,0,-900" />
-                        <Model mesh="cube.mesh" scale=0 position="6000,0,0" />
-                        <Model mesh="cube.mesh" scale=0 position="10000,0,3100" />
-                        <Model mesh="cube.mesh" scale=0 position="3000,0,3100" />
-                        <Model mesh="cube.mesh" scale=0 position="-4000,0,3100"/>
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-        <!--third Spaceship team 0 (player: team 0)-->
-        <SpaceShip position="0,0,-100" lookat="2000,0,-1050" health="400" maxhealth="400" initialhealth="400" >
-             <templates>
-                  <Template link=spaceshipassff />
-            </templates>
-             <controller>
-                <WaypointPatrolController alertnessradius=2000 team=0 >
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="2000,0,-1100" />
-                        <Model mesh="cube.mesh" scale=0 position="6000,0,-100" />
-                        <Model mesh="cube.mesh" scale=0 position="10000,0,2900" />
-                        <Model mesh="cube.mesh" scale=0 position="3000,0,2900" />
-                        <Model mesh="cube.mesh" scale=0 position="-4000,0,2900" />
-                    </waypoints>
-                </WaypointPatrolController>
-             </controller>
-        </SpaceShip>
-<!--Creating player's team END  -->
-
-
-<!--Asteroids (field OK --> 
-
-<?lua for i=0,100,1 do
-x=math.random(250,4000)
-y=math.random(-500,500)
-z=math.random(1000,2000)
-scale=math.random(20,70)
-?>
-<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>">
-    <attached>
-        <Model scale=<?lua print(scale) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
-    </attached>
-    <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
-    </collisionShapes>
-</MovableEntity>
-<?lua end ?>
-
-<!--Asteroids (field) END -->
-
-<!--Asteroids (random) END OK-->
-
-<?lua for i=0,150,1 do
-x=math.random(-8000,8000)
-y=math.random(-8000,8000)
-z=math.random(-8000,8000)
-?>
-<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>" >
-    <attached>
-        <Model scale=<?lua print(math.random(20,70)) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
-    </attached>
-    <collisionShapes>
-            <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
-        </collisionShapes>
-</MovableEntity>
-<?lua end ?>
-
-<!--Asteroids (random) END -->
-
-<!--Creating spaceships (player's team) OK-->
-<!---->
-<!--Trigger to activate this Team (TEAM NO 1)-->
-    <DistanceTrigger name="activateTeam0No1" position="8000,0,3100" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
-
-<!--TEAM NO 1 (activationType : distance || killing a spaceship what belongs to TEAM 0 NO 0)-->
-<?lua for i=0,9,1 do
-x=math.random(-500,500)
-y=math.random(-300,300)
-z=math.random(-300,300)
-?>
-    <EventTrigger name="activateTeam0No1" activations=1 stayactive="true">
-        <events>
-            <trigger>
-                <SpaceShip position="<?lua print(x+4500) ?>,<?lua print(y) ?>,<?lua print(z+6000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
-                    <templates>
-                        <Template link=spaceshipassff />
-                    </templates>
-                    <controller>
-                        <WaypointPatrolController alertnessradius=2000 team=0 active=false>
-                            <waypoints>
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4500+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(x-4000) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                            </waypoints>
-                            <events>
-                                <activity>
-                                    <EventListener event="activateTeam0No1" />
-                                </activity>
-                            </events>
-                        </WaypointPatrolController>
-                    </controller>
-                </SpaceShip>
-            </trigger>
-        </events>
-    </EventTrigger>
-
-
-<?lua end ?>
-
-<!---->
-<!--Creating spaceships (player's team) END -->
-
-<!--Creating spaceships (enemy) OK-->
-<!---->
-<!--TEAM 1 NO 1 (activationType : killing a Transporter || killing a spaceship what belongs to TEAM 1 NO 1)-->
-<?lua for i=0,11,1 do
-x=math.random(-500,500)
-y=math.random(-300,300)
-z=math.random(-300,300)
-?>
-    <EventTrigger name="activateTeam1No1" activations=1 stayactive="true" >
-        <events>
-            <trigger>
-                <SpaceShip position="<?lua print(x+3800) ?>,<?lua print(y+3000) ?>,<?lua print(z+3000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
-                    <templates>
-                        <Template link=spaceshippirate />
-                    </templates>
-                    <controller>
-                        <WaypointPatrolController alertnessradius=5000 team=1 active=false>
-                            <waypoints>
-                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
-                            </waypoints>
-                            <events>
-                                <activity>
-                                    <EventListener event="activateTeam1No1" />
-                                </activity>
-                            </events>
-                        </WaypointPatrolController>
-                    </controller>
-                </SpaceShip>
-            </trigger>
-        </events>
-    </EventTrigger>
-
-<?lua end ?>
-<!---->
-<!--Creating spaceships (enemy) END -->
-
-<!--Enemies on the way to the transporters -->
-
-<?lua for i=0,1,1 do 
-z=math.random(-300,300)
-?>
-<!--NO 1-->
-        <SpaceShip position="<?lua print(5900+i*100) ?>,0,-3000" lookat="2500,0,-1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(2500+100*i) ?>,0,-1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-
-<!--NO 4-->
-        <SpaceShip position="<?lua print(9000) ?>,13000,<?lua print(z*i+3000) ?>" lookat="1000,0,3000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(10000) ?>,0,<?lua print(3000+z*i) ?>" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-
-<!--NO 3-->
-        <SpaceShip position="<?lua print(200+13000) ?>,0,10000" lookat="8000,0,1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(200+8000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua for i=0,1,1 do ?>    
-        <SpaceShip position="<?lua print(i*400+13000) ?>,100,10000" lookat="8000,0,1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(i*400+8000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-
-<!--NO 2-->
-<?lua for i=0,3,1 do ?>
-        <SpaceShip position="<?lua print(math.random(5500,6500)+2000) ?>,0,1000" lookat="2500,0,-1000">
-            <templates>
-                <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-                <WaypointPatrolController alertnessRadius=1500 team=1>
-                    <waypoints>
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1250" />
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,250,1000" />
-                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1000" />
-                    </waypoints>
-                </WaypointPatrolController>
-            </controller>
-        </SpaceShip>
-<?lua end ?>
-
-<!--Creating spaceships (enemy) END -->
-
-<Trigger invert=true name="activateFirstSpawnpoint">
-    <DistanceTrigger name="activateSecondSpawnpoint" position="10000,0,3000" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
-</Trigger>
-
-    </Scene>
-</Level>
Index: code/trunk/data/levels/Quest_PirateAttack.oxw
===================================================================
--- code/trunk/data/levels/Quest_PirateAttack.oxw	(revision 7677)
+++ 	(revision )
@@ -1,561 +1,0 @@
-<LevelInfo
- name = "Pirate Attack"
- description = "Dani's Testlevel"
- tags = "test"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_HXY_SL.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Template name=spaceshipassffplayer defaults=0>
-  <SpaceShip template=spaceshipassff name=player>
-    <attached>
-    <DistanceTriggerBeacon name=Me/>
-    </attached>
-  </SpaceShip>
-</Template>
-
-<?lua
-    dofile("includes/CuboidSpaceStation.lua")
-?>
-    
-<Level
-name="Dani's Testlevel"
-description="Erste Versuche mit den Quests"
-gametype=TeamDeathmatch
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-    <Scene
-        ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skypanoramagen1"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <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" />
-
-
-          <GlobalQuest id="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551">
-        <QuestDescription title="Fight for freedom"
-                    description="Just a few hours ago, a group of pirates attacked an killed all your  squad members. Now you are very angry and you want to take revenge. Find the pirates and kill them!"
-                    failmessage="You are a loser, now the whole universe will be controlled by the pirates!"
-                    completeMessage="Yeah, you did it! You,ve eliminated the enemies. But why attacked them the Humans here? For tousands of years, there was peace in this sun system.
-                                You have to find out what happened exactly and why the pirates attacked..."/>
-            <subquests>
-                <GlobalQuest id="3159b4d4-bc86-4190-ba1d-4530668dfe31">
-                    <QuestDescription title="The stolen stick..."
-                    description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You received a message from your Headquarter: The pirates have stolen
-                            a very important memory stick with secret infos (military locations etc.), the holy stick. You must get it back! Otherwise the humans are in great danger..."
-                    failmessage=""
-                    completeMessage="Unbelievable, you annihilated all pirates and got the stolen memory stick.
-                                But wait... this isn't the memory stick you looked for, this stick is one from a pirate... anyway, it's helpful: There is a map saved on it, which leads you to a pirate - base. Perhaps you'll find more
-                                about their plans there..."/>
-                </GlobalQuest>
-                <GlobalQuest id="8d8ed3a6-74a6-4491-9172-26155cff151d">
-                    <QuestDescription title="Find the Base"
-                    description="Now you are in possession of the map and it should be easy to find the base. Because you are a Member of an elite-fight-squad, your ship has been pimped before you started your mission.
-                        They installed a very modern navigation system, which leads you precisely to your desired destination. Use it to find the pirate - base."
-                    failmessage=""
-                    completeMessage="The navigation system worked very well and now you should be near a pirate -base." />
-                    <hints>
-                        <QuestHint id="965101b3-26ce-4fcf-bc71-17cc2a87d2e9">
-                        <QuestDescription title="3 Ways?"
-                        description="The different ways leads you to the possible positions where the base could be. The problem is that the map is encrypted and your on board system is not
-                                able to decrypt it exactly. Therefore you have to try 3 possible ways...Tha base is Huge, but it could be that it's invisible when ou are in longer distance (some Big Ships
-                                have a special shield aroud them which make them invisible at longer range)."/>
-                        </QuestHint>
-                    </hints>
-                </GlobalQuest>
-                <GlobalQuest  id="9930a598-98bc-4ff8-8cc0-31311a6ccaaa">
-                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
-                </GlobalQuest>
-                <GlobalQuest id="9930a598-98bc-4ff8-8cc0-31311a6ccaab">
-                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
-                </GlobalQuest>
-                <GlobalQuest id="8a62408b-c47b-4e02-bd3d-06bb9ec0b363">
-                    <QuestDescription title="The Base"
-                    description="Yeah, you found the Base... now let's check if there is the important holy stick..."
-                    failmessage=""
-                    completeMessage="There it is, the Holy stick. Yes, you're right. It looks like a rocket because there are so many rockets in the universe, that it's nearly impossible to find the holy stick between them.
-                                Anyway, the pirates found the stick... another part which is confusing. Why did they know where the holy stick is? Perpaps they know more about the humans than you think."/>
-                </GlobalQuest>
-                <GlobalQuest id="85380d05-b791-45d1-82e9-01f0bc930367">
-                    <QuestDescription title="Find out more about the pirates"
-                    description= "Now, the Holy stick is back in your possession. Your new mission is to get some more infos about the pirates. You've got an info about a near mining company
-                    which delivers Hydrogen out of special asteroids. Hydrogen is a very rare ressource on earth and is delivered by a few great mining companys. There is no oil anymore on earth since many years.
-                    Therefore hydrogen became the most important energy source for all humans.
-                    But back to your mission. The mining company has it's own security. Ask some of their security staff if they know more about the pirates... it's actually your only hope to get more infos.
-                    You'll find the mining company at the near planet with the asteroid belt."
-                    failmessage=""
-                    completeMessage=""/>
-                </GlobalQuest>
-                <GlobalQuest id="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734">
-                    <QuestDescription title="Interesting..."
-                    description= "You're very lucky. The first security man has interesting infos about the pirates. He said that they made a few attacks in de last few weeks and they intensified the attacks in the last days...
-                    Shit, they attack one more time. Fight them back!"
-                    failmessage=""
-                    completeMessage=""/>
-                </GlobalQuest>
-            </subquests>
-            <hints>
-                <QuestHint id="2b85f32c-2433-4f1a-bdd4-f24d20c9403c">
-                    <QuestDescription title="Useful to know" description="Pirates like to hide themselves behind asteroids."/>
-                </QuestHint>
-            </hints>
-            <fail-effects>
-            </fail-effects>
-            <complete-effects>
-            </complete-effects>
-        </GlobalQuest>
-    
-          <ParticleSpawner position="0,0,0" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint1 team=0 active=true/>
-              </trigger>
-            </events>
-              </EventTrigger>
-            </spawn>
-          </events>
-          <attached>
-            <QuestEffectBeacon position="0,0,0" times=1>
-            <effects>
-                <AddQuest questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" />
-            </effects>
-            <events>
-                <execute>
-                <EventListener event=questbeacon1 />
-                </execute>
-            </events>
-            <attached>
-                <DistanceTrigger name=questbeacon1 position="0,0,0" distance=100 target=DistanceTriggerBeacon targetname=Me/>
-            </attached>
-            </QuestEffectBeacon>
-          </attached>
-        </ParticleSpawner>
-    
-        <SpawnPoint position="600,300,-6000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint2 active=false/>
-    
-    
-    
-        <!-- Add second Quest-->
-        <QuestEffectBeacon position="250,-300,-1500" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="1.0,1.0,0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon2 targetname=Me position="0,0,0" target=DistanceTriggerBeacon distance=400 />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon2 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Hint to first Quest-->
-        <QuestEffectBeacon position="0,0,0" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon3  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me delay="5" />
-                    </attached>
-                    <effects>
-                        <AddQuestHint hintId="2b85f32c-2433-4f1a-bdd4-f24d20c9403c" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon3 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!--Pirates killed... navi leads you to possible Base stations-->
-        <QuestEffectBeacon position="600,300,-6000" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="0,1.0,0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon4  position="0,0,0" distance=200 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-    
-                    <effects>
-                        <CompleteQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
-                        <AddQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
-                        <AddQuestHint hintId="965101b3-26ce-4fcf-bc71-17cc2a87d2e9" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon4 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!-- Wrong way 1-->
-        <QuestEffectBeacon position="7600,300,-8000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon5  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon5 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Wrong way 2-->
-        <QuestEffectBeacon position="1600,2300,-10000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon8  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-                    <effects>
-                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon8 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-        <!-- Base found!-->
-        <QuestEffectBeacon position="4600,5300,-11000" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon6  position="0,0,0" distance=600 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
-                        <AddQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
-                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
-                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon6 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-        <!--Stick found-->
-        <QuestEffectBeacon position="4800,5785,-10725" times=1>
-                    <attached>
-                        <DistanceTrigger name=questbeacon7  position="0,0,0" distance=30 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
-                        <AddQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon7 />
-                        </execute>
-                    </events>
-                </QuestEffectBeacon>
-    
-    
-        <!--Security Man found-->
-        <QuestEffectBeacon position="4000,4000,-20000" times=1>
-                    <attached>
-                        <Billboard position="0,0,0" scale=3 colour="0,0,1.0" material="Examples/Flare" />
-                        <DistanceTrigger name=questbeacon9 position="0,0,0" distance=500 target=DistanceTriggerBeacon targetname=Me />
-                    </attached>
-                    <effects>
-                        <CompleteQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
-                        <AddQuest questId="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734" />
-    
-                    </effects>
-                    <events>
-                        <execute>
-                            <EventListener event=questbeacon9 />
-                        </execute>
-                    </events>
-        </QuestEffectBeacon>
-    
-    <!--Navigation System which shows possiple positions of base-->
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=Navi />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-
-            <?lua
-                for i = 0, 30
-                do
-            ?>
-        <Billboard position="<?lua print(i*1000/30+600) ?>,<?lua print(i*2000/30+300) ?>,<?lua print(-i*4000/30-6000) ?>" colour="1.0,0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:1600,2300,-10000-->
-        <Billboard position="<?lua print(i*7000/30+600) ?>,<?lua print(i*0/30+300) ?>,<?lua print(-i*2000/30-6000) ?>" colour="0,1.0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:7600,300,-8000-->
-        <Billboard position="<?lua print(i*4000/30+600) ?>,<?lua print(i*5000/30+300) ?>,<?lua print(-i*5000/30-6000) ?>" colour="0,0,1.0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:4600,5300,-11000-->
-            <?lua
-                end
-            ?>
-    
-    <!--Base&Stick spawn*****************************************************************-->
-    <StaticEntity scale=1 position="4650,5350,-11050" name=base visible=true active=true yaw=60>
-                <attached>
-                    <?lua
-                        createSpaceStationPar(9851,2,1,2,1,2,1,100)
-                    ?>
-                </attached>
-            </StaticEntity>
-    
-    <ParticleSpawner position="4650,5350,-11050" source="Orxonox/explosion1" name=base visible=false active=false loop=0/>
-    <Model position="4800,5785,-10725" scale=3 mesh="rocket.mesh" visible=true active=true name=base />
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=base />
-             <EventTarget target=navipirate1 />
-              <EventTarget target=navipirate2 />
-                </targets>
-                <events>
-                    <visibility>
-          <EventTrigger invert=true>
-            <events>
-              <trigger>
-                <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </visibility>
-                    <activity>
-                <EventTrigger invert=true>
-            <events>
-              <trigger>
-                             <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </activity>
-                </events>
-            </EventDispatcher>
-
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=base />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    
-    <!--Base&Stick spawn********end*****************************************************-->
-    
-    <!--Change spawnoint-->
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=spawnpoint1 />
-                </targets>
-                <events>
-                    <activity>
-                <EventTrigger invert=true>
-            <events>
-              <trigger>
-                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-              </trigger>
-            </events>
-          </EventTrigger>
-                    </activity>
-                </events>
-    
-            </EventDispatcher>
-            <EventDispatcher>
-                <targets>
-                    <EventTarget target=spawnpoint2/>
-                </targets>
-                <events>
-                    <activity>
-                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    <!--Change spawnoint end-->
-    
-    <!-- pirates -->
-        <?lua
-        for i = 1,1, 1
-        do
-        ?>
-            <SpaceShip position="<?lua print(math.random()*100)?>,<?lua print(math.random()*100)?>,<?lua print(math.random()*100-2000)?>">
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 active=true team=1>
-              <waypoints>
-                <StaticEntity position="0,<?lua print(math.random()*50)?> ,<?lua print(i*50 -2000) ?>" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-        <?lua
-        end
-        ?>
-    
-        <?lua
-        for i = 1,2, 1
-        do
-        ?>
-            <SpaceShip position="600,300,-6000">
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 active=true team=1>
-              <waypoints>
-                <StaticEntity position="600,300,-6000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-        <?lua
-        end
-        ?>
-    
-    <!-- Pirates at the end of wrong Navi line (get visible when you get near them)-->
-     <SpaceShip position="1600,2300,-10000" active=true visible=true name=navipirate1>
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 name=navipirate1 active=true team=1>
-              <waypoints>
-                <StaticEntity position="1600,2300,-10000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-            </SpaceShip>
-    
-    <SpaceShip position="7600,300,-8000" active=true visible=true name=navipirate2>
-              <templates>
-            <Template link=spaceshippirate />
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 name=navipirate2 active=true team=1>
-              <waypoints>
-                <StaticEntity position="7600,300,-8000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-        </SpaceShip>
-    
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=navipirate1 />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    
-    <EventDispatcher>
-                <targets>
-                    <EventTarget target=navipirate2 />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-    <!-- Pirates at the end of wrong Navi line **** end-->
-    
-    <!--Security man from mining corp.-->
-    <SpaceShip position="4000,4000,-20000">
-              <templates>
-            <Template link=spaceshipassff/>
-              </templates>
-              <controller>
-            <WaypointPatrolController alertnessradius=1000 team=0 active=false>
-              <waypoints>
-                <StaticEntity position="4000,4000,-20000" />
-              </waypoints>
-            </WaypointPatrolController>
-              </controller>
-    </SpaceShip>
-    
-    <!-- Asteroid field-->
-            <StaticEntity position="-400,2000,-7000">
-                <attached>
-                    <?lua
-                        for i = 1, 180
-                        do ?>
-                        <MovableEntity position="<?lua print(math.random() * 10000 -5000)?>, <?lua print(math.random() * 10000-5000) ?>, <?lua print(math.random() * 10000 -7000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-                            <attached>
-                                <Model scale="<?lua print(math.random() * 100) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-                            </attached>
-                        </MovableEntity>
-                    <?lua
-                        end
-                    ?>
-            </attached>
-        </StaticEntity>
-    <!--Planet with asteroid belt-->
-    <Planet mesh="iceplanet.mesh" position="2600,4300,-20000" scale=1000 atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f/>
-    <StaticEntity position="2600,4300,-20000" collisionType=static>
-          <collisionShapes>
-            <SphereCollisionShape radius="1000" />
-          </collisionShapes>
-                          <attached>
-                <?lua
-                for i = 1, 100
-                do
-                k=(math.random() * 2600 -1300)
-                if math.random()<0.5 then
-                l=(1300^2-k^2)^(0.5)
-                else
-                l=-(1300^2-k^2)^(0.5)
-                end
-                ?>
-    
-                <MovableEntity position="<?lua print(k) ?>,<?lua print(l) ?>, <?lua print(math.random() * 100) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-
-                    <attached>
-                    <Model scale="<?lua print(math.random() * 25) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-                    </attached>
-                </MovableEntity>
-                <?lua
-                end
-                ?>
-                            </attached>
-        </StaticEntity>
-    
-    </Scene>
-</Level>
Index: code/trunk/data/levels/The Time Machine.oxw
===================================================================
--- code/trunk/data/levels/The Time Machine.oxw	(revision 7677)
+++ 	(revision )
@@ -1,660 +1,0 @@
-<LevelInfo
- name = "The Time Machine"
- description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "singleplayer"
-/>
-
-<?lua 
-    include("stats.oxo")
-    include("hudtemplates3.oxo")
-    include("templates/lodinformation.oxt")
-    include("templates/spaceship_assff.oxt")
-    include("templates/spaceship_pirate.oxt")
-?>
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!--Including Template for triggering on player-->
-
-<Template name=spaceshipassffplayer>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   engine                 = spaceshipassffengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-      <DistanceTriggerBeacon name="PlayerDistanceTrigger" /> <!--added DistanceTriggerBeacon-->
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponsettings3.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<!--*****************************************************************************************************************************************************************************************-->
-
-<Level
-    name="The Time Machine"
-    description="A simple level. The only goal is to defeat as much enemies as you can."
-    gametype=TeamDeathmatch
->
-    <templates>
-        <Template link=lodtemplate_default />
-    </templates>
-    <Scene
-        ambientlight="0.8,0.8,0.8"
-        skybox="Orxonox/skypanoramagen2"
-    >
-
-        <Light type=directional position="0,0,0" direction="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
-
-<!--CREATING SPAWNPOINTS_____________________________________________________________________________________________________________________________________________________________________-->
-<?lua for i=0,4,1 do
-    x=500
-?>    
-
-        <TeamSpawnPoint team=0 position="-4000,0,<?lua print(i*x-1000) ?>" direction="5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshipassffplayer />
-<!--friendly spaceships spawnpoints-->
-        <!-- TeamSpawnPoint team=0 position="-4000,0,<?lua print(i*x-1000) ?>" lookat="5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-<!--enemy spaceship spawnpoint-->
-        <!--TeamSpawnPoint team=1 position="4000,0,<?lua print(i*x-1000) ?>" lookat="-5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshippirate /-->
-<?lua end ?>
-
-<!--CREATING SPAWNPOINTS END______________________________________________________________________________________________________________________________________________________________-->
-
-
-<!--Triggers (used for the Time Machine effect)___________________________________________________________________________________________________________________________________________-->
-    
-        <!--TRIGGERS IF THE PLAYERS REACHES THE "TIME MACHINE"-->
-        <DistanceTrigger name="EnterTimeMachine" position="0,0,0" distance="100" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" >
-            <attached>
-                <Billboard position="0,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="100,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="0,100,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="0,0,100" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="-100,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="0,-100,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-                <Billboard position="0,0,-100" material="Examples/Flare" colour="0, 0, 1" scale=1/>
-            </attached>
-        </DistanceTrigger>
-
-        <EventTrigger switch=true name=trigger4>
-            <events>
-                <trigger>
-                    <EventListener event=BotDied />
-                </trigger>
-            </events>
-        </EventTrigger>
-
-        <!-- This Trigger flips to true if the player is in the TimeMachine and shoots another player and flips right back after that. -->
-        <Trigger name=trigger1 mode=and >
-            <EventTrigger name=trigger6>
-                <events>
-                    <trigger>
-                        <EventListener event=EnterTimeMachine />
-                    </trigger>
-                </events>
-            </EventTrigger>
-            <EventTrigger switch=true name=trigger4>
-                <events>
-                    <trigger>
-                        <EventListener event=BotDied />
-                        <EventListener event=trigger2 />
-                    </trigger>
-                </events>
-            </EventTrigger>
-            <EventTrigger invert=true name=trigger5>
-                <events>
-                    <trigger>
-                        <EventListener event=trigger2 />
-                    </trigger>
-                </events>
-            </EventTrigger>
-        </Trigger>
-
-        <!-- This Trigger is true if the player is in the TimeMachine and has shot another player -->
-        <EventTrigger name=trigger2 switch=true >
-            <events>
-                <trigger>
-                    <EventListener event=trigger1 />
-                    <EventListener event=trigger3 />
-                </trigger>
-            </events>
-        </EventTrigger>
-
-        <!-- This Trigger flips trigger2 back to false after the player has left the TimeMachine. -->
-        <Trigger name=trigger3 mode=and >
-            <EventTrigger>
-                <events>
-                    <trigger>
-                        <EventListener event=trigger2 />
-                    </trigger>
-                </events>
-            </EventTrigger>
-            <EventTrigger invert=true>
-                <events>
-                    <trigger>
-                        <EventListener event=EnterTimeMachine />
-                    </trigger>
-                </events>
-            </EventTrigger>
-        </Trigger>
-
-    
-<!--Triggers (used for the Time Machine effect)_____________________________________________________________________________________________________________________________________________-->
-
-<!--Creating Spaceships_____________________________________________________________________________________________________________________________________________________________________-->
-    
-<?lua for i=0,5,1 do 
-    y=math.random(-500,500)
-    z=math.random(-1000,1000)
-    y2=math.random(-500,500)
-    z2=math.random(-1000,1000)
-    health=230
-    addh=100
-?>
-    
-        <EventTrigger name="BotDied" >
-            <events>
-                <trigger>
-                    <SpaceShip position="-4000,<?lua print(y) ?>,<?lua print(z) ?>" lookat="1000,<?lua print(y) ?>,<?lua print(z) ?>" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
-                        <templates>
-                            <Template link=spaceshipassff />
-                         </templates>
-                          <controller>
-                            <WaypointPatrolController alertnessradius=1000 team=0 active=1 >
-                                <waypoints>
-                                    <Model mesh="cube.mesh" scale=0 position="1000,<?lua print(math.random(-1000,1000)) ?>,<?lua print(math.random(-1000,1000)) ?>" />
-                                </waypoints>
-                                <events>
-                                    <activity>
-                                        <Trigger mode=or>
-                                            <EventTrigger invert=true>
-                                                <events>
-                                                    <trigger>
-                                                        <EventListener event=EnterTimeMachine />
-                                                    </trigger>
-                                                </events>
-                                            </EventTrigger>
-                                            <EventTrigger>
-                                                <events>
-                                                    <trigger>
-                                                        <EventListener event=trigger2 />
-                                                    </trigger>
-                                                </events>
-                                            </EventTrigger>
-                                        </Trigger>
-                                    </activity>
-                                </events>
-                            </WaypointPatrolController>
-                          </controller>
-                    </SpaceShip>
-                </trigger>
-            </events>
-        </EventTrigger>
-
-        <EventTrigger name="BotDied" >
-            <events>
-                <trigger>
-                    <SpaceShip position="4000,<?lua print(y2) ?>,<?lua print(z2) ?>" lookat="-1000,<?lua print(y2) ?>, <?lua print(z2) ?>" health=<?lua print(health+addh) ?> maxhealth=<?lua print(health+addh) ?> initialhealth=<?lua print(health+addh) ?> >
-                        <templates>
-                            <Template link=spaceshippirate />
-                         </templates>
-                          <controller>
-                            <WaypointPatrolController alertnessradius=1000 team=1 active=1 >
-                                <waypoints>
-                                    <Model mesh="cube.mesh" scale=0 position="-1000,<?lua print(math.random(-1000,1000)) ?>, <?lua print(math.random(-1000,1000)) ?>" />
-                                </waypoints>
-                                <events>
-                                    <activity>
-                                        <Trigger mode=or>
-                                            <EventTrigger invert=true>
-                                                <events>
-                                                    <trigger>
-                                                        <EventListener event=EnterTimeMachine />
-                                                    </trigger>
-                                                </events>
-                                            </EventTrigger>
-                                            <EventTrigger>
-                                                <events>
-                                                    <trigger>
-                                                        <EventListener event=trigger2 />
-                                                    </trigger>
-                                                </events>
-                                            </EventTrigger>
-                                        </Trigger>
-                                    </activity>
-                                </events>
-                            </WaypointPatrolController>
-                          </controller>
-                    </SpaceShip>
-                </trigger>
-            </events>
-        </EventTrigger>
-<?lua end ?>
-
-<!--Creating Spaceships_____END_____________________________________________________________________________________________________________________________________________________________-->
-
-<!--BILLBOARD IN THE MIDDLE OF THE BATTLEFIELD-->
-        <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Flares/backlightflare" scale=1 />
-    
-<!--TIME MACHINE____________________________________________________________________________________________________________________________________________________________________________-->
-<ForceField mode="invertedSphere" position="0,0,0" velocity=50000 diameter=6500 length=500 />
-        <StaticEntity>
-            <attached>
-                <MovableEntity position="0,0,0">
-                    <attached>
-<!--MIDDLE-->
-<?lua for i=0,2,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=<?lua print(-255-i*120) ?> >
-                            <attached>
-                                <Billboard position="<?lua print(10+i*10) ?>,<?lua print(-10-i*10) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                            </attached>
-                        </MovableEntity>
-    
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=<?lua print(-245-i*90) ?> >
-                            <attached>
-                                <Billboard position="<?lua print(10+i*20) ?>,<?lua print(-10-i*20) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                <Billboard position="<?lua print(-10-i*20) ?>,<?lua print(10+i*20) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                            </attached>
-                        </MovableEntity>
-    
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=<?lua print(265+i*110) ?> >
-                            <attached>
-                                <Billboard position="<?lua print(10+i*20) ?>,0,<?lua print(-10-i*20) ?>" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                <Billboard position="<?lua print(-10-i*20) ?>,0,<?lua print(10+i*20) ?>" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                            </attached>
-                        </MovableEntity>
-    
-                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=<?lua print(240+i*80) ?> >
-                            <attached>
-                                <Billboard position="<?lua print(15+i*30) ?>,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                <Billboard position="<?lua print(-15-i*30) ?>,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                            </attached>
-                        </MovableEntity>
-
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=<?lua print(232+i*70) ?> >
-                            <attached>
-                                <Billboard position="0,<?lua print(15+i*30) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                <Billboard position="0,<?lua print(-15-i*30) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-
-
-<!--FIRST DISTANT PAIR-->
-<?lua for i=0,1,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=10 >
-                            <attached>
-                                <MovableEntity position="<?lua print(1500-3000*i) ?>,0,0">
-                                    <attached>
-                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
-                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
-                                            <attached>
-                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
-                                            <attached>
-                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
-                                            <attached>
-                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                    </attached>
-                                </MovableEntity>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-<!--SECOND DISTANT PAIR-->
-<?lua for i=0,1,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=8 >
-                            <attached>
-                                <MovableEntity position="0,<?lua print(1500-3000*i) ?>,0">
-                                    <attached>
-                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
-                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
-                                            <attached>
-                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
-                                            <attached>
-                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
-                                            <attached>
-                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                    </attached>
-                                </MovableEntity>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-<!--THIRD DISTANT PAIR-->
-<?lua for i=0,1,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=9 >
-                            <attached>
-                                <MovableEntity position="<?lua print(1000-2000*i) ?>,<?lua print(-1000+2000*i) ?>,0">
-                                    <attached>
-                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
-                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
-                                            <attached>
-                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
-                                            <attached>
-                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
-                                            <attached>
-                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                    </attached>
-                                </MovableEntity>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-<!--FOURTH DISTANT PAIR-->
-<?lua for i=0,1,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=12 >
-                            <attached>
-                                <MovableEntity position="<?lua print(1000-2000*i) ?>,<?lua print(-1000+2000*i) ?>,0">
-                                    <attached>
-                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
-                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
-                                            <attached>
-                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
-                                            <attached>
-                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
-                                            <attached>
-                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                    </attached>
-                                </MovableEntity>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-<!--FIFTH DISTANT PAIR-->
-<?lua for i=0,1,1 do ?>
-                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=11 >
-                            <attached>
-                                <MovableEntity position="<?lua print(1000-2000*i) ?>,0,<?lua print(-1000+2000*i) ?>">
-                                    <attached>
-                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
-                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
-                                            <attached>
-                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
-                                            <attached>
-                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
-                                            <attached>
-                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
-                                            <attached>
-                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
-                                            </attached>
-                                        </MovableEntity>
-
-                                    </attached>
-                                </MovableEntity>
-                            </attached>
-                        </MovableEntity>
-<?lua end ?>
-                    </attached>
-                </MovableEntity>
-            </attached>
-        </StaticEntity>
-    
-
-<!--TIME MACHINE END____________________________________________________________________________________________________________________________________________________________________-->
-
-<!--Forcefields_________________________________________________________________________________________________________________________________________________________________________-->
-
-<!--NO 1-->
-        <ForceField position="-2500,0,800" direction="1,0,0" diameter=500 velocity=5000 length=1000 />
-        <MovableEntity position="-2500,0,800">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
-                <?lua for i=0,20,1 do ?>
-                    <Billboard position="<?lua print(i*200) ?>,0,-100" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                    <Billboard position="<?lua print(i*200) ?>,0,100" material="Examples/Flare" colour="0.5,0,0" scale=1/>
-                <?lua end ?>
-                </attached>
-        </MovableEntity>
-<!--NO 2-->
-        <ForceField position="2500,0,-800" direction="-1,0,0" diameter=500 velocity=5000 length=1000 />
-        <MovableEntity position="2500,0,-800">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0,0.5,0" scale=2/>
-                <?lua for i=0,20,1 do ?>
-                    <Billboard position="<?lua print(-i*200) ?>,0,-100" material="Examples/Flare" colour="0,0.5,0" scale=1/>
-                    <Billboard position="<?lua print(-i*200) ?>,0,100" material="Examples/Flare" colour="0,0.5,0" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-    
-<!--NO 3-->
-        <ForceField position="-2500,0,-600" direction="0.75,0.5,1" diameter=500 velocity=5000 length=1000 />
-        <MovableEntity position="-2500,0,-600">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0.5" scale=2/>
-                <?lua for i=0,20,1 do ?>
-                    <Billboard position="<?lua print(i*115-100) ?>,<?lua print(i*75) ?>,<?lua print(i*150) ?>" material="Examples/Flare" colour="0.5,0,0.5" scale=1/>
-                    <Billboard position="<?lua print(i*115+100) ?>,<?lua print(i*75) ?>,<?lua print(i*150) ?>" material="Examples/Flare" colour="0.5,0,0.5" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--NO 4-->
-        <ForceField position="2500,0,600" direction="-0.75,-0.5,-1" diameter=500 velocity=5000 length=1000 />
-        <MovableEntity position="2500,0,600">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0,0.5,0.5" scale=2/>
-                <?lua for i=0,20,1 do ?>
-                    <Billboard position="<?lua print(i*(-115)-100) ?>,<?lua print(i*(-75)) ?>,<?lua print(i*(-150)) ?>" material="Examples/Flare" colour="0,0.5,0.5" scale=1/>
-                    <Billboard position="<?lua print(i*(-115)+100) ?>,<?lua print(i*-(75)) ?>,<?lua print(i*(-150)) ?>" material="Examples/Flare" colour="0,0.5,0.5" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--NO 5 (samller)-->
-        <ForceField position="0,-500,500" direction="0,1,0" diameter=500 velocity=3000 length=1000 />
-        <MovableEntity position="0,-500,500">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.5,0" scale=2/>
-                <?lua for i=0,15,1 do ?>
-                    <Billboard position="0,<?lua print(i*100) ?>,0" material="Examples/Flare" colour="0.5,0.5,0" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--No 6 (smaller)-->
-        <ForceField position="0,500,-500" direction="0,-1,0" diameter=500 velocity=3000 length=1000 />
-        <MovableEntity position="0,500,-500">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.3,0.2" scale=2/>
-                <?lua for i=0,15,1 do ?>
-                    <Billboard position="0,<?lua print(i*(-100)) ?>,0" material="Examples/Flare" colour="0.5,0.3,0.2" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--No 7 (smaller)-->
-        <ForceField position="500,0,-500" direction="0,0,1" diameter=500 velocity=2500 length=750 />
-        <MovableEntity position="500,0,-500">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.4,0.6" scale=2/>
-                <?lua for i=0,8,1 do ?>
-                    <Billboard position="0,0,<?lua print(i*(100)) ?>" material="Examples/Flare" colour="0.5,0.4,0.6" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--No 8 (smaller)-->
-        <ForceField position="-500,0,500" direction="0,0,-1" diameter=500 velocity=2500 length=750 />
-        <MovableEntity position="-500,0,500">
-            <attached>
-                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.7,0.4,0.1" scale=2/>
-                <?lua for i=0,8,1 do ?>
-                    <Billboard position="0,0,<?lua print(i*(-100)) ?>" material="Examples/Flare" colour="0.7,0.4,0.1" scale=1/>
-                <?lua end ?>
-            </attached>
-        </MovableEntity>
-
-<!--Invisible Forcefield (immediatly sends the player to the time machine)-->
-        <ForceField position="-2500,2500,800" direction="1,-1,-0.32" diameter=200 velocity=10000 length=880 />
-        <Billboard position="-2500,2500,800" material="Examples/Flare" colour="1,1,1" /> <!--This Billboard looks like a star on the Skybox-->
-    
-    
-    </Scene>
-</Level>
Index: code/trunk/data/levels/asteroids.oxw
===================================================================
--- code/trunk/data/levels/asteroids.oxw	(revision 7679)
+++ code/trunk/data/levels/asteroids.oxw	(revision 7679)
@@ -0,0 +1,458 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Asteroids Race"
+ description  = "testmap for gametype asteroid race"
+ gametype     =  Asteroids
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.5, 0.5, 0.5"
+    skybox       = "Orxonox/Starbox"
+  >
+
+    <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" />
+
+    <SpawnPoint position="-300,300,0" name="playerstart" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <?lua
+      for i = 1, 250, 1
+      do
+      j = math.random()
+    ?>
+
+    <MovableEntity
+      position = "<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"
+      collisionType = dynamic
+      linearDamping = 0.8
+      angularDamping = 0
+      scale = <?lua print(j * 150)?>
+      collisiondamage = 1
+      enablecollisiondamage = true
+    >
+      <attached>
+        <Model mass=<?lua print(j * 1000) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="<?lua print(j * 350) ?>" />
+      </collisionShapes>
+    </MovableEntity>
+
+    <?lua
+      end
+    ?>
+
+<!--
+    <MovableEntity position="0,0,0" collisionType=dynamic scale=5 linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
+      <attached>
+        <Model mass=100 mesh="ast1.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius=11.75 />
+      </collisionShapes>
+    </MovableEntity>
+
+
+    <MovableEntity position="0,300,0" scale=10 collisionType=dynamic linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
+      <attached>
+        <Model mass=100 mesh="ast1.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius=22.5 />
+      </collisionShapes>
+    </MovableEntity>
+
+
+    <MovableEntity position="0,600,0"  scale=34  collisionType=dynamic linearDamping=0.8 angularDamping=0 collisiondamage=0.005 enablecollisiondamage=true>
+      <attached>
+        <Model mass=100 mesh="ast1.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius=76.5 />
+      </collisionShapes>
+    </MovableEntity>
+
+    <MovableEntity position="0,1200,0" scale=80 collisionType=dynamic linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
+      <attached>
+        <Model mass=100 mesh="ast1.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius=200 />
+      </collisionShapes>
+    </MovableEntity>
+-->
+
+    <SpaceShip position="2000,200,0" lookat="0,0,0" >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+        <AIController />
+      </controller>
+    </SpaceShip>
+
+    <SpaceShip position="8000,300,700" lookat="0,0,0" >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+        <AIController />
+      </controller>
+    </SpaceShip>
+
+    <SpaceShip position="10200,400,-600" lookat="0,0,0" >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+      <controller>
+        <AIController />
+      </controller>
+    </SpaceShip>
+
+    <ForceField position="200,300,-500" direction="0,0,1" diameter=500 velocity=120>
+      <attached>
+        <ParticleEmitter source="Orxonox/ForceFieldPurpleSmall" startdelay=0 />
+      </attached>
+    </ForceField>
+
+    <ForceField position="2200,-300,1200" direction="1,0.3,-0.7" diameter=800 velocity=200>
+      <attached>
+        <ParticleEmitter source="Orxonox/ForceFieldBlueBig" startdelay=0 />
+      </attached>
+    </ForceField>
+
+    <ForceField position="8600,1400,500" direction="-1,-1,-1" diameter=500 velocity=400>
+      <attached>
+        <ParticleEmitter source="Orxonox/ForceFieldGreenSmall" startdelay=0 />
+      </attached>
+    </ForceField>
+
+    <ForceField position="11800,500,-2600" direction="-1,0,1" diameter=900 velocity=300>
+      <attached>
+        <ParticleEmitter source="Orxonox/ForceFieldPurpleBig" startdelay=0 />
+      </attached>
+    </ForceField>
+
+
+    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=14 />
+
+
+    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=11>
+      <events>
+        <activity>
+          <EventListener event=trigger1 />
+        </activity>
+      </events>
+      <attached>
+        <Billboard material="Flares/lensflare" colour="1,0,0">
+          <events>
+            <visibility>
+              <EventTrigger invert=true>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger1 />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </Billboard>
+        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+          <events>
+            <visibility>
+              <EventTrigger>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger1 />
+                  </trigger>
+                </events>
+                <EventTrigger invert=true>
+                  <events>
+                    <trigger>
+                      <EventListener event=trigger2 />
+                    </trigger>
+                  </events>
+                </EventTrigger>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </BlinkingBillboard>
+        <Billboard material="Flares/lensflare" colour="0,1,0">
+          <events>
+            <visibility>
+              <EventListener event=trigger2 />
+            </visibility>
+          </events>
+        </Billboard>
+      </attached>
+    </CheckPoint>
+
+
+    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+      <events>
+        <activity>
+          <EventListener event=trigger2 />
+        </activity>
+      </events>
+      <attached>
+        <Billboard material="Flares/lensflare" colour="1,0,0">
+          <events>
+            <visibility>
+              <EventTrigger invert=true>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger2 />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </Billboard>
+        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+          <events>
+            <visibility>
+              <EventTrigger>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger2 />
+                  </trigger>
+                </events>
+                <EventTrigger invert=true>
+                  <events>
+                    <trigger>
+                      <EventListener event=trigger3 />
+                    </trigger>
+                  </events>
+                </EventTrigger>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </BlinkingBillboard>
+        <Billboard material="Flares/lensflare" colour="0,1,0">
+          <events>
+            <visibility>
+              <EventListener event=trigger3 />
+            </visibility>
+          </events>
+        </Billboard>
+      </attached>
+    </CheckPoint>
+
+
+    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
+      <events>
+        <activity>
+          <EventListener event=trigger3 />
+        </activity>
+      </events>
+      <attached>
+        <Billboard material="Flares/lensflare" colour="1,0,0">
+          <events>
+            <visibility>
+              <EventTrigger invert=true>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger3 />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </Billboard>
+        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+          <events>
+            <visibility>
+              <EventTrigger>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger3 />
+                  </trigger>
+                </events>
+                <EventTrigger invert=true>
+                  <events>
+                    <trigger>
+                      <EventListener event=trigger4 />
+                    </trigger>
+                  </events>
+                </EventTrigger>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </BlinkingBillboard>
+        <Billboard material="Flares/lensflare" colour="0,1,0">
+          <events>
+            <visibility>
+              <EventListener event=trigger4 />
+            </visibility>
+          </events>
+        </Billboard>
+      </attached>
+    </CheckPoint>
+
+
+    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
+      <events>
+        <activity>
+          <EventListener event=trigger4 />
+        </activity>
+      </events>
+      <attached>
+        <Billboard material="Flares/lensflare" colour="1,0,0">
+          <events>
+            <visibility>
+              <EventTrigger invert=true>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger4 />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </Billboard>
+        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+          <events>
+            <visibility>
+              <EventTrigger>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger4 />
+                  </trigger>
+                </events>
+                <EventTrigger invert=true>
+                  <events>
+                    <trigger>
+                      <EventListener event=trigger5 />
+                    </trigger>
+                  </events>
+                </EventTrigger>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </BlinkingBillboard>
+        <Billboard material="Flares/lensflare" colour="0,1,0">
+          <events>
+            <visibility>
+              <EventListener event=trigger5 />
+            </visibility>
+          </events>
+        </Billboard>
+      </attached>
+    </CheckPoint>
+
+
+    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
+      <events>
+        <activity>
+          <EventListener event=trigger5 />
+        </activity>
+      </events>
+      <attached>
+        <Billboard material="Flares/lensflare" colour="1,0,0">
+          <events>
+            <visibility>
+              <EventTrigger invert=true>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger5 />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </Billboard>
+        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+          <events>
+            <visibility>
+              <EventTrigger>
+                <events>
+                  <trigger>
+                    <EventListener event=trigger5 />
+                  </trigger>
+                </events>
+                <EventTrigger invert=true>
+                  <events>
+                    <trigger>
+                      <EventListener event=trigger6 />
+                    </trigger>
+                  </events>
+                </EventTrigger>
+              </EventTrigger>
+            </visibility>
+          </events>
+        </BlinkingBillboard>
+        <Billboard material="Flares/lensflare" colour="0,1,0">
+          <events>
+            <visibility>
+              <EventListener event=trigger6 />
+            </visibility>
+          </events>
+        </Billboard>
+      </attached>
+    </CheckPoint>
+
+
+    <Model position="11200,400,-1800" scale=10 pitch=-90  mesh="Carrier.mesh">
+      <attached>
+        <CheckPoint position="-10,0,0" name=trigger7 scale=0.6 isdestination=true stayactive=true distance=100>
+          <events>
+            <activity>
+              <EventListener event=trigger6 />
+            </activity>
+          </events>
+          <attached>
+            <Billboard material="Flares/lensflare" colour="1,0,0">
+              <events>
+                <visibility>
+                  <EventTrigger invert=true>
+                    <events>
+                      <trigger>
+                        <EventListener event=trigger6 />
+                      </trigger>
+                    </events>
+                  </EventTrigger>
+                </visibility>
+              </events>
+            </Billboard>
+            <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
+              <events>
+                <visibility>
+                  <EventTrigger>
+                    <events>
+                      <trigger>
+                        <EventListener event=trigger6 />
+                      </trigger>
+                    </events>
+                    <EventTrigger invert=true>
+                      <events>
+                        <trigger>
+                          <EventListener event=trigger7 />
+                        </trigger>
+                      </events>
+                    </EventTrigger>
+                  </EventTrigger>
+                </visibility>
+              </events>
+            </BlinkingBillboard>
+            <Billboard material="Flares/lensflare" colour="0,1,0">
+              <events>
+                <visibility>
+                  <EventListener event=trigger7 />
+                </visibility>
+              </events>
+            </Billboard>
+          </attached>
+        </CheckPoint>
+      </attached>
+    </Model>
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/dynamicMatch.oxw
===================================================================
--- code/trunk/data/levels/dynamicMatch.oxw	(revision 7679)
+++ code/trunk/data/levels/dynamicMatch.oxw	(revision 7679)
@@ -0,0 +1,124 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("dynamicMatchHUD.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Dynamic Match"
+ description  = "In progress -level for dynamicmatch"
+ gametype     = "Dynamicmatch"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+  >
+    <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" />
+
+<!-- ------------------Planet needs gravity----------------- -->
+<Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+<StaticEntity position="0,0,0" collisionType=static>
+      <collisionShapes>
+        <SphereCollisionShape radius="499" />
+      </collisionShapes>
+    </StaticEntity>
+
+<!-- -----------12-Spawnpoints around the planet------------- -->
+<TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,-1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,0,1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,0,-1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<!--outer Spawnpoints -->
+<TeamSpawnPoint team=0 position="2000,0,0" lookat="0,0,1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="-2000,0,0" lookat="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,2000,0" lookat="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,-2000,0" lookat="0,-1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,0,2000" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+<TeamSpawnPoint team=0 position="0,0,-2000" lookat="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+
+<?lua
+    dofile("includes/CuboidSpaceStation.lua")
+  ?>
+<!-- ----------------Rotating satellite--------------- -->
+<MovableEntity position="1,1,1" rotationrate="-4.5" rotationaxis="0,0,1">
+        <attached>
+          <StaticEntity position="-2500,0,0" yaw=90 pitch=90>
+            <attached>
+              <?lua
+                createSpaceStationPar(0,2,1,2,1,4,1,50)
+              ?>
+                <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+                <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+                <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
+            </attached>
+          </StaticEntity>
+        </attached>
+</MovableEntity>
+
+<!-- ---------------asteroid ellypse----------------- -->
+<?lua
+max = 20
+for i = 0, max, 1
+do
+    y = math.sin(i/max*6)*4000
+    z = math.cos(i/max*6)*5000
+    x = 0
+    ?>
+<?lua
+for k = 1, 25, 1
+do
+j = math.random()
+?>
+
+    <StaticEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" scale=<?lua print(j * 5) ?> >
+      <attached>
+        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
+	  <attached><!-- ---------asteroid fog----- -->
+            <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
+          </attached>
+	</Model>
+      </attached>
+      <?lua if i == 5 then ?><collisionShapes>
+        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+      </collisionShapes> <?lua end ?>
+    </StaticEntity>
+<?lua
+end
+?>
+<?lua end ?>
+
+    <GlobalShader compositor="Bloom" visible=false>
+      <events>
+        <visibility>
+          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
+        </visibility>
+      </events>
+    </GlobalShader>
+<!-- ----------------random fog --- not in use
+<?lua
+for i = 1, 100, 1
+do
+j = math.random()
+?>
+
+    <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
+      <attached>
+        <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
+      </attached>
+    </StaticEntity>
+
+<?lua
+end
+?>
+-->
+  </Scene>
+</Level>
Index: code/trunk/data/levels/emptyLevel.oxw
===================================================================
--- code/trunk/data/levels/emptyLevel.oxw	(revision 7679)
+++ code/trunk/data/levels/emptyLevel.oxw	(revision 7679)
@@ -0,0 +1,36 @@
+<LevelInfo
+ name = "Empty level"
+ description = "A level with absolutely nothing in it."
+ tags = "test"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/Starbox"
+  >
+
+    <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"/>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    
+  </Scene>
+</Level>
+
Index: code/trunk/data/levels/empty_level.oxw
===================================================================
--- code/trunk/data/levels/empty_level.oxw	(revision 7677)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<LevelInfo
- name = "Empty level"
- description = "A level with absolutely nothing in it."
- tags = "test"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    
-  </Scene>
-</Level>
-
Index: code/trunk/data/levels/events.oxw
===================================================================
--- code/trunk/data/levels/events.oxw	(revision 7677)
+++ code/trunk/data/levels/events.oxw	(revision 7679)
@@ -6,9 +6,9 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/fightInOurBack.oxw
===================================================================
--- code/trunk/data/levels/fightInOurBack.oxw	(revision 7679)
+++ code/trunk/data/levels/fightInOurBack.oxw	(revision 7679)
@@ -0,0 +1,482 @@
+<LevelInfo
+  name = "Fight in our Back"
+  description = "Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
+  tags = "" 
+/>
+
+<?lua
+    include("stats.oxo")
+    include("HUDTemplates3.oxo")
+    include("templates/lodInformation.oxt")
+    include("templates/spaceshipAssff.oxt")
+    include("templates/spaceshipPirate.oxt")
+    include("templates/spaceshipTransporter.oxt")
+?>
+
+<!--*****************************************************************************************************************************************************************************************-->
+<!--Including Template for triggering on player-->
+
+<Template name=spaceshipassffplayer>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipassffcameras
+   engine                 = spaceshipassffengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+      <DistanceTriggerBeacon name="PlayerDistanceTrigger" /> <!--added DistanceTrigger-->
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+<?lua
+  include("includes/weaponSettings3.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<!--*****************************************************************************************************************************************************************************************-->
+<Level
+  name="Fight in our back"
+  description="Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
+  gametype=TeamDeathmatch
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+    <!-- Ausgang: Szene ===> ambientlight/skybox -->
+    <Scene
+     ambientlight="0.8,0.8,0.8"
+     skybox="Orxonox/skypanoramagen1"
+    >
+
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
+
+        <!--Light: noch zu aendern -->
+        <Light type=directional position="0,0,0" direction="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
+
+
+<!--*****************************************************************************************************************************************************************************************-->
+<!--Quests-->
+    <GlobalQuest id="FightInOurBack.DiscoveryMission_">
+        <QuestDescription title="Discovery mission" description="Your team has to scout out this sector." failMessage="You failed!" completeMessage="You won. You have reached the end of this level." />
+        <subquests>
+            <GlobalQuest id="FightInOurBack.FollowYourGroupLeader">
+                <QuestDescription title="Follow your group leader" description="Your task is to follow the team leader and to destroy all the enemy spaceships on your way!" failMessage="You failed!" completeMessage="Good job!" />
+            </GlobalQuest>
+            <GlobalQuest id="FightInOurBack.TransportersAhead">
+                <QuestDescription title="Transporters ahead" description="This is a lucky day for us. We have found supplies that the enemy is transporting in these Transporters. We have to destroy them." failMessage="You failed!" completeMessage="Good job!" />
+            </GlobalQuest>
+            <GlobalQuest id="FightInOurBack.TheySentUsAssistance">
+                <QuestDescription title="They sent us assistance" description="The transporters will surely be heavily protected but our base sent us assistance. It should now be easier to destroy them." failMessage="You failed" completeMessage="Good job!" />
+            </GlobalQuest>
+        </subquests>
+    </GlobalQuest>
+
+
+<!--Quests____END-->
+<!--*****************************************************************************************************************************************************************************************-->
+
+
+<!--Player's Spawnpoints -->
+        <!--Spieler Spawnpoint ===> position/direction--> <!-- funktioniert noch nicht ab naechtem Mal wahrscheinlich-->
+        <SpawnPoint position="0,50,25" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="true" >
+            <events>
+                <activity>
+                    <EventListener event="activateFirstSpawnpoint" />
+                </activity>
+            </events>
+        </SpawnPoint>
+
+        <SpawnPoint position="10000,0,3000" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="false" >
+            <events>
+                <activity>
+                    <EventListener event="activateSecondSpawnpoint" />
+                </activity>
+            </events>
+        </SpawnPoint>
+    
+<!--Player's Spawnpoint END-->
+
+<!--Launching Quests -->
+        <QuestEffectBeacon position="0,50,25" times="1">
+            <effects>
+                <AddQuest questId="FightInOurBack.DiscoveryMission_" />
+                <AddQuest questId="FightInOurBack.FollowYourGroupLeader" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event="FightInOurBack_MainStart_FollowStart"/>
+                </execute>
+            </events>
+            <attached>
+                <DistanceTrigger name="FightInOurBack_MainStart_FollowStart" position="0,0,0" distance="50" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" />
+                <!--<Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />-->
+            </attached>
+        </QuestEffectBeacon>
+
+        <QuestEffectBeacon position="8000,0,3100" times=1 >
+            <effects>
+                <AddQuest questID="FightInOurBack.TransportersAhead" />
+                <AddQuest questID="FightInOurBack.TheySentUsAssistance" />
+                <CompleteQuest questID="FightInOurBack.FollowYourGroupLeader" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event="FightInOurBack_FollowEnd_DTranspStart_AssisStart" />
+                </execute>
+            </events>
+            <attached>
+                <!--<Billboard position="0,0,0" colour="1,1,1" material="Examples/Flare" />-->
+                <DistanceTrigger name="FightInOurBack_FollowEnd_DTranspStart_AssisStart" position="0,0,0" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" stayactive=1 activations=1 />
+            </attached>
+        </QuestEffectBeacon>
+    
+<!---->
+    
+<!--Launching Quests END -->
+
+<!--Creating Transporters OK-->
+
+
+<?lua for i=0,0,1 do
+x=800
+health=2750
+?>
+    <!--Transporter 1-->
+    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
+    <events>
+    <trigger>
+        <SpaceShip position="<?lua print(3800-i*x) ?>,0,3000" lookat="<?lua print(4800-i*x) ?>,0,4000" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
+            <templates>
+                   <Template link=spaceshipTransporter />
+             </templates>
+             <controller>
+                <WaypointPatrolController alertnessradius=1000 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(14800-i*x) ?>,0,3000"/>
+                    </waypoints>
+                </WaypointPatrolController>
+             </controller>
+        </SpaceShip><!---->
+    </trigger>
+    </events>
+    </EventTrigger>
+<?lua end ?>
+
+
+<?lua for j=0,1,1 do 
+health=1600
+x=800
+z=j*300
+?>
+    <!--Transporter 2,3-->
+    <EventTrigger name="activateTeam1No1" acitvations=1 stayactive="true">
+    <events>
+    <trigger>
+        <SpaceShip position="<?lua print(2600+x) ?>,0,<?lua print(3150-z) ?>" lookat="<?lua print(3500+x) ?>,0,<?lua print(4150-z) ?>" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
+            <templates>
+                   <Template link=spaceshipTransporter />
+             </templates>
+             <controller>
+                <WaypointPatrolController alertnessradius=1000 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(13500+x) ?>,0,<?lua print(3150-z) ?>"/>
+                    </waypoints>
+                </WaypointPatrolController>
+             </controller>
+        </SpaceShip><!---->
+    </trigger>
+    </events>
+    </EventTrigger>
+<?lua end ?>
+
+
+<!--Creating Transporters END _-->
+
+<!--Creating player's team OK-->
+        <!--Spaceships team 0 (player:team=0)-->
+        <SpaceShip position="50,0,0" lookat="2050,0,-1000" health="500" maxhealth="500" initialhealth="500" >
+             <templates>
+                  <Template link=spaceshipassff />
+            </templates>
+             <controller>
+                <WaypointPatrolController alertnessradius=2000 team=0 >
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="2050,0,-1000" />
+                        <Model mesh="cube.mesh" scale=0 position="6050,0,0" />
+                        <Model mesh="cube.mesh" scale=0 position="10050,0,3000" />
+                        <Model mesh="cube.mesh" scale=0 position="3050,0,3000" />
+                        <Model mesh="cube.mesh" scale=0 position="-4050,0,3000" />
+                    </waypoints>
+                </WaypointPatrolController>
+             </controller>
+        </SpaceShip>
+        <!--Second Spaceship team 0 (player: team 0)-->
+        <SpaceShip position="0,0,100" lookat="2000,0,-950" health="400" maxhealth="400" initialhealth="400" >
+             <templates>
+                  <Template link=spaceshipassff />
+            </templates>
+             <controller>
+                <WaypointPatrolController alertnessradius=2000 team=0 >
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="2000,0,-900" />
+                        <Model mesh="cube.mesh" scale=0 position="6000,0,0" />
+                        <Model mesh="cube.mesh" scale=0 position="10000,0,3100" />
+                        <Model mesh="cube.mesh" scale=0 position="3000,0,3100" />
+                        <Model mesh="cube.mesh" scale=0 position="-4000,0,3100"/>
+                    </waypoints>
+                </WaypointPatrolController>
+             </controller>
+        </SpaceShip>
+        <!--third Spaceship team 0 (player: team 0)-->
+        <SpaceShip position="0,0,-100" lookat="2000,0,-1050" health="400" maxhealth="400" initialhealth="400" >
+             <templates>
+                  <Template link=spaceshipassff />
+            </templates>
+             <controller>
+                <WaypointPatrolController alertnessradius=2000 team=0 >
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="2000,0,-1100" />
+                        <Model mesh="cube.mesh" scale=0 position="6000,0,-100" />
+                        <Model mesh="cube.mesh" scale=0 position="10000,0,2900" />
+                        <Model mesh="cube.mesh" scale=0 position="3000,0,2900" />
+                        <Model mesh="cube.mesh" scale=0 position="-4000,0,2900" />
+                    </waypoints>
+                </WaypointPatrolController>
+             </controller>
+        </SpaceShip>
+<!--Creating player's team END  -->
+
+
+<!--Asteroids (field OK --> 
+
+<?lua for i=0,100,1 do
+x=math.random(250,4000)
+y=math.random(-500,500)
+z=math.random(1000,2000)
+scale=math.random(20,70)
+?>
+<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>">
+    <attached>
+        <Model scale=<?lua print(scale) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
+    </attached>
+    <collisionShapes>
+        <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
+    </collisionShapes>
+</MovableEntity>
+<?lua end ?>
+
+<!--Asteroids (field) END -->
+
+<!--Asteroids (random) END OK-->
+
+<?lua for i=0,150,1 do
+x=math.random(-8000,8000)
+y=math.random(-8000,8000)
+z=math.random(-8000,8000)
+?>
+<MovableEntity collisionType=kinematic linearDamping=0.8 angularDamping=0 mass="<?lua print(scale * 5) ?>" position="<?lua print(x) ?>,<?lua print(y) ?>,<?lua print(z) ?>" rotationaxis="<?lua print(math.random()) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" rotationrate="<?lua print(math.random()*15) ?>" >
+    <attached>
+        <Model scale=<?lua print(math.random(20,70)) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false/>
+    </attached>
+    <collisionShapes>
+            <SphereCollisionShape radius="<?lua print(scale * 3) ?>" />
+        </collisionShapes>
+</MovableEntity>
+<?lua end ?>
+
+<!--Asteroids (random) END -->
+
+<!--Creating spaceships (player's team) OK-->
+<!---->
+<!--Trigger to activate this Team (TEAM NO 1)-->
+    <DistanceTrigger name="activateTeam0No1" position="8000,0,3100" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
+
+<!--TEAM NO 1 (activationType : distance || killing a spaceship what belongs to TEAM 0 NO 0)-->
+<?lua for i=0,9,1 do
+x=math.random(-500,500)
+y=math.random(-300,300)
+z=math.random(-300,300)
+?>
+    <EventTrigger name="activateTeam0No1" activations=1 stayactive="true">
+        <events>
+            <trigger>
+                <SpaceShip position="<?lua print(x+4500) ?>,<?lua print(y) ?>,<?lua print(z+6000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
+                    <templates>
+                        <Template link=spaceshipassff />
+                    </templates>
+                    <controller>
+                        <WaypointPatrolController alertnessradius=2000 team=0 active=false>
+                            <waypoints>
+                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4500+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
+                                <Model mesh="cube.mesh" scale=0 position="<?lua print(x-4000) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
+                            </waypoints>
+                            <events>
+                                <activity>
+                                    <EventListener event="activateTeam0No1" />
+                                </activity>
+                            </events>
+                        </WaypointPatrolController>
+                    </controller>
+                </SpaceShip>
+            </trigger>
+        </events>
+    </EventTrigger>
+
+
+<?lua end ?>
+
+<!---->
+<!--Creating spaceships (player's team) END -->
+
+<!--Creating spaceships (enemy) OK-->
+<!---->
+<!--TEAM 1 NO 1 (activationType : killing a Transporter || killing a spaceship what belongs to TEAM 1 NO 1)-->
+<?lua for i=0,11,1 do
+x=math.random(-500,500)
+y=math.random(-300,300)
+z=math.random(-300,300)
+?>
+    <EventTrigger name="activateTeam1No1" activations=1 stayactive="true" >
+        <events>
+            <trigger>
+                <SpaceShip position="<?lua print(x+3800) ?>,<?lua print(y+3000) ?>,<?lua print(z+3000) ?>" lookat="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>">
+                    <templates>
+                        <Template link=spaceshippirate />
+                    </templates>
+                    <controller>
+                        <WaypointPatrolController alertnessradius=5000 team=1 active=false>
+                            <waypoints>
+                                <Model mesh="cube.mesh" scale=0 position="<?lua print(4000+x) ?>,<?lua print(y) ?>,<?lua print(z+3000) ?>" />
+                            </waypoints>
+                            <events>
+                                <activity>
+                                    <EventListener event="activateTeam1No1" />
+                                </activity>
+                            </events>
+                        </WaypointPatrolController>
+                    </controller>
+                </SpaceShip>
+            </trigger>
+        </events>
+    </EventTrigger>
+
+<?lua end ?>
+<!---->
+<!--Creating spaceships (enemy) END -->
+
+<!--Enemies on the way to the transporters -->
+
+<?lua for i=0,1,1 do 
+z=math.random(-300,300)
+?>
+<!--NO 1-->
+        <SpaceShip position="<?lua print(5900+i*100) ?>,0,-3000" lookat="2500,0,-1000">
+            <templates>
+                <Template link=spaceshippirate/>
+            </templates>
+            <controller>
+                <WaypointPatrolController alertnessRadius=1500 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(2500+100*i) ?>,0,-1000" />
+                    </waypoints>
+                </WaypointPatrolController>
+            </controller>
+        </SpaceShip>
+
+<!--NO 4-->
+        <SpaceShip position="<?lua print(9000) ?>,13000,<?lua print(z*i+3000) ?>" lookat="1000,0,3000">
+            <templates>
+                <Template link=spaceshippirate/>
+            </templates>
+            <controller>
+                <WaypointPatrolController alertnessRadius=1500 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(10000) ?>,0,<?lua print(3000+z*i) ?>" />
+                    </waypoints>
+                </WaypointPatrolController>
+            </controller>
+        </SpaceShip>
+<?lua end ?>
+
+
+<!--NO 3-->
+        <SpaceShip position="<?lua print(200+13000) ?>,0,10000" lookat="8000,0,1000">
+            <templates>
+                <Template link=spaceshippirate/>
+            </templates>
+            <controller>
+                <WaypointPatrolController alertnessRadius=1500 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(200+8000) ?>,0,1000" />
+                    </waypoints>
+                </WaypointPatrolController>
+            </controller>
+        </SpaceShip>
+<?lua for i=0,1,1 do ?>    
+        <SpaceShip position="<?lua print(i*400+13000) ?>,100,10000" lookat="8000,0,1000">
+            <templates>
+                <Template link=spaceshippirate/>
+            </templates>
+            <controller>
+                <WaypointPatrolController alertnessRadius=1500 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(i*400+8000) ?>,0,1000" />
+                    </waypoints>
+                </WaypointPatrolController>
+            </controller>
+        </SpaceShip>
+<?lua end ?>
+
+
+<!--NO 2-->
+<?lua for i=0,3,1 do ?>
+        <SpaceShip position="<?lua print(math.random(5500,6500)+2000) ?>,0,1000" lookat="2500,0,-1000">
+            <templates>
+                <Template link=spaceshippirate/>
+            </templates>
+            <controller>
+                <WaypointPatrolController alertnessRadius=1500 team=1>
+                    <waypoints>
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1250" />
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,250,1000" />
+                        <Model mesh="cube.mesh" scale=0 position="<?lua print(math.random(5750,6250)+2000) ?>,0,1000" />
+                    </waypoints>
+                </WaypointPatrolController>
+            </controller>
+        </SpaceShip>
+<?lua end ?>
+
+<!--Creating spaceships (enemy) END -->
+
+<Trigger invert=true name="activateFirstSpawnpoint">
+    <DistanceTrigger name="activateSecondSpawnpoint" position="10000,0,3000" distance="1000" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" activations="1" stayactive="true" />
+</Trigger>
+
+    </Scene>
+</Level>
Index: code/trunk/data/levels/fps_test.oxw
===================================================================
--- code/trunk/data/levels/fps_test.oxw	(revision 7677)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<LevelInfo
- name = "FPS testlevel"
- description = "Level to test First Person Shooter"
- tags = "test"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "fps"
- description  = "tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <StaticEntity position="0,-10000,0" direction="0,-1,0" collisionType=static mass=100000 friction=0.01 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="10000,10000,1000" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="10000,10000,1000" />
-      </collisionShapes>
-  </StaticEntity>
-
-<?lua
-for i = 1, 10, 1
-do ?>
-    <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,100,<?lua print(math.random() * 1000 - 500) ?>" direction="-1, 0, 0" lookat="0,0,0" spawnclass=FpsPlayer pawndesign=fps />
-<?lua
-end
-?>
-
-
-<?lua
-for i = 1, 200, 1
-do
-j = math.random()
-?>
-  <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
-      <attached>
-        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 100) ?>" />
-      </collisionShapes>
-  </MovableEntity>
-<?lua
-end
-?>
-
-  </Scene>
-</Level>
-
Index: code/trunk/data/levels/gametype_asteroids.oxw
===================================================================
--- code/trunk/data/levels/gametype_asteroids.oxw	(revision 7677)
+++ 	(revision )
@@ -1,458 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Asteroids Race"
- description  = "testmap for gametype asteroid race"
- gametype     =  Asteroids
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-    ambientlight = "0.5, 0.5, 0.5"
-    skybox       = "Orxonox/Starbox"
-  >
-
-    <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" />
-
-    <SpawnPoint position="-300,300,0" name="playerstart" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <?lua
-      for i = 1, 250, 1
-      do
-      j = math.random()
-    ?>
-
-    <MovableEntity
-      position = "<?lua print(math.random()* 15000 - 1000) ?>,<?lua print(math.random() * 12000 - 4000) ?>,<?lua print(math.random() * 12000 - 4000) ?>"
-      collisionType = dynamic
-      linearDamping = 0.8
-      angularDamping = 0
-      scale = <?lua print(j * 150)?>
-      collisiondamage = 1
-      enablecollisiondamage = true
-    >
-      <attached>
-        <Model mass=<?lua print(j * 1000) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 350) ?>" />
-      </collisionShapes>
-    </MovableEntity>
-
-    <?lua
-      end
-    ?>
-
-<!--
-    <MovableEntity position="0,0,0" collisionType=dynamic scale=5 linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
-      <attached>
-        <Model mass=100 mesh="ast1.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius=11.75 />
-      </collisionShapes>
-    </MovableEntity>
-
-
-    <MovableEntity position="0,300,0" scale=10 collisionType=dynamic linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
-      <attached>
-        <Model mass=100 mesh="ast1.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius=22.5 />
-      </collisionShapes>
-    </MovableEntity>
-
-
-    <MovableEntity position="0,600,0"  scale=34  collisionType=dynamic linearDamping=0.8 angularDamping=0 collisiondamage=0.005 enablecollisiondamage=true>
-      <attached>
-        <Model mass=100 mesh="ast1.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius=76.5 />
-      </collisionShapes>
-    </MovableEntity>
-
-    <MovableEntity position="0,1200,0" scale=80 collisionType=dynamic linearDamping=0.8 angularDamping=0  collisiondamage=0.005 enablecollisiondamage=true>
-      <attached>
-        <Model mass=100 mesh="ast1.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius=200 />
-      </collisionShapes>
-    </MovableEntity>
--->
-
-    <SpaceShip position="2000,200,0" lookat="0,0,0" >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <AIController />
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="8000,300,700" lookat="0,0,0" >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <AIController />
-      </controller>
-    </SpaceShip>
-
-    <SpaceShip position="10200,400,-600" lookat="0,0,0" >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <AIController />
-      </controller>
-    </SpaceShip>
-
-    <ForceField position="200,300,-500" direction="0,0,1" diameter=500 velocity=120>
-      <attached>
-        <ParticleEmitter source="Orxonox/ForceFieldPurpleSmall" startdelay=0 />
-      </attached>
-    </ForceField>
-
-    <ForceField position="2200,-300,1200" direction="1,0.3,-0.7" diameter=800 velocity=200>
-      <attached>
-        <ParticleEmitter source="Orxonox/ForceFieldBlueBig" startdelay=0 />
-      </attached>
-    </ForceField>
-
-    <ForceField position="8600,1400,500" direction="-1,-1,-1" diameter=500 velocity=400>
-      <attached>
-        <ParticleEmitter source="Orxonox/ForceFieldGreenSmall" startdelay=0 />
-      </attached>
-    </ForceField>
-
-    <ForceField position="11800,500,-2600" direction="-1,0,1" diameter=900 velocity=300>
-      <attached>
-        <ParticleEmitter source="Orxonox/ForceFieldPurpleBig" startdelay=0 />
-      </attached>
-    </ForceField>
-
-
-    <CheckPoint name=trigger1 position="-300,300,0" scale=1 isdestination=false isfirst=true stayactive=true distance=10 addtime=14 />
-
-
-    <CheckPoint name=trigger2 position="2200,600,0" scale=3 isdestination=false stayactive=true distance=100 addtime=11>
-      <events>
-        <activity>
-          <EventListener event=trigger1 />
-        </activity>
-      </events>
-      <attached>
-        <Billboard material="Flares/lensflare" colour="1,0,0">
-          <events>
-            <visibility>
-              <EventTrigger invert=true>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger1 />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </Billboard>
-        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-          <events>
-            <visibility>
-              <EventTrigger>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger1 />
-                  </trigger>
-                </events>
-                <EventTrigger invert=true>
-                  <events>
-                    <trigger>
-                      <EventListener event=trigger2 />
-                    </trigger>
-                  </events>
-                </EventTrigger>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </BlinkingBillboard>
-        <Billboard material="Flares/lensflare" colour="0,1,0">
-          <events>
-            <visibility>
-              <EventListener event=trigger2 />
-            </visibility>
-          </events>
-        </Billboard>
-      </attached>
-    </CheckPoint>
-
-
-    <CheckPoint name=trigger3 position="4100,0,400" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
-      <events>
-        <activity>
-          <EventListener event=trigger2 />
-        </activity>
-      </events>
-      <attached>
-        <Billboard material="Flares/lensflare" colour="1,0,0">
-          <events>
-            <visibility>
-              <EventTrigger invert=true>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger2 />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </Billboard>
-        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-          <events>
-            <visibility>
-              <EventTrigger>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger2 />
-                  </trigger>
-                </events>
-                <EventTrigger invert=true>
-                  <events>
-                    <trigger>
-                      <EventListener event=trigger3 />
-                    </trigger>
-                  </events>
-                </EventTrigger>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </BlinkingBillboard>
-        <Billboard material="Flares/lensflare" colour="0,1,0">
-          <events>
-            <visibility>
-              <EventListener event=trigger3 />
-            </visibility>
-          </events>
-        </Billboard>
-      </attached>
-    </CheckPoint>
-
-
-    <CheckPoint name=trigger4 position="5600,400,0" scale=3 isdestination=false stayactive=true distance=100 addtime=9>
-      <events>
-        <activity>
-          <EventListener event=trigger3 />
-        </activity>
-      </events>
-      <attached>
-        <Billboard material="Flares/lensflare" colour="1,0,0">
-          <events>
-            <visibility>
-              <EventTrigger invert=true>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger3 />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </Billboard>
-        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-          <events>
-            <visibility>
-              <EventTrigger>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger3 />
-                  </trigger>
-                </events>
-                <EventTrigger invert=true>
-                  <events>
-                    <trigger>
-                      <EventListener event=trigger4 />
-                    </trigger>
-                  </events>
-                </EventTrigger>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </BlinkingBillboard>
-        <Billboard material="Flares/lensflare" colour="0,1,0">
-          <events>
-            <visibility>
-              <EventListener event=trigger4 />
-            </visibility>
-          </events>
-        </Billboard>
-      </attached>
-    </CheckPoint>
-
-
-    <CheckPoint name=trigger5 position="7200,600,-200" scale=3 isdestination=false stayactive=true distance=100 addtime=8>
-      <events>
-        <activity>
-          <EventListener event=trigger4 />
-        </activity>
-      </events>
-      <attached>
-        <Billboard material="Flares/lensflare" colour="1,0,0">
-          <events>
-            <visibility>
-              <EventTrigger invert=true>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger4 />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </Billboard>
-        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-          <events>
-            <visibility>
-              <EventTrigger>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger4 />
-                  </trigger>
-                </events>
-                <EventTrigger invert=true>
-                  <events>
-                    <trigger>
-                      <EventListener event=trigger5 />
-                    </trigger>
-                  </events>
-                </EventTrigger>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </BlinkingBillboard>
-        <Billboard material="Flares/lensflare" colour="0,1,0">
-          <events>
-            <visibility>
-              <EventListener event=trigger5 />
-            </visibility>
-          </events>
-        </Billboard>
-      </attached>
-    </CheckPoint>
-
-
-    <CheckPoint name=trigger6 position="9200, 800,-800" scale=3 isdestination=false stayactive=true distance=100 addtime=10>
-      <events>
-        <activity>
-          <EventListener event=trigger5 />
-        </activity>
-      </events>
-      <attached>
-        <Billboard material="Flares/lensflare" colour="1,0,0">
-          <events>
-            <visibility>
-              <EventTrigger invert=true>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger5 />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </Billboard>
-        <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-          <events>
-            <visibility>
-              <EventTrigger>
-                <events>
-                  <trigger>
-                    <EventListener event=trigger5 />
-                  </trigger>
-                </events>
-                <EventTrigger invert=true>
-                  <events>
-                    <trigger>
-                      <EventListener event=trigger6 />
-                    </trigger>
-                  </events>
-                </EventTrigger>
-              </EventTrigger>
-            </visibility>
-          </events>
-        </BlinkingBillboard>
-        <Billboard material="Flares/lensflare" colour="0,1,0">
-          <events>
-            <visibility>
-              <EventListener event=trigger6 />
-            </visibility>
-          </events>
-        </Billboard>
-      </attached>
-    </CheckPoint>
-
-
-    <Model position="11200,400,-1800" scale=10 pitch=-90  mesh="Carrier.mesh">
-      <attached>
-        <CheckPoint position="-10,0,0" name=trigger7 scale=0.6 isdestination=true stayactive=true distance=100>
-          <events>
-            <activity>
-              <EventListener event=trigger6 />
-            </activity>
-          </events>
-          <attached>
-            <Billboard material="Flares/lensflare" colour="1,0,0">
-              <events>
-                <visibility>
-                  <EventTrigger invert=true>
-                    <events>
-                      <trigger>
-                        <EventListener event=trigger6 />
-                      </trigger>
-                    </events>
-                  </EventTrigger>
-                </visibility>
-              </events>
-            </Billboard>
-            <BlinkingBillboard frequency=0.2 amplitude=1 material="Flares/lensflare" colour="1,1,0">
-              <events>
-                <visibility>
-                  <EventTrigger>
-                    <events>
-                      <trigger>
-                        <EventListener event=trigger6 />
-                      </trigger>
-                    </events>
-                    <EventTrigger invert=true>
-                      <events>
-                        <trigger>
-                          <EventListener event=trigger7 />
-                        </trigger>
-                      </events>
-                    </EventTrigger>
-                  </EventTrigger>
-                </visibility>
-              </events>
-            </BlinkingBillboard>
-            <Billboard material="Flares/lensflare" colour="0,1,0">
-              <events>
-                <visibility>
-                  <EventListener event=trigger7 />
-                </visibility>
-              </events>
-            </Billboard>
-          </attached>
-        </CheckPoint>
-      </attached>
-    </Model>
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/gametype_dynamicmatch.oxw
===================================================================
--- code/trunk/data/levels/gametype_dynamicmatch.oxw	(revision 7677)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_ghost.oxt")
-  include("dynamicmatchhud.oxo")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Dynamic Match"
- description  = "In progress -level for dynamicmatch"
- gametype     = "Dynamicmatch"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-  >
-    <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" />
-
-<!-- ------------------Planet needs gravity----------------- -->
-<Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-<StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="499" />
-      </collisionShapes>
-    </StaticEntity>
-
-<!-- -----------12-Spawnpoints around the planet------------- -->
-<TeamSpawnPoint team=0 position="1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="-1000,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,-1000,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,0,1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,0,-1000" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<!--outer Spawnpoints -->
-<TeamSpawnPoint team=0 position="2000,0,0" lookat="0,0,1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="-2000,0,0" lookat="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,2000,0" lookat="0,1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,-2000,0" lookat="0,-1,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,0,2000" lookat="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-<TeamSpawnPoint team=0 position="0,0,-2000" lookat="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-
-<?lua
-    dofile("includes/CuboidSpaceStation.lua")
-  ?>
-<!-- ----------------Rotating satellite--------------- -->
-<MovableEntity position="1,1,1" rotationrate="-4.5" rotationaxis="0,0,1">
-        <attached>
-          <StaticEntity position="-2500,0,0" yaw=90 pitch=90>
-            <attached>
-              <?lua
-                createSpaceStationPar(0,2,1,2,1,4,1,50)
-              ?>
-                <TeamSpawnPoint team=2 position="20,20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-                <TeamSpawnPoint team=2 position="-20,-20,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-                <TeamSpawnPoint team=2 position="-10,10,20" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff/>
-            </attached>
-          </StaticEntity>
-        </attached>
-</MovableEntity>
-
-<!-- ---------------asteroid ellypse----------------- -->
-<?lua
-max = 20
-for i = 0, max, 1
-do
-    y = math.sin(i/max*6)*4000
-    z = math.cos(i/max*6)*5000
-    x = 0
-    ?>
-<?lua
-for k = 1, 25, 1
-do
-j = math.random()
-?>
-
-    <StaticEntity position="<?lua print(x + math.random() * 1000-500) ?>,<?lua print(y + math.random() * 1000-500) ?>,<?lua print(z + math.random() * 5000-2500) ?>" scale=<?lua print(j * 5) ?> >
-      <attached>
-        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
-	  <attached><!-- ---------asteroid fog----- -->
-            <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
-          </attached>
-	</Model>
-      </attached>
-      <?lua if i == 5 then ?><collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-      </collisionShapes> <?lua end ?>
-    </StaticEntity>
-<?lua
-end
-?>
-<?lua end ?>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-<!-- ----------------random fog --- not in use
-<?lua
-for i = 1, 100, 1
-do
-j = math.random()
-?>
-
-    <StaticEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>">
-      <attached>
-        <ParticleEmitter position="0,0,0" source="Orxonox/Steam" />
-      </attached>
-    </StaticEntity>
-
-<?lua
-end
-?>
--->
-  </Scene>
-</Level>
Index: code/trunk/data/levels/gametype_lastmanstanding.oxw
===================================================================
--- code/trunk/data/levels/gametype_lastmanstanding.oxw	(revision 7677)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
-  include("lastmanstandinghud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
-?>
-
-<Level
- name         = "Last Man Standing"
- description  = "testmap for gametype last man standing"
- gametype     =  "LastManStanding"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-    skybox       = "Orxonox/skypanoramagen1"
-  >
-
-    <?lua
-      include("includes/pickups.oxi")
-    ?>
-
-<!----- Spawnpoints 
-    <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"/>
-    <SpawnPoint team=0 position="-1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="-700,0,700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="700,0,-700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="0,0,-1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint team=0 position="0,0,1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> ----->
-<Bot />
-
-<!-- ------------ middle asteroid -------------- -->
-    <StaticEntity position="0,20,0" collisionType=static>
-       <attached>
-           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
-           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
-       </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="145" />
-      </collisionShapes>
-    </StaticEntity>
-
-    <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=mediuminvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
-      <pickup>
-        <InvisiblePickup template=hugeinvisiblepickup />
-      </pickup>
-    </PickupSpawner>
-    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-      </attached>
-    </StaticEntity>
-
-<!-- ---------------asteroid dome----------------- -->
-<?lua
-max = 16
-for i = 0, max, 1
-do
-    y = math.sin(i/max*6)*750
-    z = math.cos(i/max*6)*750
-    j = 1
-    ?>
-
-    <SpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="<?lua print(j * 2) ?>,100,<?lua print(j * 2) ?>" position = "0,0,0" />
-      </collisionShapes>
-    </StaticEntity>
-
-    <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
-      </collisionShapes>
-    </StaticEntity>
-
-    <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
-      </collisionShapes>
-    </StaticEntity>
-
-    <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
-      </collisionShapes>
-    </StaticEntity>
-
-    <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
-      </collisionShapes>
-    </StaticEntity>
-
-<!-- ---------Top Asteroid----------- -->
-    <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale=<?lua print(j * 2.1) ?> pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
-      <attached>
-        <Model position="0,0,0" scale=25 mesh="ast6.mesh">
-	</Model>
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape    halfExtents="50,140,30" position="0,0,0"/>
-      </collisionShapes>
-    </StaticEntity>
-
-
-<?lua end ?>
-
-  </Scene>
-</Level>
-
-
Index: code/trunk/data/levels/gametype_underattack.oxw
===================================================================
--- code/trunk/data/levels/gametype_underattack.oxw	(revision 7677)
+++ 	(revision )
@@ -1,167 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("underattackhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "UnderAttack testing"
- description  = "A simple testlevel"
- gametype     = UnderAttack
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-
-    <?lua for i = 1, 30, 1 do ?>
-      <MovableEntity
-          position="<?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>"
-          velocity="<?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>"
-      >
-        <attached>
-          <Model
-              <?lua x = math.random() * 150 + 30 ?>
-              scale="<?lua print(x) ?>"
-              mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh"
-              position="0,0,0"
-          />
-        </attached>
-          <collisionShapes>
-            <SphereCollisionShape radius=<?lua print(x) ?> position="0,0,0" />
-          </collisionShapes>
-      </MovableEntity>
-    <?lua end ?>
-
-    <Destroyer
-      position          = "100,150,0"
-      collisionType     = dynamic
-      mass              = 100000
-      velocity          = "-35,0,0"
-      angularDamping    = 0.9999999
-      health            = 10000
-      maxhealth         = 10000
-      initialhealth     = 10000
-    >
-
-      <attached>
-        <TeamSpawnPoint team=1 position="150,0,7" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <TeamSpawnPoint team=1 position="0,0,7" lookat="-1,0,0" roll="90"  yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <TeamSpawnPoint team=1 position="-50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <TeamSpawnPoint team=1 position="100,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <TeamSpawnPoint team=1 position="50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
-        <?lua for i = 1, 100, 1 do ?>
-          <TeamSpawnPoint
-            team=0
-            position="<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>"
-            lookat="0,0,0"
-            spawnclass=SpaceShip
-            pawndesign=spaceshipassff
-          />
-
-          <!--more spawnpoints for team1-->
-          <!--
-          <TeamSpawnPoint
-            team=1 position="<?lua print((math.random() * 500 + 500)) ?>,<?lua print((math.random() * 500 + 500) ) ?>,<?lua print((math.random() * 500 + 500)) ?>"
-            lookat="0,0,0"
-            spawnclass=SpaceShip
-            pawndesign=spaceshipassff
-          />-->
-        <?lua end ?>
-
-        <Model mesh="Carrier.mesh" scale="5" />
-        <Backlight
-          mainstate=activity
-          active=false
-          scale=0.4
-          name=bltest
-          position=" 7.6, 0, 6"
-          colour="0.2, 0.65, 1.0, 1.0"
-          width=15
-          length=1500
-          lifetime=2
-          elements=50
-          trailmaterial="Trail/backlighttrail"
-          turnontime=1
-          turnofftime=1
-          material="Flares/ThrusterFlare1"
-        />
-        <?lua for i=0,8,1 do ?>
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?> ,15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase=<?lua print(-360/8*i)?>
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-
-          <BlinkingBillboard
-            position="<?lua print(200-270/8*i)?>,-15,2"
-            material="Examples/Flare"
-            colour="1.0, 0.5, 0.3"
-            phase=<?lua print(-360/8*i)?>
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
-          />
-        <?lua end ?>
-
-        <Backlight
-          scale=1
-          position=" 169, 75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare"
-        />
-        <Backlight
-          scale=1
-          position=" 169, -75, -15"
-          colour="1, 0.85, 0.5, 0.5"
-          width=40
-          length=1000
-          lifetime=5
-          elements=15
-          trailmaterial="Trail/backlighttrail"
-          material="Examples/Flare" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
-        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
-        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
-        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
-        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
-      </collisionShapes>
-    </Destroyer>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-
-    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="20" />
-      </collisionShapes>
-    </StaticEntity>
-    
-  </Scene>
-</Level>
Index: code/trunk/data/levels/includes/weaponSettings1.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettings1.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettings1.oxi	(revision 7679)
@@ -0,0 +1,39 @@
+    <weaponslots>
+      <WeaponSlot position="-15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack firemode=0>
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+      <WeaponPack firemode=1>
+        <Fusion
+            position="0,0,0"
+            munitionType="FusionMunition"
+            bulletLoadingTime="0.3"
+            magazineLoadingTime="3"
+            speed="600"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettings2.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettings2.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettings2.oxi	(revision 7679)
@@ -0,0 +1,46 @@
+    <weaponslots>
+      <WeaponSlot position="-15,-0.5,0" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="15,-.5,0" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="195"/>
+            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="165"/>
+            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
+          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
+      </WeaponPack>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+        </links>
+        <Weapon>
+          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettings3.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettings3.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettings3.oxi	(revision 7679)
@@ -0,0 +1,53 @@
+    <weaponslots>
+      <WeaponSlot position="-15.0,-1.5,0" />
+      <WeaponSlot position=" 15.0,-1.5,0" />
+      <WeaponSlot position="    0,   0,0" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+      <WeaponSet firemode=2 />
+      <WeaponSet firemode=3 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+          <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
+            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
+            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
+        </Weapon>
+        <Weapon>
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
+          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
+        </Weapon>
+      </WeaponPack>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+        </links>
+        <!--Weapon>
+          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
+        </Weapon-->
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsFPS.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsFPS.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsFPS.oxi	(revision 7679)
@@ -0,0 +1,49 @@
+    <weaponslots>
+      <WeaponSlot position="0,0,0" yaw=0 pitch=0 roll=0 />
+ <!--      <WeaponSlot position="-0.5,0.8,2.5" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 /> -->
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack firemode=0>
+	<links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+        </links>
+	<Weapon>
+	   <HsW01 mode=0 munitionpershot=0 delay=0.0 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
+           <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+        <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1000"
+            unlimitedMunition=true
+        />
+  <!--       <LaserGun
+            position="0,0,0"
+            munitionType="LaserGunMunition"
+            bulletLoadingTime="0.2"
+            magazineLoadingTime="5.0"
+            speed="1250"
+            unlimitedMunition=true
+        />
+      </WeaponPack>
+      <WeaponPack firemode=1>
+        <Fusion
+            position="0,0,0"
+            munitionType="FusionMunition"
+            bulletLoadingTime="0.3"
+            magazineLoadingTime="3"
+            speed="600"
+            unlimitedMunition=true
+        /> -->
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsGhost.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsGhost.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsGhost.oxi	(revision 7679)
@@ -0,0 +1,26 @@
+    <weaponslots>
+      <WeaponSlot position=" 1.3,4.66,-20" />
+      <WeaponSlot position="-1.3,4.66,-20" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0  material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsH2.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsH2.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsH2.oxi	(revision 7679)
@@ -0,0 +1,45 @@
+    <weaponslots>
+      <WeaponSlot position="-7.5, 4, 8.5" />
+      <WeaponSlot position=" 7.5, 4, 8.5" />
+      <WeaponSlot position=" 0.0, 0,-13" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh"  roll="180" position="0.0, 0.5, 0.0" scale=2 />
+            <Model mesh="hs-w01s.mesh" roll="180" position="0.1, 0.0, 0.0" scale=2 />
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh"  roll="180" position=" 0.0, 0.5, 0.0" scale=2 />
+            <Model mesh="hs-w01s.mesh" roll="180" position="-0.1, 0.0, 0.0" scale=2 />
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" />
+        </Weapon>
+      </WeaponPack>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="LightningGun.mesh"   pitch="90" roll="90" yaw="90" position="0,  -1.3,0" />
+            <Model mesh="LightningGun-s.mesh" pitch="90" roll="90" yaw="90" position="0.2,-1.3,0" />
+          </attached>
+          <LightningGun mode=0 muzzleoffset="0,0,0" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
+
Index: code/trunk/data/levels/includes/weaponSettingsHXY.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsHXY.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsHXY.oxi	(revision 7679)
@@ -0,0 +1,26 @@
+    <weaponslots>
+      <WeaponSlot position=" 6,-2,2" />
+      <WeaponSlot position="-6,-2,2" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0  material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsPirate.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsPirate.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsPirate.oxi	(revision 7679)
@@ -0,0 +1,24 @@
+    <weaponslots>
+      <WeaponSlot position=" 4.3,-6,-10" />
+      <WeaponSlot position="-4.3,-6,-10" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+        </Weapon>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsSwallow.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsSwallow.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsSwallow.oxi	(revision 7679)
@@ -0,0 +1,26 @@
+    <weaponslots>
+      <WeaponSlot position=" 8,1.66,-17.5" />
+      <WeaponSlot position="-8,1.66,-17.5" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponSettingsTransporter.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsTransporter.oxi	(revision 7679)
+++ code/trunk/data/levels/includes/weaponSettingsTransporter.oxi	(revision 7679)
@@ -0,0 +1,26 @@
+    <weaponslots>
+      <WeaponSlot position=" 55,-10,20" />
+      <WeaponSlot position="-55,-10,20" />
+    </weaponslots>
+    <weaponsets>
+      <WeaponSet firemode=0 />
+      <WeaponSet firemode=1 />
+    </weaponsets>
+    <weapons>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+        <Weapon>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
+          <LightningGun mode=1 muzzleoffset="0,0,0" />
+        </Weapon>
+      </WeaponPack>
+    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings1.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings1.oxi	(revision 7677)
+++ 	(revision )
@@ -1,39 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15,-1.5,-25" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack firemode=0>
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion
-            position="0,0,0"
-            munitionType="FusionMunition"
-            bulletLoadingTime="0.3"
-            magazineLoadingTime="3"
-            speed="600"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings2.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings2.oxi	(revision 7677)
+++ 	(revision )
@@ -1,46 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15,-0.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-.5,0" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="195"/>
-            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh" roll="165"/>
-            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
-          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
-          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-        <Weapon>
-          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings3.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings3.oxi	(revision 7677)
+++ 	(revision )
@@ -1,53 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-15.0,-1.5,0" />
-      <WeaponSlot position=" 15.0,-1.5,0" />
-      <WeaponSlot position="    0,   0,0" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-      <WeaponSet firemode=2 />
-      <WeaponSet firemode=3 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
-          <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
-            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
-            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
-        </Weapon>
-        <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 />
-          <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-        <!--Weapon>
-          <EnergyDrink mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
-        </Weapon-->
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_H2.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_H2.oxi	(revision 7677)
+++ 	(revision )
@@ -1,45 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="-7.5, 4, 8.5" />
-      <WeaponSlot position=" 7.5, 4, 8.5" />
-      <WeaponSlot position=" 0.0, 0,-13" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh"  roll="180" position="0.0, 0.5, 0.0" scale=2 />
-            <Model mesh="hs-w01s.mesh" roll="180" position="0.1, 0.0, 0.0" scale=2 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" />
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" />
-        </Weapon>
-        <Weapon>
-          <attached>
-            <Model mesh="hs-w01.mesh"  roll="180" position=" 0.0, 0.5, 0.0" scale=2 />
-            <Model mesh="hs-w01s.mesh" roll="180" position="-0.1, 0.0, 0.0" scale=2 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" />
-        </Weapon>
-      </WeaponPack>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-        <Weapon>
-          <attached>
-            <Model mesh="LightningGun.mesh"   pitch="90" roll="90" yaw="90" position="0,  -1.3,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="90" roll="90" yaw="90" position="0.2,-1.3,0" />
-          </attached>
-          <LightningGun mode=0 muzzleoffset="0,0,0" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
-
Index: code/trunk/data/levels/includes/weaponsettings_HXY.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_HXY.oxi	(revision 7677)
+++ 	(revision )
@@ -1,26 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 6,-2,2" />
-      <WeaponSlot position="-6,-2,2" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0  material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_Transporter.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_Transporter.oxi	(revision 7677)
+++ 	(revision )
@@ -1,26 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 55,-10,20" />
-      <WeaponSlot position="-55,-10,20" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_fps.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_fps.oxi	(revision 7677)
+++ 	(revision )
@@ -1,49 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position="0,0,0" yaw=0 pitch=0 roll=0 />
- <!--      <WeaponSlot position="-0.5,0.8,2.5" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
-      <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 /> -->
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack firemode=0>
-	<links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-          <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
-        </links>
-	<Weapon>
-	   <HsW01 mode=0 munitionpershot=0 delay=0.0 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
-           <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-        <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1000"
-            unlimitedMunition=true
-        />
-  <!--       <LaserGun
-            position="0,0,0"
-            munitionType="LaserGunMunition"
-            bulletLoadingTime="0.2"
-            magazineLoadingTime="5.0"
-            speed="1250"
-            unlimitedMunition=true
-        />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion
-            position="0,0,0"
-            munitionType="FusionMunition"
-            bulletLoadingTime="0.3"
-            magazineLoadingTime="3"
-            speed="600"
-            unlimitedMunition=true
-        /> -->
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_ghost.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_ghost.oxi	(revision 7677)
+++ 	(revision )
@@ -1,26 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 1.3,4.66,-20" />
-      <WeaponSlot position="-1.3,4.66,-20" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0  material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_pirate.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_pirate.oxi	(revision 7677)
+++ 	(revision )
@@ -1,24 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 4.3,-6,-10" />
-      <WeaponSlot position="-4.3,-6,-10" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-        </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0     damage=2.5 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/includes/weaponsettings_swallow.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponsettings_swallow.oxi	(revision 7677)
+++ 	(revision )
@@ -1,26 +1,0 @@
-    <weaponslots>
-      <WeaponSlot position=" 8,1.66,-17.5" />
-      <WeaponSlot position="-8,1.66,-17.5" />
-    </weaponslots>
-    <weaponsets>
-      <WeaponSet firemode=0 />
-      <WeaponSet firemode=1 />
-    </weaponsets>
-    <weapons>
-      <WeaponPack>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
-        </links>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-        <Weapon>
-          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare" />
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
-        </Weapon>
-      </WeaponPack>
-    </weapons>
Index: code/trunk/data/levels/lastManStanding.oxw
===================================================================
--- code/trunk/data/levels/lastManStanding.oxw	(revision 7679)
+++ code/trunk/data/levels/lastManStanding.oxw	(revision 7679)
@@ -0,0 +1,145 @@
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+  include("lastManStandingHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+?>
+
+<Level
+ name         = "Last Man Standing"
+ description  = "testmap for gametype last man standing"
+ gametype     =  "LastManStanding"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+    skybox       = "Orxonox/skypanoramagen1"
+  >
+
+    <?lua
+      include("includes/pickups.oxi")
+    ?>
+
+<!----- Spawnpoints 
+    <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"/>
+    <SpawnPoint team=0 position="-1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="1150,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="-700,0,700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="700,0,-700" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="0,0,-1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint team=0 position="0,0,1150" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /> ----->
+<Bot />
+
+<!-- ------------ middle asteroid -------------- -->
+    <StaticEntity position="0,20,0" collisionType=static>
+       <attached>
+           <Model position="0,0,0" scale=140 mesh="asteroid_UV.mesh" shadow=true />
+           <!-- ParticleEmitter position="0,0,0" source="Orxonox/Steam" / -->
+       </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="145" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <PickupSpawner position="-160,65,10" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
+      <pickup>
+        <InvisiblePickup template=mediuminvisiblepickup />
+      </pickup>
+    </PickupSpawner>
+    <PickupSpawner position="-160,60,17" triggerDistance="10" respawnTime="5" maxSpawnedItems="10"><!--EasterEgg-->
+      <pickup>
+        <InvisiblePickup template=hugeinvisiblepickup />
+      </pickup>
+    </PickupSpawner>
+    <StaticEntity position="-160,60,28.4"><!--EasterEgg-Indicator-->
+      <attached>
+        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+      </attached>
+    </StaticEntity>
+
+<!-- ---------------asteroid dome----------------- -->
+<?lua
+max = 16
+for i = 0, max, 1
+do
+    y = math.sin(i/max*6)*750
+    z = math.cos(i/max*6)*750
+    j = 1
+    ?>
+
+    <SpawnPoint team=0 position="<?lua print(y*1.4+z*0.2) ?>,0,<?lua print(z*1.4-y*0.2) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <StaticEntity position="<?lua print(y) ?>,0,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="<?lua print(j * 2) ?>,100,<?lua print(j * 2) ?>" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i+3,6) + 1) ?>.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*5,6) + 1) ?>.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,-100,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*13+1,6) + 1) ?>.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+    <StaticEntity position="<?lua print(y) ?>,-200,<?lua print(z) ?>" scale=<?lua print(j * 2) ?> collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=15 mesh="ast<?lua print( math.mod(i*17,6) + 1) ?>.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="45,100,45" position = "0,0,0" />
+      </collisionShapes>
+    </StaticEntity>
+
+<!-- ---------Top Asteroid----------- -->
+    <StaticEntity position="<?lua print(y) ?>,300,<?lua print(z) ?>" scale=<?lua print(j * 2.1) ?> pitch="90" roll="180" yaw="<?lua print(-90+i*360/max) ?>" collisionType=static >
+      <attached>
+        <Model position="0,0,0" scale=25 mesh="ast6.mesh">
+	</Model>
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape    halfExtents="50,140,30" position="0,0,0"/>
+      </collisionShapes>
+    </StaticEntity>
+
+
+<?lua end ?>
+
+  </Scene>
+</Level>
+
+
Index: code/trunk/data/levels/notifications.oxw
===================================================================
--- code/trunk/data/levels/notifications.oxw	(revision 7677)
+++ code/trunk/data/levels/notifications.oxw	(revision 7679)
@@ -6,8 +6,8 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/old/CuboidSpaceStation.oxw
===================================================================
--- code/trunk/data/levels/old/CuboidSpaceStation.oxw	(revision 7677)
+++ code/trunk/data/levels/old/CuboidSpaceStation.oxw	(revision 7679)
@@ -1,8 +1,8 @@
 <?lua
-	include("hudtemplates3.oxo")
+	include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-	include("templates/spaceship_assff.oxt")
+	include("templates/spaceshipAssff.oxt")
 ?>
 
Index: code/trunk/data/levels/old/physicsTest.oxw
===================================================================
--- code/trunk/data/levels/old/physicsTest.oxw	(revision 7679)
+++ code/trunk/data/levels/old/physicsTest.oxw	(revision 7679)
@@ -0,0 +1,19 @@
+<Ambient colourvalue="0.8, 0.8, 0.8" />
+<Skybox src="Orxonox/Starbox" />
+<SpaceShip camera="true" position="50,0,0" scale="10" yawpitchroll="0,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
+<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
+
+<HelloBullet/>
+
+
+<?lua
+for i = 1, 226, 1
+do ?>
+  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
+<?lua
+end
+?>
Index: code/trunk/data/levels/old/physicsTest2.oxw
===================================================================
--- code/trunk/data/levels/old/physicsTest2.oxw	(revision 7679)
+++ code/trunk/data/levels/old/physicsTest2.oxw	(revision 7679)
@@ -0,0 +1,280 @@
+<?lua
+  include("spaceshipTemplatesPhysics.oxw")
+?>
+<?lua
+  include("HUDTemplates3.oxo")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
+   hasPhysics   = true
+  >
+      <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
+
+    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
+    <StaticEntity
+     position        = "0,0,0"
+     name            = "banana"
+     collisionType   = "static"
+     mass            = 1000
+    >
+      <attached>
+        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
+        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
+      </attached>
+      <collisionShapes>
+        <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
+      </collisionShapes>
+    </StaticEntity>
+
+    <!-- red sphere for phsics engine testing purposes-->
+    <!--StaticEntity position="40,0,0">
+      <attached>
+        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
+      </attached>
+    </StaticEntity-->
+
+    <!-- yellow cube for phsics engine testing purposes-->
+    <!--StaticEntity position="80,0,0">
+      <attached>
+        <Model position="0,0,0" scale=1 mesh="cube.mesh" />
+      </attached>
+    </StaticEntity-->
+
+    <MovableEntity
+     name            = "blubb"
+     position        = "-150, 20, -500"
+     collisionType   = "kinematic"
+     mass            = 10000
+     velocity        = "30, 0, 0"
+    >
+      <attached>
+        <Model name = "moedeli" position="0,0,0" scale=20 mesh="sphere.mesh" />
+        <StaticEntity name="hahaha" position="0,0,0" collisionType="static">
+          <collisionShapes>
+            <SphereCollisionShape name="firstSphere" radius=20/>
+          </collisionShapes>
+        </StaticEntity>
+      </attached>
+
+      <!--attached>
+        <SphereCollisionShape name = "secondSphere" radius=0.4 position="1,1,1"/>
+        <CompoundCollisionShape position="4,4,4">
+          <SphereCollisionShape name = "thirdSphere" radius=1.0/>
+        </CompoundCollisionShape>
+      </attached-->
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "blubb2"
+     position        = "150, 30, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <StaticEntity
+     name            = "blubbStatic"
+     position        = "0, 15, -500"
+     collisionType   = "Static"
+     mass            = 10
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </StaticEntity>
+
+    <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
+
+    <MovableEntity
+     name            = "apple1"
+     position        = "-150, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "apple2"
+     position        = "50, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="1,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <MovableEntity
+     name            = "apple3"
+     position        = "150, 80, -500"
+     collisionType   = "dynamic"
+     mass            = 10
+     velocity        = "-30, 0, 0"
+    >
+      <attached>
+        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
+      </collisionShapes>
+    </MovableEntity>
+
+    <!--MovableEntity scale=1.5 position="0,0,-300" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=90>
+      <events>
+        <activity>
+          <DistanceTrigger position="0,0,-300" distance=50 target="ControllableEntity" invert=1 />
+        </activity>
+      </events>
+      <attached>
+        <Model position="0,0,0" scale=10 mesh="ast1.mesh" />
+        <StaticEntity position="0,0,100">
+          <attached>
+            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
+            <MovableEntity position="0,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=500>
+              <attached>
+                <Model position="0,35,0" scale=2 mesh="ast1.mesh" />
+                <Model position="0,-35,0" scale=2 mesh="ast1.mesh" />
+                <Model position="35,0,0" scale=2 mesh="ast1.mesh">
+                  <attached>
+                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
+                  </attached>
+                </Model>
+                <Model position="-35,0,0" scale=2 mesh="ast1.mesh">
+                  <attached>
+                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
+                  </attached>
+                </Model>
+              </attached>
+            </MovableEntity>
+          </attached>
+        </StaticEntity>
+        <MovableEntity position="0,0,-100" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=200>
+          <attached>
+            <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
+            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
+            <Model position="0,0,-50" scale=3 mesh="ast1.mesh" />
+            <Model position="0,0,50" scale=3 mesh="ast1.mesh" />
+          </attached>
+        </MovableEntity>
+      </attached>
+    </MovableEntity-->
+
+
+    <!--ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
+    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
+    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 /-->
+
+
+    <ParticleSpawner position="0,20,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+        <spawn>
+          <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="0,20,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+              </trigger>
+            </events>
+          </EventTrigger>
+        </spawn>
+      </events>
+    </ParticleSpawner>
+
+
+    <!--ParticleEmitter name=fireright position="200,0,0" source="Orxonox/fire3" active=false>
+      <events>
+        <activity>
+          <DistanceTrigger name=firetrigger1 position="200,0,0" distance=100 target="ControllableEntity" />
+        </activity>
+      </events>
+    </ParticleEmitter>
+    <ParticleEmitter name=fireleft position="-200,0,0" source="Orxonox/fire3" active=false>
+      <events>
+        <activity>
+          <DistanceTrigger name=firetrigger2 position="-200,0,0" distance=100 target="ControllableEntity" />
+        </activity>
+      </events>
+    </ParticleEmitter>
+    <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
+      <events>
+        <activity>
+          <EventListener event=firetrigger1 />
+          <EventListener event=firetrigger2 />
+        </activity>
+      </events>
+    </ParticleEmitter-->
+
+
+    <!--EventDispatcher>
+      <targets>
+        <EventTarget target=fireright />
+        <EventTarget target=firecenter />
+        <EventTarget target=fireleft />
+      </targets>
+      <events>
+        <activity>
+          <DistanceTrigger position="0,0,200" distance=100 target="ControllableEntity" />
+        </activity>
+      </events>
+    </EventDispatcher-->
+
+
+    <!--Model position="0,50,0" scale=3 mesh="assff.mesh">
+      <events>
+        <visibility>
+          <DistanceTrigger position="0,50,0" distance=50 target="ControllableEntity" invert=1 />
+        </visibility>
+      </events>
+    </Model-->
+
+
+    <Model position="0,0,200" scale=10 mesh="ast2.mesh" shadow=true />
+    <!--Model position="0,0,-200" scale=10 mesh="ast1.mesh" shadow=true /-->
+    <Model position="0,200,0" scale=10 mesh="ast3.mesh" shadow=true />
+    <Model position="0,-200,0" scale=10 mesh="ast4.mesh" shadow=true />
+    <Model position="200,0,0" scale=10 mesh="ast5.mesh" shadow=false />
+    <Model position="-200,0,0" scale=10 mesh="ast6.mesh" shadow=false />
+
+    <Model position="1000,-200,0" scale3D="1,100,100" mesh="ast1.mesh" />
+
+    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
+    <!--Model position="0,100,-100" pitch=-90 roll=-90 scale=4 mesh="pirate.mesh" />
+    <Model position="0,300,-100" pitch=-90 roll=-90 scale=4 mesh="spacecruiser.mesh" /-->
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/old/physicstest.oxw
===================================================================
--- code/trunk/data/levels/old/physicstest.oxw	(revision 7677)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<Ambient colourvalue="0.8, 0.8, 0.8" />
-<Skybox src="Orxonox/Starbox" />
-<SpaceShip camera="true" position="50,0,0" scale="10" yawpitchroll="0,-90,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0" />
-<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
-<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
-
-<HelloBullet/>
-
-
-<?lua
-for i = 1, 226, 1
-do ?>
-  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua
-end
-?>
Index: code/trunk/data/levels/old/physicstest2.oxw
===================================================================
--- code/trunk/data/levels/old/physicstest2.oxw	(revision 7677)
+++ 	(revision )
@@ -1,280 +1,0 @@
-<?lua
-  include("spaceshiptemplates_physics.oxw")
-?>
-<?lua
-  include("hudtemplates3.oxo")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-      <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-    <!-- axes in ogre's origin of coordinate system for phsics engine testing purposes-->
-    <StaticEntity
-     position        = "0,0,0"
-     name            = "banana"
-     collisionType   = "static"
-     mass            = 1000
-    >
-      <attached>
-        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
-        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
-      </attached>
-      <collisionShapes>
-        <PlaneCollisionShape name="thePlane" planeNormal="0,1,0" planeOffset=0 />
-      </collisionShapes>
-    </StaticEntity>
-
-    <!-- red sphere for phsics engine testing purposes-->
-    <!--StaticEntity position="40,0,0">
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="sphere.mesh" />
-      </attached>
-    </StaticEntity-->
-
-    <!-- yellow cube for phsics engine testing purposes-->
-    <!--StaticEntity position="80,0,0">
-      <attached>
-        <Model position="0,0,0" scale=1 mesh="cube.mesh" />
-      </attached>
-    </StaticEntity-->
-
-    <MovableEntity
-     name            = "blubb"
-     position        = "-150, 20, -500"
-     collisionType   = "kinematic"
-     mass            = 10000
-     velocity        = "30, 0, 0"
-    >
-      <attached>
-        <Model name = "moedeli" position="0,0,0" scale=20 mesh="sphere.mesh" />
-        <StaticEntity name="hahaha" position="0,0,0" collisionType="static">
-          <collisionShapes>
-            <SphereCollisionShape name="firstSphere" radius=20/>
-          </collisionShapes>
-        </StaticEntity>
-      </attached>
-
-      <!--attached>
-        <SphereCollisionShape name = "secondSphere" radius=0.4 position="1,1,1"/>
-        <CompoundCollisionShape position="4,4,4">
-          <SphereCollisionShape name = "thirdSphere" radius=1.0/>
-        </CompoundCollisionShape>
-      </attached-->
-    </MovableEntity>
-
-    <MovableEntity
-     name            = "blubb2"
-     position        = "150, 30, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-
-    <StaticEntity
-     name            = "blubbStatic"
-     position        = "0, 15, -500"
-     collisionType   = "Static"
-     mass            = 10
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </StaticEntity>
-
-    <!--SpawnPoint position="0,   0,  100"           spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0,   0, -700" yaw  =180 spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <SpawnPoint position="0, 300, -300" pitch=-90 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
-
-    <MovableEntity
-     name            = "apple1"
-     position        = "-150, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-
-    <MovableEntity
-     name            = "apple2"
-     position        = "50, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="1,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-
-    <MovableEntity
-     name            = "apple3"
-     position        = "150, 80, -500"
-     collisionType   = "dynamic"
-     mass            = 10
-     velocity        = "-30, 0, 0"
-    >
-      <attached>
-        <Model position="0,0,0" scale=20 mesh="sphere.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape name = "secondSphere" radius=20 position="0,0,0"/>
-      </collisionShapes>
-    </MovableEntity>
-
-    <!--MovableEntity scale=1.5 position="0,0,-300" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=90>
-      <events>
-        <activity>
-          <DistanceTrigger position="0,0,-300" distance=50 target="ControllableEntity" invert=1 />
-        </activity>
-      </events>
-      <attached>
-        <Model position="0,0,0" scale=10 mesh="ast1.mesh" />
-        <StaticEntity position="0,0,100">
-          <attached>
-            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
-            <MovableEntity position="0,0,0" velocity="0,0,0" rotationaxis="0,0,1" rotationrate=500>
-              <attached>
-                <Model position="0,35,0" scale=2 mesh="ast1.mesh" />
-                <Model position="0,-35,0" scale=2 mesh="ast1.mesh" />
-                <Model position="35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-                  </attached>
-                </Model>
-                <Model position="-35,0,0" scale=2 mesh="ast1.mesh">
-                  <attached>
-                    <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-                  </attached>
-                </Model>
-              </attached>
-            </MovableEntity>
-          </attached>
-        </StaticEntity>
-        <MovableEntity position="0,0,-100" velocity="0,0,0" rotationaxis="0,1,0" rotationrate=200>
-          <attached>
-            <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
-            <Model position="0,0,0" scale=6 mesh="ast1.mesh" />
-            <Model position="0,0,-50" scale=3 mesh="ast1.mesh" />
-            <Model position="0,0,50" scale=3 mesh="ast1.mesh" />
-          </attached>
-        </MovableEntity>
-      </attached>
-    </MovableEntity-->
-
-
-    <!--ParticleSpawner position="-500,0,-200" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-300" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-400" source="Orxonox/BigExplosion1part1" lifetime=3.0 loop=1 />
-    <ParticleSpawner position="-500,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 />
-    <ParticleSpawner position="-500,0,-600" source="Orxonox/BigExplosion1part1" lifetime=2.5 loop=1 /-->
-
-
-    <ParticleSpawner position="0,20,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,20,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-
-
-    <!--ParticleEmitter name=fireright position="200,0,0" source="Orxonox/fire3" active=false>
-      <events>
-        <activity>
-          <DistanceTrigger name=firetrigger1 position="200,0,0" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </ParticleEmitter>
-    <ParticleEmitter name=fireleft position="-200,0,0" source="Orxonox/fire3" active=false>
-      <events>
-        <activity>
-          <DistanceTrigger name=firetrigger2 position="-200,0,0" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </ParticleEmitter>
-    <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
-      <events>
-        <activity>
-          <EventListener event=firetrigger1 />
-          <EventListener event=firetrigger2 />
-        </activity>
-      </events>
-    </ParticleEmitter-->
-
-
-    <!--EventDispatcher>
-      <targets>
-        <EventTarget target=fireright />
-        <EventTarget target=firecenter />
-        <EventTarget target=fireleft />
-      </targets>
-      <events>
-        <activity>
-          <DistanceTrigger position="0,0,200" distance=100 target="ControllableEntity" />
-        </activity>
-      </events>
-    </EventDispatcher-->
-
-
-    <!--Model position="0,50,0" scale=3 mesh="assff.mesh">
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,50,0" distance=50 target="ControllableEntity" invert=1 />
-        </visibility>
-      </events>
-    </Model-->
-
-
-    <Model position="0,0,200" scale=10 mesh="ast2.mesh" shadow=true />
-    <!--Model position="0,0,-200" scale=10 mesh="ast1.mesh" shadow=true /-->
-    <Model position="0,200,0" scale=10 mesh="ast3.mesh" shadow=true />
-    <Model position="0,-200,0" scale=10 mesh="ast4.mesh" shadow=true />
-    <Model position="200,0,0" scale=10 mesh="ast5.mesh" shadow=false />
-    <Model position="-200,0,0" scale=10 mesh="ast6.mesh" shadow=false />
-
-    <Model position="1000,-200,0" scale3D="1,100,100" mesh="ast1.mesh" />
-
-    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
-    <!--Model position="0,100,-100" pitch=-90 roll=-90 scale=4 mesh="pirate.mesh" />
-    <Model position="0,300,-100" pitch=-90 roll=-90 scale=4 mesh="spacecruiser.mesh" /-->
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/old/planetTest.oxw
===================================================================
--- code/trunk/data/levels/old/planetTest.oxw	(revision 7679)
+++ code/trunk/data/levels/old/planetTest.oxw	(revision 7679)
@@ -0,0 +1,38 @@
+<?lua
+  include("HUDTemplates3.oxo")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/Starbox"
+  >
+
+    <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+        <spawn>
+          <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+              </trigger>
+            </events>
+          </EventTrigger>
+        </spawn>
+      </events>
+    </ParticleSpawner>
+
+
+    <Planet position="2500,0,-9000" scale=1000 pitch=-90 mesh="earth.mesh" rotationaxis="0,0,1" rotationrate="0.1" atmospheresize=130.0f imagesize=1024.0f />
+    <Planet position="0,0,-5001" scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/old/planettest.oxw
===================================================================
--- code/trunk/data/levels/old/planettest.oxw	(revision 7677)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-?>
-
-<?lua
-  include("templates/spaceship_assff.oxt")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/Starbox"
-  >
-
-    <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-
-
-    <Planet position="2500,0,-9000" scale=1000 pitch=-90 mesh="earth.mesh" rotationaxis="0,0,1" rotationrate="0.1" atmospheresize=130.0f imagesize=1024.0f />
-    <Planet position="0,0,-5001" scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-    <Model position="0, 0,-100" pitch=-90 roll=-90 scale=4 mesh="assff.mesh" />
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/old/presentationLOD.oxw
===================================================================
--- code/trunk/data/levels/old/presentationLOD.oxw	(revision 7677)
+++ code/trunk/data/levels/old/presentationLOD.oxw	(revision 7679)
@@ -1,11 +1,11 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 
Index: code/trunk/data/levels/old/presentationPhysics.oxw
===================================================================
--- code/trunk/data/levels/old/presentationPhysics.oxw	(revision 7679)
+++ code/trunk/data/levels/old/presentationPhysics.oxw	(revision 7679)
@@ -0,0 +1,109 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  math.randomseed(344)
+?>
+
+<Level
+ name         = "Physics"
+ description  = "Just a few tests"
+>
+  <Scene
+   ambientlight = "0.8, 0.8, 0.8"
+   skybox       = "Orxonox/skypanoramagen1"
+   gravity      = "0, -10, 0"
+  >
+    <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" />
+
+    <StaticEntity
+     position        = "0,0,0"
+     name            = "floor"
+     collisionType   = "static"
+     friction        = 1
+    >
+      <attached>
+        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
+        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
+      </attached>
+      <collisionShapes>
+        <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
+      </collisionShapes>
+    </StaticEntity>
+
+    <MovableEntity
+     position        = "0,250,500"
+     rotationaxis    = "1, 1, 1"
+     rotationrate    = 360
+     velocity        = "0, 0, -80"
+     name            = "ship"
+     collisionType   = "dynamic"
+     friction        = 0.5
+     mass            = 500
+     restitution     = 0
+    >
+      <attached>
+        <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+        <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+        <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+
+        <!--Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+        <Model position="0,0,0" scale3D="10, 3, 5" mesh="cube.mesh" />
+        <Model position="13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
+        <Model position="-13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
+        <Model position="0,0,7" scale3D="3, 2, 2" mesh="cube.mesh" />
+        <Model position="0,0.1,-11" scale3D="2.2, 1.8, 6" mesh="cube.mesh" />
+        <Model position="0,0.1,-19" scale3D="1.4, 1, 2" mesh="cube.mesh" /-->
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+        <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+        <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+        <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+        <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+        <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+      </collisionShapes>
+    </MovableEntity>
+
+    <?lua
+    for i = -20, 20, 8
+    do
+      for i2 = -20, 20, 8
+      do
+        for i3 = -20, 20, 8
+        do ?>
+        <MovableEntity
+         position="<?lua print(i)?>, <?lua print(i3 + 250)?>, <?lua print(i2) ?>"
+         collisionType = "dynamic"
+         mass = 1
+         restitution = 0
+         friction = 0.5
+        >
+          <attached>
+            <Model position="0,0,0" scale=2 mesh="cube.mesh" />
+          </attached>
+          <collisionShapes>
+            <BoxCollisionShape halfExtents="2, 2, 2" />
+          </collisionShapes>
+        </MovableEntity>
+    <?lua
+        end
+      end
+    end
+    ?>
+
+    <ParticleSpawner position="-100,170,30" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+        <spawn>
+          <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="-100,170,30" spawnclass=SpaceShip pawndesign=spaceshipassff />
+              </trigger>
+            </events>
+          </EventTrigger>
+        </spawn>
+      </events>
+    </ParticleSpawner>
+  </Scene>
+</Level>
Index: code/trunk/data/levels/old/presentation_physics.oxw
===================================================================
--- code/trunk/data/levels/old/presentation_physics.oxw	(revision 7677)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  math.randomseed(344)
-?>
-
-<Level
- name         = "Physics"
- description  = "Just a few tests"
->
-  <Scene
-   ambientlight = "0.8, 0.8, 0.8"
-   skybox       = "Orxonox/skypanoramagen1"
-   gravity      = "0, -10, 0"
-  >
-    <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" />
-
-    <StaticEntity
-     position        = "0,0,0"
-     name            = "floor"
-     collisionType   = "static"
-     friction        = 1
-    >
-      <attached>
-        <Model position="0,0,0" scale=100 mesh="plane.mesh" />
-        <Model position="0,-0.0001,0" roll=180 scale=100 mesh="plane.mesh" />
-      </attached>
-      <collisionShapes>
-        <PlaneCollisionShape planeNormal="0,1,0" planeOffset=0 />
-      </collisionShapes>
-    </StaticEntity>
-
-    <MovableEntity
-     position        = "0,250,500"
-     rotationaxis    = "1, 1, 1"
-     rotationrate    = 360
-     velocity        = "0, 0, -80"
-     name            = "ship"
-     collisionType   = "dynamic"
-     friction        = 0.5
-     mass            = 500
-     restitution     = 0
-    >
-      <attached>
-        <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-        <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-        <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-
-        <!--Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-        <Model position="0,0,0" scale3D="10, 3, 5" mesh="cube.mesh" />
-        <Model position="13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
-        <Model position="-13,-1.3,0" scale3D="3, 1, 2" mesh="cube.mesh" />
-        <Model position="0,0,7" scale3D="3, 2, 2" mesh="cube.mesh" />
-        <Model position="0,0.1,-11" scale3D="2.2, 1.8, 6" mesh="cube.mesh" />
-        <Model position="0,0.1,-19" scale3D="1.4, 1, 2" mesh="cube.mesh" /-->
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-        <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-        <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-        <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-        <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-        <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-      </collisionShapes>
-    </MovableEntity>
-
-    <?lua
-    for i = -20, 20, 8
-    do
-      for i2 = -20, 20, 8
-      do
-        for i3 = -20, 20, 8
-        do ?>
-        <MovableEntity
-         position="<?lua print(i)?>, <?lua print(i3 + 250)?>, <?lua print(i2) ?>"
-         collisionType = "dynamic"
-         mass = 1
-         restitution = 0
-         friction = 0.5
-        >
-          <attached>
-            <Model position="0,0,0" scale=2 mesh="cube.mesh" />
-          </attached>
-          <collisionShapes>
-            <BoxCollisionShape halfExtents="2, 2, 2" />
-          </collisionShapes>
-        </MovableEntity>
-    <?lua
-        end
-      end
-    end
-    ?>
-
-    <ParticleSpawner position="-100,170,30" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-        <spawn>
-          <EventTrigger delay=1>
-            <events>
-              <trigger>
-                <SpawnPoint position="-100,170,30" spawnclass=SpaceShip pawndesign=spaceshipassff />
-              </trigger>
-            </events>
-          </EventTrigger>
-        </spawn>
-      </events>
-    </ParticleSpawner>
-  </Scene>
-</Level>
Index: code/trunk/data/levels/old/princessAeryn.oxw
===================================================================
--- code/trunk/data/levels/old/princessAeryn.oxw	(revision 7679)
+++ code/trunk/data/levels/old/princessAeryn.oxw	(revision 7679)
@@ -0,0 +1,312 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+?>
+
+<?lua
+    dofile("includes/CuboidSpaceStation.lua")
+?>
+
+<Level
+ name         = "The Tale of Princess Aeryn"
+ description  = "The Tale of Princess Aeryn"
+>
+    <Scene
+        ambientlight = "0.3, 0.3, 0.3"
+        skybox       = "Orxonox/skypanoramagen1"
+    >
+
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
+
+      <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" />
+
+        <Template name=turboitem baseclass=Turbo>
+          <Turbo
+            playerclass=SpaceShip
+            duration=15
+          />
+        </Template>
+
+        <ParticleSpawner position="200,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <PickupSpawner position="200,0,-500" distance=50 respawntimer=25 item=turboitem>
+                <attached>
+                  <Model mesh="sphere.mesh" scale=3 />
+                  <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale=0.5 />
+                </attached>
+              </PickupSpawner>
+            </spawn>
+          </events>
+        </ParticleSpawner>
+
+        <Template name=turboequipment baseclass=Turbo>
+          <Turbo
+            playerclass=SpaceShip
+            duration=0
+          />
+        </Template>
+
+        <ParticleSpawner position="400,0,-1000" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <PickupSpawner position="400,0,-1000" distance=50 respawntimer=25 item=turboequipment>
+                <attached>
+                  <Model mesh="sphere.mesh" scale=3 />
+                  <Billboard material="Examples/Flare" colour="1.0, 0.5, 0.3" scale=0.5 />
+                </attached>
+              </PickupSpawner>
+            </spawn>
+          </events>
+        </ParticleSpawner>
+
+        <!-- Quest: -->
+        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
+            <QuestDescription title="The Tale of Princess Aeryn" description="Princess Aeryn has been kidnapped by evil Mr. M and you were just a little too late to save her.\nYou have to find and save her from her captors." failMessage="You cannot fail, how did you?" completeMessage="You did it John. You're a hero. Princess Aeryn however will still not marry you." />
+            <subquests>
+                <GlobalQuest id="43766602-7e2f-4d24-976a-3f9de1474d5b">
+                    <QuestDescription title="Find Aeryn's S.H.O.E.S." description="Oh, the kidnappers must have been in a hurry because they overlooked princess Aeryns S.H.O.E.S. (Super Heavily Organized Escape Ship) hidden in the asteroid field over there.\nFind it and look there for clues to Princess Aeryns whereabouts." completeMessage="You did it, Looking through her stuff you find an odd looking device - Could this be the receiver of Princess Aeryns locator beacon? - But it must be broken, the screen remains blank." />
+                    <complete-effects>
+                        <AddQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
+                    </complete-effects>
+                </GlobalQuest>
+                <GlobalQuest id="50845552-c8af-4091-947c-76bd850b224e">
+                    <QuestDescription title="Repair the receiver." description="There is a space station called 'Serenity Station' near here. An engineer called Nathan Stark who shoud be able to help you lives there." completeMessage="'Yeah Nathan lives here, he'll shurely help you.'\nAnd he does, apparenty the device was just low on batteries so you're now able to locate your beloved Princess Aeryn." />
+                    <hints>
+                        <QuestHint id="b9b10841-b045-4797-b1d3-cfce760e1de6">
+                            <QuestDescription title="The Katratzi Station" description="'We ain't buying!'\n'What do you want?'\n'No there lives no Nathan here.'\n'Fuck off.''" />
+                        </QuestHint>
+                        <QuestHint id="1ee785f8-b71d-4b51-b080-42cec5be8e3c">
+                            <QuestDescription title="The Pegasus Station" description="'Hello friend.'\n'How can we help you?'\n'A Mr. Stark you say? Sorry no man with such a name lives here.'" />
+                        </QuestHint>
+                    </hints>
+                    <complete-effects>
+                        <AddQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
+                    </complete-effects>
+                </GlobalQuest>
+                <GlobalQuest id="97628524-b243-492c-b7b6-498f325b21d4">
+                    <QuestDescription title="Follow the dots" description="Just follow the dots, they'll lead you right to her." completeMessage="You found Princess Aeryn. Her captors give up at the shere sight ou you." />
+                    <complete-effects>
+                        <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+                    </complete-effects>
+                </GlobalQuest>
+            </subquests>
+        </GlobalQuest>
+
+        <!-- Create spaceship spawner: -->
+        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <EventTrigger delay=1>
+                <events>
+                  <trigger>
+                    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+                  </trigger>
+                </events>
+              </EventTrigger>
+            </spawn>
+          </events>
+          <attached>
+            <QuestEffectBeacon position="0,0,0" times=1>
+                <effects>
+                    <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+                    <AddQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
+                </effects>
+                <events>
+                    <execute>
+                        <EventListener event=questbeacon1 />
+                    </execute>
+                </events>
+                <attached>
+                    <DistanceTrigger name=questbeacon1 position="0,0,0" distance=10 target="ControllableEntity" />
+                </attached>
+            </QuestEffectBeacon>
+          </attached>
+        </ParticleSpawner>
+
+        <!-- Create world -->
+
+            <!-- Kidnapper flying away -->
+            <MovableEntity position="200,0,0" velocity="-140,0,-140" yaw=45>
+                <attached>
+                    <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" />
+                    <ParticleSpawner position="0,0,10" source="Orxonox/fire3" lifetime=2.0 loop=0 autostart=1 />
+                    <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
+                        <effects>
+                            <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+                        </effects>
+                        <events>
+                            <execute>
+                                <EventListener event=questbeacon7 />
+                            </execute>
+                        </events>
+                        <attached>
+                            <DistanceTrigger name=questbeacon7 position="0,0,0" distance=10 target="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </MovableEntity>
+
+            <!-- Asteroid field -->
+            <StaticEntity position="-500,0,-3000">
+                <attached>
+                    <?lua
+                        for i = 1, 200
+                        do ?>
+                        <MovableEntity position="<?lua print(math.random() * 2000 - 1000)?>, <?lua print(math.random() * 2000 - 1000) ?>, <?lua print(math.random() * 2000 - 1000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
+                            <attached>
+                                <Model scale="<?lua print(math.random() * 50) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+                            </attached>
+                        </MovableEntity>
+                    <?lua
+                        end
+                    ?>
+                    <!-- S.H.O.E.S -->
+                    <StaticEntity position="-300,0,0">
+                        <attached>
+                            <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="assff.mesh" />
+                            <QuestEffectBeacon position="0,0,0" times=-1>
+                                <effects>
+                                    <CompleteQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
+                                </effects>
+                                <events>
+                                    <execute>
+                                        <EventListener event=questbeacon2 />
+                                    </execute>
+                                </events>
+                                <attached>
+                                    <DistanceTrigger name=questbeacon2 position="0,0,0" distance=50 target="ControllableEntity" />
+                                </attached>
+                            </QuestEffectBeacon>
+                        </attached>
+                    </StaticEntity>
+                </attached>
+            </StaticEntity>
+
+
+
+            <!-- Spacestations -->
+
+            <!-- Serenity Station -->
+            <StaticEntity scale=1 position="0,0,5000" yaw=30>
+                <attached>
+                    <?lua
+                        createSpaceStationPar(65461,2,1,2,1,2,1,100)
+                    ?>
+                    <QuestEffectBeacon position="0,450,0" times=1>
+                        <effects>
+                            <CompleteQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
+                        </effects>
+                        <events>
+                            <execute>
+                                <EventListener event=questbeacon3 />
+                            </execute>
+                        </events>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+                            <DistanceTrigger name=questbeacon3 position="0,0,0" distance=100 target="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+            <!-- Katratzi Station -->
+            <StaticEntity scale=1 position="0,5000,300" yaw=60>
+                <attached>
+                    <?lua
+                        createSpaceStationPar(9851,2,1,2,1,2,1,100)
+                    ?>
+                    <QuestEffectBeacon position="0,450,0" times=1>
+                        <effects>
+                            <AddQuestHint hintId="b9b10841-b045-4797-b1d3-cfce760e1de6" />
+                        </effects>
+                        <events>
+                            <execute>
+                                <EventListener event=questbeacon4 />
+                            </execute>
+                        </events>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+                            <DistanceTrigger name=questbeacon4 position="0,0,0" distance=100 target="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+            <!-- Pegasus Station -->
+            <StaticEntity scale=1 position="-5000,100,1000" roll=30>
+                <attached>
+                    <?lua
+                        createSpaceStationPar(3574,2,1,2,1,2,1,100)
+                    ?>
+                    <QuestEffectBeacon position="200,450,0" times=1>
+                        <effects>
+                            <AddQuestHint hintId="1ee785f8-b71d-4b51-b080-42cec5be8e3c" />
+                        </effects>
+                        <events>
+                            <execute>
+                                <EventListener event=questbeacon5 />
+                            </execute>
+                        </events>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+                            <DistanceTrigger name=questbeacon5 position="0,0,0" distance=100 target="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+            <!-- Trail -->
+            <EventDispatcher>
+                <targets>
+                    <EventTarget target=trail />
+                </targets>
+                <events>
+                    <visibility>
+                        <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
+                    </visibility>
+                    <activity>
+                        <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+
+            <?lua
+                for i = 1, 25
+                do
+            ?>
+                <Billboard position="<?lua print(i*5000/25) ?>,<?lua print(450+i*(5000-450)/25) ?>,5000" colour="1.0,0,0" material="Examples/Flare" name=trail visible=false/>
+            <?lua
+                end
+            ?>
+
+            <!-- Hideout -->
+            <StaticEntity position="5000,5000,5000" >
+                <attached>
+                    <Model scale="100" mesh="ast2.mesh" shadow=false />
+                </attached>
+            </StaticEntity>
+
+            <StaticEntity position="5400,5400,5000" visible=false name=trail >
+                <attached>
+                    <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" visible=false name=trail />
+                    <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
+                        <effects>
+                            <CompleteQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
+                        </effects>
+                        <events>
+                            <execute>
+                                <EventListener event=questbeacon6 />
+                            </execute>
+                        </events>
+                        <attached>
+                            <DistanceTrigger name=questbeacon6 position="0,0,0" distance=100 target="ControllableEntity" />
+                        </attached>
+                    </QuestEffectBeacon>
+                </attached>
+            </StaticEntity>
+
+    </Scene>
+</Level>
+
Index: code/trunk/data/levels/old/princessaeryn.oxw
===================================================================
--- code/trunk/data/levels/old/princessaeryn.oxw	(revision 7677)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-?>
-
-<?lua
-    dofile("includes/CuboidSpaceStation.lua")
-?>
-
-<Level
- name         = "The Tale of Princess Aeryn"
- description  = "The Tale of Princess Aeryn"
->
-    <Scene
-        ambientlight = "0.3, 0.3, 0.3"
-        skybox       = "Orxonox/skypanoramagen1"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-      <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" />
-
-        <Template name=turboitem baseclass=Turbo>
-          <Turbo
-            playerclass=SpaceShip
-            duration=15
-          />
-        </Template>
-
-        <ParticleSpawner position="200,0,-500" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <PickupSpawner position="200,0,-500" distance=50 respawntimer=25 item=turboitem>
-                <attached>
-                  <Model mesh="sphere.mesh" scale=3 />
-                  <Billboard material="Examples/Flare" colour="0.5, 1.0, 0.3" scale=0.5 />
-                </attached>
-              </PickupSpawner>
-            </spawn>
-          </events>
-        </ParticleSpawner>
-
-        <Template name=turboequipment baseclass=Turbo>
-          <Turbo
-            playerclass=SpaceShip
-            duration=0
-          />
-        </Template>
-
-        <ParticleSpawner position="400,0,-1000" source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <PickupSpawner position="400,0,-1000" distance=50 respawntimer=25 item=turboequipment>
-                <attached>
-                  <Model mesh="sphere.mesh" scale=3 />
-                  <Billboard material="Examples/Flare" colour="1.0, 0.5, 0.3" scale=0.5 />
-                </attached>
-              </PickupSpawner>
-            </spawn>
-          </events>
-        </ParticleSpawner>
-
-        <!-- Quest: -->
-        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
-            <QuestDescription title="The Tale of Princess Aeryn" description="Princess Aeryn has been kidnapped by evil Mr. M and you were just a little too late to save her.\nYou have to find and save her from her captors." failMessage="You cannot fail, how did you?" completeMessage="You did it John. You're a hero. Princess Aeryn however will still not marry you." />
-            <subquests>
-                <GlobalQuest id="43766602-7e2f-4d24-976a-3f9de1474d5b">
-                    <QuestDescription title="Find Aeryn's S.H.O.E.S." description="Oh, the kidnappers must have been in a hurry because they overlooked princess Aeryns S.H.O.E.S. (Super Heavily Organized Escape Ship) hidden in the asteroid field over there.\nFind it and look there for clues to Princess Aeryns whereabouts." completeMessage="You did it, Looking through her stuff you find an odd looking device - Could this be the receiver of Princess Aeryns locator beacon? - But it must be broken, the screen remains blank." />
-                    <complete-effects>
-                        <AddQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-                    </complete-effects>
-                </GlobalQuest>
-                <GlobalQuest id="50845552-c8af-4091-947c-76bd850b224e">
-                    <QuestDescription title="Repair the receiver." description="There is a space station called 'Serenity Station' near here. An engineer called Nathan Stark who shoud be able to help you lives there." completeMessage="'Yeah Nathan lives here, he'll shurely help you.'\nAnd he does, apparenty the device was just low on batteries so you're now able to locate your beloved Princess Aeryn." />
-                    <hints>
-                        <QuestHint id="b9b10841-b045-4797-b1d3-cfce760e1de6">
-                            <QuestDescription title="The Katratzi Station" description="'We ain't buying!'\n'What do you want?'\n'No there lives no Nathan here.'\n'Fuck off.''" />
-                        </QuestHint>
-                        <QuestHint id="1ee785f8-b71d-4b51-b080-42cec5be8e3c">
-                            <QuestDescription title="The Pegasus Station" description="'Hello friend.'\n'How can we help you?'\n'A Mr. Stark you say? Sorry no man with such a name lives here.'" />
-                        </QuestHint>
-                    </hints>
-                    <complete-effects>
-                        <AddQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-                    </complete-effects>
-                </GlobalQuest>
-                <GlobalQuest id="97628524-b243-492c-b7b6-498f325b21d4">
-                    <QuestDescription title="Follow the dots" description="Just follow the dots, they'll lead you right to her." completeMessage="You found Princess Aeryn. Her captors give up at the shere sight ou you." />
-                    <complete-effects>
-                        <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-                    </complete-effects>
-                </GlobalQuest>
-            </subquests>
-        </GlobalQuest>
-
-        <!-- Create spaceship spawner: -->
-        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-          <events>
-            <spawn>
-              <EventTrigger delay=1>
-                <events>
-                  <trigger>
-                    <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-                  </trigger>
-                </events>
-              </EventTrigger>
-            </spawn>
-          </events>
-          <attached>
-            <QuestEffectBeacon position="0,0,0" times=1>
-                <effects>
-                    <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-                    <AddQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-                </effects>
-                <events>
-                    <execute>
-                        <EventListener event=questbeacon1 />
-                    </execute>
-                </events>
-                <attached>
-                    <DistanceTrigger name=questbeacon1 position="0,0,0" distance=10 target="ControllableEntity" />
-                </attached>
-            </QuestEffectBeacon>
-          </attached>
-        </ParticleSpawner>
-
-        <!-- Create world -->
-
-            <!-- Kidnapper flying away -->
-            <MovableEntity position="200,0,0" velocity="-140,0,-140" yaw=45>
-                <attached>
-                    <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" />
-                    <ParticleSpawner position="0,0,10" source="Orxonox/fire3" lifetime=2.0 loop=0 autostart=1 />
-                    <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-                        <effects>
-                            <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-                        </effects>
-                        <events>
-                            <execute>
-                                <EventListener event=questbeacon7 />
-                            </execute>
-                        </events>
-                        <attached>
-                            <DistanceTrigger name=questbeacon7 position="0,0,0" distance=10 target="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </MovableEntity>
-
-            <!-- Asteroid field -->
-            <StaticEntity position="-500,0,-3000">
-                <attached>
-                    <?lua
-                        for i = 1, 200
-                        do ?>
-                        <MovableEntity position="<?lua print(math.random() * 2000 - 1000)?>, <?lua print(math.random() * 2000 - 1000) ?>, <?lua print(math.random() * 2000 - 1000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-                            <attached>
-                                <Model scale="<?lua print(math.random() * 50) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-                            </attached>
-                        </MovableEntity>
-                    <?lua
-                        end
-                    ?>
-                    <!-- S.H.O.E.S -->
-                    <StaticEntity position="-300,0,0">
-                        <attached>
-                            <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="assff.mesh" />
-                            <QuestEffectBeacon position="0,0,0" times=-1>
-                                <effects>
-                                    <CompleteQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-                                </effects>
-                                <events>
-                                    <execute>
-                                        <EventListener event=questbeacon2 />
-                                    </execute>
-                                </events>
-                                <attached>
-                                    <DistanceTrigger name=questbeacon2 position="0,0,0" distance=50 target="ControllableEntity" />
-                                </attached>
-                            </QuestEffectBeacon>
-                        </attached>
-                    </StaticEntity>
-                </attached>
-            </StaticEntity>
-
-
-
-            <!-- Spacestations -->
-
-            <!-- Serenity Station -->
-            <StaticEntity scale=1 position="0,0,5000" yaw=30>
-                <attached>
-                    <?lua
-                        createSpaceStationPar(65461,2,1,2,1,2,1,100)
-                    ?>
-                    <QuestEffectBeacon position="0,450,0" times=1>
-                        <effects>
-                            <CompleteQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-                        </effects>
-                        <events>
-                            <execute>
-                                <EventListener event=questbeacon3 />
-                            </execute>
-                        </events>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-                            <DistanceTrigger name=questbeacon3 position="0,0,0" distance=100 target="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-
-            <!-- Katratzi Station -->
-            <StaticEntity scale=1 position="0,5000,300" yaw=60>
-                <attached>
-                    <?lua
-                        createSpaceStationPar(9851,2,1,2,1,2,1,100)
-                    ?>
-                    <QuestEffectBeacon position="0,450,0" times=1>
-                        <effects>
-                            <AddQuestHint hintId="b9b10841-b045-4797-b1d3-cfce760e1de6" />
-                        </effects>
-                        <events>
-                            <execute>
-                                <EventListener event=questbeacon4 />
-                            </execute>
-                        </events>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-                            <DistanceTrigger name=questbeacon4 position="0,0,0" distance=100 target="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-
-            <!-- Pegasus Station -->
-            <StaticEntity scale=1 position="-5000,100,1000" roll=30>
-                <attached>
-                    <?lua
-                        createSpaceStationPar(3574,2,1,2,1,2,1,100)
-                    ?>
-                    <QuestEffectBeacon position="200,450,0" times=1>
-                        <effects>
-                            <AddQuestHint hintId="1ee785f8-b71d-4b51-b080-42cec5be8e3c" />
-                        </effects>
-                        <events>
-                            <execute>
-                                <EventListener event=questbeacon5 />
-                            </execute>
-                        </events>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-                            <DistanceTrigger name=questbeacon5 position="0,0,0" distance=100 target="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-
-            <!-- Trail -->
-            <EventDispatcher>
-                <targets>
-                    <EventTarget target=trail />
-                </targets>
-                <events>
-                    <visibility>
-                        <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-                    </visibility>
-                    <activity>
-                        <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-                    </activity>
-                </events>
-            </EventDispatcher>
-
-            <?lua
-                for i = 1, 25
-                do
-            ?>
-                <Billboard position="<?lua print(i*5000/25) ?>,<?lua print(450+i*(5000-450)/25) ?>,5000" colour="1.0,0,0" material="Examples/Flare" name=trail visible=false/>
-            <?lua
-                end
-            ?>
-
-            <!-- Hideout -->
-            <StaticEntity position="5000,5000,5000" >
-                <attached>
-                    <Model scale="100" mesh="ast2.mesh" shadow=false />
-                </attached>
-            </StaticEntity>
-
-            <StaticEntity position="5400,5400,5000" visible=false name=trail >
-                <attached>
-                    <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" visible=false name=trail />
-                    <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-                        <effects>
-                            <CompleteQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-                        </effects>
-                        <events>
-                            <execute>
-                                <EventListener event=questbeacon6 />
-                            </execute>
-                        </events>
-                        <attached>
-                            <DistanceTrigger name=questbeacon6 position="0,0,0" distance=100 target="ControllableEntity" />
-                        </attached>
-                    </QuestEffectBeacon>
-                </attached>
-            </StaticEntity>
-
-    </Scene>
-</Level>
-
Index: code/trunk/data/levels/old/questSystem.oxw
===================================================================
--- code/trunk/data/levels/old/questSystem.oxw	(revision 7679)
+++ code/trunk/data/levels/old/questSystem.oxw	(revision 7679)
@@ -0,0 +1,111 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+?>
+
+<Level
+ name         = "Questsystem"
+ description  = "Just a few tests"
+>
+    <Scene
+    ambientlight = "0.5, 0.5, 0.5"
+    skybox       = "Orxonox/Starbox"
+    >
+
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
+
+        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
+            <QuestDescription title="The Main QUest" description="This is the main quest hooray. Solve it!" failMessage="You fail. Looser." completeMessage="You Win." />
+            <hints>
+                <QuestHint id="022a859d-08dd-4eac-a085-c28c29c06d48">
+                    <QuestDescription title="The super Hint." description="Be proud of yourself." />
+                </QuestHint>
+            </hints>
+        </GlobalQuest>
+
+        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+            <events>
+                <spawn>
+                    <EventTrigger delay=1>
+                        <events>
+                            <trigger>
+                                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+                            </trigger>
+                        </events>
+                    </EventTrigger>
+                </spawn>
+            </events>
+        </ParticleSpawner>
+
+        <QuestEffectBeacon position="0,0,100" times=-1>
+            <effects>
+                <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event=qebdt1 />
+                </execute>
+            </events>
+            <attached>
+                <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />
+                <DistanceTrigger name=qebdt1 position="0,0,0" distance=10 target="ControllableEntity" />
+            </attached>
+        </QuestEffectBeacon>
+
+        <QuestEffectBeacon position="-100,0,0" times=-1>
+            <effects>
+                <FailQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event=qebdt2 />
+                </execute>
+            </events>
+            <attached>
+                <Billboard position="0,0,0" colour="1.0,0,0" material="Examples/Flare" />
+                <DistanceTrigger name=qebdt2 position="0,0,0" distance=10 target="ControllableEntity" />
+            </attached>
+        </QuestEffectBeacon>
+
+        <QuestEffectBeacon position="100,0,0" times=-1>
+            <effects>
+                <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event=qebdt3 />
+                </execute>
+            </events>
+            <attached>
+                <Billboard position="0,0,0" colour="0,1.0,0" material="Examples/Flare" />
+                <DistanceTrigger name=qebdt3 position="0,0,0" distance=10 target="ControllableEntity" />
+            </attached>
+        </QuestEffectBeacon>
+
+        <QuestEffectBeacon position="0,100,0" times=-1>
+            <effects>
+                <AddQuestHint hintId="022a859d-08dd-4eac-a085-c28c29c06d48" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event=qebdt4 />
+                </execute>
+            </events>
+            <attached>
+                <Billboard position="0,0,0" colour="0,0,1.0" material="Examples/Flare" />
+                <DistanceTrigger name=qebdt4 position="0,0,0" distance=10 target="ControllableEntity" />
+            </attached>
+        </QuestEffectBeacon>
+
+        <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
+            <events>
+                <activity>
+                    <QuestListener questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" mode="complete" />
+                </activity>
+            </events>
+        </ParticleEmitter>
+
+    </Scene>
+</Level>
+
Index: code/trunk/data/levels/old/questsystem.oxw
===================================================================
--- code/trunk/data/levels/old/questsystem.oxw	(revision 7677)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-?>
-
-<Level
- name         = "Questsystem"
- description  = "Just a few tests"
->
-    <Scene
-    ambientlight = "0.5, 0.5, 0.5"
-    skybox       = "Orxonox/Starbox"
-    >
-
-        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-        <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
-            <QuestDescription title="The Main QUest" description="This is the main quest hooray. Solve it!" failMessage="You fail. Looser." completeMessage="You Win." />
-            <hints>
-                <QuestHint id="022a859d-08dd-4eac-a085-c28c29c06d48">
-                    <QuestDescription title="The super Hint." description="Be proud of yourself." />
-                </QuestHint>
-            </hints>
-        </GlobalQuest>
-
-        <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-            <events>
-                <spawn>
-                    <EventTrigger delay=1>
-                        <events>
-                            <trigger>
-                                <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-                            </trigger>
-                        </events>
-                    </EventTrigger>
-                </spawn>
-            </events>
-        </ParticleSpawner>
-
-        <QuestEffectBeacon position="0,0,100" times=-1>
-            <effects>
-                <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt1 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt1 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="-100,0,0" times=-1>
-            <effects>
-                <FailQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt2 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="1.0,0,0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt2 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="100,0,0" times=-1>
-            <effects>
-                <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt3 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="0,1.0,0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt3 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <QuestEffectBeacon position="0,100,0" times=-1>
-            <effects>
-                <AddQuestHint hintId="022a859d-08dd-4eac-a085-c28c29c06d48" />
-            </effects>
-            <events>
-                <execute>
-                    <EventListener event=qebdt4 />
-                </execute>
-            </events>
-            <attached>
-                <Billboard position="0,0,0" colour="0,0,1.0" material="Examples/Flare" />
-                <DistanceTrigger name=qebdt4 position="0,0,0" distance=10 target="ControllableEntity" />
-            </attached>
-        </QuestEffectBeacon>
-
-        <ParticleEmitter name=firecenter position="0,0,0" source="Orxonox/fire3" active=false>
-            <events>
-                <activity>
-                    <QuestListener questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" mode="complete" />
-                </activity>
-            </events>
-        </ParticleEmitter>
-
-    </Scene>
-</Level>
-
Index: code/trunk/data/levels/old/sample4.oxw
===================================================================
--- code/trunk/data/levels/old/sample4.oxw	(revision 7677)
+++ code/trunk/data/levels/old/sample4.oxw	(revision 7679)
@@ -1,8 +1,8 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
+  include("templates/spaceshipAssff.oxt")
 ?>
 
Index: code/trunk/data/levels/old/spaceshipTemplatesPhysics.oxw
===================================================================
--- code/trunk/data/levels/old/spaceshipTemplatesPhysics.oxw	(revision 7679)
+++ code/trunk/data/levels/old/spaceshipTemplatesPhysics.oxw	(revision 7679)
@@ -0,0 +1,87 @@
+<Template name=spaceshipassff>
+  <SpaceShip
+   camerapositiontemplate = spaceshipassffcameras
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 10;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.999
+   name              = "blubbbeliblubb"
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
+      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
+    </attached>
+    <collisionShapes>
+      <!--SphereCollisionShape position="0,0,0"      radius=20 /-->
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,10,40" />
+      <CameraPosition position="0,150,-25" pitch=-90 />
+      <CameraPosition position="0,0,-30" yaw=180 />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 />
+      <CameraPosition position="50,5,-8" yaw=90 />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<!--Template name=spaceshippirate>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+    </attached>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+    </attached>
+  </SpaceShip>
+</Template-->
Index: code/trunk/data/levels/old/spaceshiptemplates_physics.oxw
===================================================================
--- code/trunk/data/levels/old/spaceshiptemplates_physics.oxw	(revision 7677)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   camerapositiontemplate = spaceshipassffcameras
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 10;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.999
-   name              = "blubbbeliblubb"
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <!--Light position="0,0,20" diffuse="0,0,1" specular="0,0,1" type=point /-->
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-      <!--ParticleEmitter position="0,0,-100" source="Orxonox/smoke5" /-->
-    </attached>
-    <collisionShapes>
-      <!--SphereCollisionShape position="0,0,0"      radius=20 /-->
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10,40" />
-      <CameraPosition position="0,150,-25" pitch=-90 />
-      <CameraPosition position="0,0,-30" yaw=180 />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 />
-      <CameraPosition position="50,5,-8" yaw=90 />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->
Index: code/trunk/data/levels/old/tutorialHS08.oxw
===================================================================
--- code/trunk/data/levels/old/tutorialHS08.oxw	(revision 7679)
+++ code/trunk/data/levels/old/tutorialHS08.oxw	(revision 7679)
@@ -0,0 +1,26 @@
+<Ambient colourvalue="0.8, 0.8, 0.8" />
+<Skybox src="Orxonox/Starbox" />
+
+<!-- This is your own space ship. The complicated XML values are not important -->
+<TutorialShip
+    camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0"
+
+SpecialEffects="true"
+
+/>
+
+<!-- A few models flying around -->
+<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
+<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
+<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
+
+<!-- Embedded lua code (creates random asteroids) -->
+<?lua
+for i = 1, 226, 1
+do ?>
+  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
+<?lua
+end
+?>
Index: code/trunk/data/levels/old/tutorial_hs08.oxw
===================================================================
--- code/trunk/data/levels/old/tutorial_hs08.oxw	(revision 7677)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<Ambient colourvalue="0.8, 0.8, 0.8" />
-<Skybox src="Orxonox/Starbox" />
-
-<!-- This is your own space ship. The complicated XML values are not important -->
-<TutorialShip
-    camera="true" position="0,0,0" scale="10" yawpitchroll="0,0,0" mesh="assff.mesh" maxSpeed="500" maxSideAndBackSpeed="50" maxRotation="1.0" transAcc="200" rotAcc="3.0" transDamp="75" rotDamp="1.0"
-
-SpecialEffects="true"
-
-/>
-
-<!-- A few models flying around -->
-<Model position="2000,0,0" scale="10" mesh="tomato.mesh" yawpitchroll="-40,30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,2000,0" scale="10" mesh="tomato.mesh" yawpitchroll="-50,60,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="0,0,2000" scale="10" mesh="tomato.mesh" yawpitchroll="-50,-30,0" rotationAxis="1,0,0" rotationRate="-30"/>
-<Model position="10000,16000,0" scale="100" mesh="DuBall1.mesh"/>
-<Model position="11400,16000,0" scale="60" mesh="DuBall2.mesh"/>
-
-<!-- Embedded lua code (creates random asteroids) -->
-<?lua
-for i = 1, 226, 1
-do ?>
-  <Model position="<?lua print(math.random() * 40000 - 20000)?>, <?lua print(math.random() * 40000 - 20000) ?>, <?lua print(math.random() * 40000 - 20000) ?>" scale="<?lua print(math.random() * 250 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random() * 30 + 15) ?>" />
-<?lua
-end
-?>
Index: code/trunk/data/levels/pickups.oxw
===================================================================
--- code/trunk/data/levels/pickups.oxw	(revision 7677)
+++ code/trunk/data/levels/pickups.oxw	(revision 7679)
@@ -7,11 +7,11 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/pirateAttack.oxw
===================================================================
--- code/trunk/data/levels/pirateAttack.oxw	(revision 7679)
+++ code/trunk/data/levels/pirateAttack.oxw	(revision 7679)
@@ -0,0 +1,561 @@
+<LevelInfo
+ name = "Pirate Attack"
+ description = "Dani's Testlevel"
+ tags = "test"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipHXYSL.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Template name=spaceshipassffplayer defaults=0>
+  <SpaceShip template=spaceshipassff name=player>
+    <attached>
+    <DistanceTriggerBeacon name=Me/>
+    </attached>
+  </SpaceShip>
+</Template>
+
+<?lua
+    dofile("includes/CuboidSpaceStation.lua")
+?>
+    
+<Level
+name="Dani's Testlevel"
+description="Erste Versuche mit den Quests"
+gametype=TeamDeathmatch
+>
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+    <Scene
+        ambientlight = "0.3, 0.3, 0.3"
+        skybox       = "Orxonox/skypanoramagen1"
+    >
+
+        <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
+
+        <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" />
+
+
+          <GlobalQuest id="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551">
+        <QuestDescription title="Fight for freedom"
+                    description="Just a few hours ago, a group of pirates attacked an killed all your  squad members. Now you are very angry and you want to take revenge. Find the pirates and kill them!"
+                    failmessage="You are a loser, now the whole universe will be controlled by the pirates!"
+                    completeMessage="Yeah, you did it! You,ve eliminated the enemies. But why attacked them the Humans here? For tousands of years, there was peace in this sun system.
+                                You have to find out what happened exactly and why the pirates attacked..."/>
+            <subquests>
+                <GlobalQuest id="3159b4d4-bc86-4190-ba1d-4530668dfe31">
+                    <QuestDescription title="The stolen stick..."
+                    description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You received a message from your Headquarter: The pirates have stolen
+                            a very important memory stick with secret infos (military locations etc.), the holy stick. You must get it back! Otherwise the humans are in great danger..."
+                    failmessage=""
+                    completeMessage="Unbelievable, you annihilated all pirates and got the stolen memory stick.
+                                But wait... this isn't the memory stick you looked for, this stick is one from a pirate... anyway, it's helpful: There is a map saved on it, which leads you to a pirate - base. Perhaps you'll find more
+                                about their plans there..."/>
+                </GlobalQuest>
+                <GlobalQuest id="8d8ed3a6-74a6-4491-9172-26155cff151d">
+                    <QuestDescription title="Find the Base"
+                    description="Now you are in possession of the map and it should be easy to find the base. Because you are a Member of an elite-fight-squad, your ship has been pimped before you started your mission.
+                        They installed a very modern navigation system, which leads you precisely to your desired destination. Use it to find the pirate - base."
+                    failmessage=""
+                    completeMessage="The navigation system worked very well and now you should be near a pirate -base." />
+                    <hints>
+                        <QuestHint id="965101b3-26ce-4fcf-bc71-17cc2a87d2e9">
+                        <QuestDescription title="3 Ways?"
+                        description="The different ways leads you to the possible positions where the base could be. The problem is that the map is encrypted and your on board system is not
+                                able to decrypt it exactly. Therefore you have to try 3 possible ways...Tha base is Huge, but it could be that it's invisible when ou are in longer distance (some Big Ships
+                                have a special shield aroud them which make them invisible at longer range)."/>
+                        </QuestHint>
+                    </hints>
+                </GlobalQuest>
+                <GlobalQuest  id="9930a598-98bc-4ff8-8cc0-31311a6ccaaa">
+                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
+                </GlobalQuest>
+                <GlobalQuest id="9930a598-98bc-4ff8-8cc0-31311a6ccaab">
+                    <QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
+                </GlobalQuest>
+                <GlobalQuest id="8a62408b-c47b-4e02-bd3d-06bb9ec0b363">
+                    <QuestDescription title="The Base"
+                    description="Yeah, you found the Base... now let's check if there is the important holy stick..."
+                    failmessage=""
+                    completeMessage="There it is, the Holy stick. Yes, you're right. It looks like a rocket because there are so many rockets in the universe, that it's nearly impossible to find the holy stick between them.
+                                Anyway, the pirates found the stick... another part which is confusing. Why did they know where the holy stick is? Perpaps they know more about the humans than you think."/>
+                </GlobalQuest>
+                <GlobalQuest id="85380d05-b791-45d1-82e9-01f0bc930367">
+                    <QuestDescription title="Find out more about the pirates"
+                    description= "Now, the Holy stick is back in your possession. Your new mission is to get some more infos about the pirates. You've got an info about a near mining company
+                    which delivers Hydrogen out of special asteroids. Hydrogen is a very rare ressource on earth and is delivered by a few great mining companys. There is no oil anymore on earth since many years.
+                    Therefore hydrogen became the most important energy source for all humans.
+                    But back to your mission. The mining company has it's own security. Ask some of their security staff if they know more about the pirates... it's actually your only hope to get more infos.
+                    You'll find the mining company at the near planet with the asteroid belt."
+                    failmessage=""
+                    completeMessage=""/>
+                </GlobalQuest>
+                <GlobalQuest id="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734">
+                    <QuestDescription title="Interesting..."
+                    description= "You're very lucky. The first security man has interesting infos about the pirates. He said that they made a few attacks in de last few weeks and they intensified the attacks in the last days...
+                    Shit, they attack one more time. Fight them back!"
+                    failmessage=""
+                    completeMessage=""/>
+                </GlobalQuest>
+            </subquests>
+            <hints>
+                <QuestHint id="2b85f32c-2433-4f1a-bdd4-f24d20c9403c">
+                    <QuestDescription title="Useful to know" description="Pirates like to hide themselves behind asteroids."/>
+                </QuestHint>
+            </hints>
+            <fail-effects>
+            </fail-effects>
+            <complete-effects>
+            </complete-effects>
+        </GlobalQuest>
+    
+          <ParticleSpawner position="0,0,0" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+          <events>
+            <spawn>
+              <EventTrigger delay=1>
+            <events>
+              <trigger>
+                <SpawnPoint position="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint1 team=0 active=true/>
+              </trigger>
+            </events>
+              </EventTrigger>
+            </spawn>
+          </events>
+          <attached>
+            <QuestEffectBeacon position="0,0,0" times=1>
+            <effects>
+                <AddQuest questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" />
+            </effects>
+            <events>
+                <execute>
+                <EventListener event=questbeacon1 />
+                </execute>
+            </events>
+            <attached>
+                <DistanceTrigger name=questbeacon1 position="0,0,0" distance=100 target=DistanceTriggerBeacon targetname=Me/>
+            </attached>
+            </QuestEffectBeacon>
+          </attached>
+        </ParticleSpawner>
+    
+        <SpawnPoint position="600,300,-6000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer name=spawnpoint2 active=false/>
+    
+    
+    
+        <!-- Add second Quest-->
+        <QuestEffectBeacon position="250,-300,-1500" times=1>
+                    <attached>
+                        <Billboard position="0,0,0" scale=3 colour="1.0,1.0,0" material="Examples/Flare" />
+                        <DistanceTrigger name=questbeacon2 targetname=Me position="0,0,0" target=DistanceTriggerBeacon distance=400 />
+                    </attached>
+                    <effects>
+                        <AddQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon2 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+        <!-- Hint to first Quest-->
+        <QuestEffectBeacon position="0,0,0" times=1>
+                    <attached>
+                        <DistanceTrigger name=questbeacon3  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me delay="5" />
+                    </attached>
+                    <effects>
+                        <AddQuestHint hintId="2b85f32c-2433-4f1a-bdd4-f24d20c9403c" />
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon3 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+    
+        <!--Pirates killed... navi leads you to possible Base stations-->
+        <QuestEffectBeacon position="600,300,-6000" times=1>
+                    <attached>
+                        <Billboard position="0,0,0" scale=3 colour="0,1.0,0" material="Examples/Flare" />
+                        <DistanceTrigger name=questbeacon4  position="0,0,0" distance=200 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+    
+                    <effects>
+                        <CompleteQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
+                        <AddQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
+                        <AddQuestHint hintId="965101b3-26ce-4fcf-bc71-17cc2a87d2e9" />
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon4 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+    
+        <!-- Wrong way 1-->
+        <QuestEffectBeacon position="7600,300,-8000" times=1>
+                    <attached>
+                        <DistanceTrigger name=questbeacon5  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+                    <effects>
+                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon5 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+        <!-- Wrong way 2-->
+        <QuestEffectBeacon position="1600,2300,-10000" times=1>
+                    <attached>
+                        <DistanceTrigger name=questbeacon8  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+                    <effects>
+                        <AddQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon8 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+        <!-- Base found!-->
+        <QuestEffectBeacon position="4600,5300,-11000" times=1>
+                    <attached>
+                        <DistanceTrigger name=questbeacon6  position="0,0,0" distance=600 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+                    <effects>
+                        <CompleteQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
+                        <AddQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
+                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
+                        <CompleteQuest questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" />
+    
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon6 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+        <!--Stick found-->
+        <QuestEffectBeacon position="4800,5785,-10725" times=1>
+                    <attached>
+                        <DistanceTrigger name=questbeacon7  position="0,0,0" distance=30 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+                    <effects>
+                        <CompleteQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
+                        <AddQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
+    
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon7 />
+                        </execute>
+                    </events>
+                </QuestEffectBeacon>
+    
+    
+        <!--Security Man found-->
+        <QuestEffectBeacon position="4000,4000,-20000" times=1>
+                    <attached>
+                        <Billboard position="0,0,0" scale=3 colour="0,0,1.0" material="Examples/Flare" />
+                        <DistanceTrigger name=questbeacon9 position="0,0,0" distance=500 target=DistanceTriggerBeacon targetname=Me />
+                    </attached>
+                    <effects>
+                        <CompleteQuest questId="85380d05-b791-45d1-82e9-01f0bc930367" />
+                        <AddQuest questId="d8afe2eb-b3b9-4c98-8ed7-cc1a2a8e3734" />
+    
+                    </effects>
+                    <events>
+                        <execute>
+                            <EventListener event=questbeacon9 />
+                        </execute>
+                    </events>
+        </QuestEffectBeacon>
+    
+    <!--Navigation System which shows possiple positions of base-->
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=Navi />
+                </targets>
+                <events>
+                    <visibility>
+                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
+                    </visibility>
+                    <activity>
+                        <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+
+            <?lua
+                for i = 0, 30
+                do
+            ?>
+        <Billboard position="<?lua print(i*1000/30+600) ?>,<?lua print(i*2000/30+300) ?>,<?lua print(-i*4000/30-6000) ?>" colour="1.0,0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:1600,2300,-10000-->
+        <Billboard position="<?lua print(i*7000/30+600) ?>,<?lua print(i*0/30+300) ?>,<?lua print(-i*2000/30-6000) ?>" colour="0,1.0,0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:7600,300,-8000-->
+        <Billboard position="<?lua print(i*4000/30+600) ?>,<?lua print(i*5000/30+300) ?>,<?lua print(-i*5000/30-6000) ?>" colour="0,0,1.0" scale=1 material="Examples/Flare" name=Navi visible=false/><!--endpos:4600,5300,-11000-->
+            <?lua
+                end
+            ?>
+    
+    <!--Base&Stick spawn*****************************************************************-->
+    <StaticEntity scale=1 position="4650,5350,-11050" name=base visible=true active=true yaw=60>
+                <attached>
+                    <?lua
+                        createSpaceStationPar(9851,2,1,2,1,2,1,100)
+                    ?>
+                </attached>
+            </StaticEntity>
+    
+    <ParticleSpawner position="4650,5350,-11050" source="Orxonox/explosion1" name=base visible=false active=false loop=0/>
+    <Model position="4800,5785,-10725" scale=3 mesh="rocket.mesh" visible=true active=true name=base />
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=base />
+             <EventTarget target=navipirate1 />
+              <EventTarget target=navipirate2 />
+                </targets>
+                <events>
+                    <visibility>
+          <EventTrigger invert=true>
+            <events>
+              <trigger>
+                <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
+              </trigger>
+            </events>
+          </EventTrigger>
+                    </visibility>
+                    <activity>
+                <EventTrigger invert=true>
+            <events>
+              <trigger>
+                             <QuestListener questId="dbd02b4c-ab7c-46fd-bdaf-fd4c19ac1551" mode="start" />
+              </trigger>
+            </events>
+          </EventTrigger>
+                    </activity>
+                </events>
+            </EventDispatcher>
+
+    
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=base />
+                </targets>
+                <events>
+                    <visibility>
+                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
+                    </visibility>
+                    <activity>
+                        <QuestListener questId="8d8ed3a6-74a6-4491-9172-26155cff151d" mode="complete" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+    
+    <!--Base&Stick spawn********end*****************************************************-->
+    
+    <!--Change spawnoint-->
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=spawnpoint1 />
+                </targets>
+                <events>
+                    <activity>
+                <EventTrigger invert=true>
+            <events>
+              <trigger>
+                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
+              </trigger>
+            </events>
+          </EventTrigger>
+                    </activity>
+                </events>
+    
+            </EventDispatcher>
+            <EventDispatcher>
+                <targets>
+                    <EventTarget target=spawnpoint2/>
+                </targets>
+                <events>
+                    <activity>
+                             <QuestListener questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" mode="complete" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+    <!--Change spawnoint end-->
+    
+    <!-- pirates -->
+        <?lua
+        for i = 1,1, 1
+        do
+        ?>
+            <SpaceShip position="<?lua print(math.random()*100)?>,<?lua print(math.random()*100)?>,<?lua print(math.random()*100-2000)?>">
+              <templates>
+            <Template link=spaceshippirate />
+              </templates>
+              <controller>
+            <WaypointPatrolController alertnessradius=1000 active=true team=1>
+              <waypoints>
+                <StaticEntity position="0,<?lua print(math.random()*50)?> ,<?lua print(i*50 -2000) ?>" />
+              </waypoints>
+            </WaypointPatrolController>
+              </controller>
+            </SpaceShip>
+        <?lua
+        end
+        ?>
+    
+        <?lua
+        for i = 1,2, 1
+        do
+        ?>
+            <SpaceShip position="600,300,-6000">
+              <templates>
+            <Template link=spaceshippirate />
+              </templates>
+              <controller>
+            <WaypointPatrolController alertnessradius=1000 active=true team=1>
+              <waypoints>
+                <StaticEntity position="600,300,-6000" />
+              </waypoints>
+            </WaypointPatrolController>
+              </controller>
+            </SpaceShip>
+        <?lua
+        end
+        ?>
+    
+    <!-- Pirates at the end of wrong Navi line (get visible when you get near them)-->
+     <SpaceShip position="1600,2300,-10000" active=true visible=true name=navipirate1>
+              <templates>
+            <Template link=spaceshippirate />
+              </templates>
+              <controller>
+            <WaypointPatrolController alertnessradius=1000 name=navipirate1 active=true team=1>
+              <waypoints>
+                <StaticEntity position="1600,2300,-10000" />
+              </waypoints>
+            </WaypointPatrolController>
+              </controller>
+            </SpaceShip>
+    
+    <SpaceShip position="7600,300,-8000" active=true visible=true name=navipirate2>
+              <templates>
+            <Template link=spaceshippirate />
+              </templates>
+              <controller>
+            <WaypointPatrolController alertnessradius=1000 name=navipirate2 active=true team=1>
+              <waypoints>
+                <StaticEntity position="7600,300,-8000" />
+              </waypoints>
+            </WaypointPatrolController>
+              </controller>
+        </SpaceShip>
+    
+    
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=navipirate1 />
+                </targets>
+                <events>
+                    <visibility>
+                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
+                    </visibility>
+                    <activity>
+                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaab" mode="start" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+    
+    <EventDispatcher>
+                <targets>
+                    <EventTarget target=navipirate2 />
+                </targets>
+                <events>
+                    <visibility>
+                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
+                    </visibility>
+                    <activity>
+                        <QuestListener questId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" mode="start" />
+                    </activity>
+                </events>
+            </EventDispatcher>
+    <!-- Pirates at the end of wrong Navi line **** end-->
+    
+    <!--Security man from mining corp.-->
+    <SpaceShip position="4000,4000,-20000">
+              <templates>
+            <Template link=spaceshipassff/>
+              </templates>
+              <controller>
+            <WaypointPatrolController alertnessradius=1000 team=0 active=false>
+              <waypoints>
+                <StaticEntity position="4000,4000,-20000" />
+              </waypoints>
+            </WaypointPatrolController>
+              </controller>
+    </SpaceShip>
+    
+    <!-- Asteroid field-->
+            <StaticEntity position="-400,2000,-7000">
+                <attached>
+                    <?lua
+                        for i = 1, 180
+                        do ?>
+                        <MovableEntity position="<?lua print(math.random() * 10000 -5000)?>, <?lua print(math.random() * 10000-5000) ?>, <?lua print(math.random() * 10000 -7000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
+                            <attached>
+                                <Model scale="<?lua print(math.random() * 100) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+                            </attached>
+                        </MovableEntity>
+                    <?lua
+                        end
+                    ?>
+            </attached>
+        </StaticEntity>
+    <!--Planet with asteroid belt-->
+    <Planet mesh="iceplanet.mesh" position="2600,4300,-20000" scale=1000 atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f/>
+    <StaticEntity position="2600,4300,-20000" collisionType=static>
+          <collisionShapes>
+            <SphereCollisionShape radius="1000" />
+          </collisionShapes>
+                          <attached>
+                <?lua
+                for i = 1, 100
+                do
+                k=(math.random() * 2600 -1300)
+                if math.random()<0.5 then
+                l=(1300^2-k^2)^(0.5)
+                else
+                l=-(1300^2-k^2)^(0.5)
+                end
+                ?>
+    
+                <MovableEntity position="<?lua print(k) ?>,<?lua print(l) ?>, <?lua print(math.random() * 100) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
+
+                    <attached>
+                    <Model scale="<?lua print(math.random() * 25) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+                    </attached>
+                </MovableEntity>
+                <?lua
+                end
+                ?>
+                            </attached>
+        </StaticEntity>
+    
+    </Scene>
+</Level>
Index: code/trunk/data/levels/presentation.oxw
===================================================================
--- code/trunk/data/levels/presentation.oxw	(revision 7677)
+++ code/trunk/data/levels/presentation.oxw	(revision 7679)
@@ -6,8 +6,8 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/presentation09.oxw
===================================================================
--- code/trunk/data/levels/presentation09.oxw	(revision 7677)
+++ code/trunk/data/levels/presentation09.oxw	(revision 7679)
@@ -6,9 +6,9 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/presentation09b.oxw
===================================================================
--- code/trunk/data/levels/presentation09b.oxw	(revision 7677)
+++ code/trunk/data/levels/presentation09b.oxw	(revision 7679)
@@ -6,11 +6,11 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/presentationDM.oxw
===================================================================
--- code/trunk/data/levels/presentationDM.oxw	(revision 7679)
+++ code/trunk/data/levels/presentationDM.oxw	(revision 7679)
@@ -0,0 +1,98 @@
+<LevelInfo
+ name = "Presentation DM"
+ description = "Presentation Level"
+ tags = "presentation"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Presentation"
+ description  = "A simple testlevel"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    <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" />
+
+
+    <?lua
+      for i = 1, 10, 1 do
+    ?>
+      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <?lua end ?>
+
+    <GlobalShader compositor="Bloom" visible=false>
+      <events>
+        <visibility>
+          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
+        </visibility>
+      </events>
+    </GlobalShader>
+
+    <?lua
+      for i = 1, 100, 1 do
+        j = math.random()
+    ?>
+      <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+        </attached>
+        <collisionShapes>
+          <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+        </collisionShapes>
+      </MovableEntity>
+    <?lua end ?>
+
+<!--
+    <?lua
+      for i = 1, 70, 1 do
+    ?>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+
+      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+    <?lua end ?>
+-->
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/presentationFS10.oxw
===================================================================
--- code/trunk/data/levels/presentationFS10.oxw	(revision 7677)
+++ code/trunk/data/levels/presentationFS10.oxw	(revision 7679)
@@ -7,13 +7,13 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
 ?>
 
 <?lua
-  include("templates/lodinformation.oxt")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_swallow.oxt")
-  include("templates/pickup_representation_templates.oxt")
+  include("templates/lodInformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipSwallow.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
 ?>
 
Index: code/trunk/data/levels/presentationFS102.oxw
===================================================================
--- code/trunk/data/levels/presentationFS102.oxw	(revision 7679)
+++ code/trunk/data/levels/presentationFS102.oxw	(revision 7679)
@@ -0,0 +1,107 @@
+<LevelInfo
+ name = "Presentation XI FPS"
+ description = "2nd Presentation level for Orxonox Convention XI, FPS"
+ tags = "presentation"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "fps"
+ description  = "tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.1, 0.1, 0.1"
+   skybox       = "Orxonox/skypanoramagen1"
+   gravity      = "0,-1000,0"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
+   hasPhysics   = true
+  >
+    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="fish.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+  
+  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+  
+  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+
+   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+  
+   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+
+<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+  
+  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+  
+<?lua
+for i = 1, 10, 1
+do ?>
+    <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
+<?lua
+end
+?>
+
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/presentationFS10Ed.oxw
===================================================================
--- code/trunk/data/levels/presentationFS10Ed.oxw	(revision 7679)
+++ code/trunk/data/levels/presentationFS10Ed.oxw	(revision 7679)
@@ -0,0 +1,181 @@
+<LevelInfo
+ name = "Presentation XI FPS"
+ description = "3rd Presentation level for Orxonox Convention XI, FPS"
+ tags = "presentation"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/FPS.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "fps"
+ description  = "tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.1, 0.1, 0.1"
+   skybox       = "Orxonox/skypanoramagen1"
+   gravity      = "0,-1000,0"
+   negativeWorldRange = "-100000, -100000, -100000"
+   positiveWorldRange = " 100000,  100000,  100000"
+   hasPhysics   = true
+  >
+    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+
+  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+ 
+  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+ 
+  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+
+   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+ 
+   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+
+<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+ 
+  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
+      </collisionShapes>
+  </StaticEntity>
+ 
+ 
+   <StaticEntity position="6000,0,10250" direction="0,0,0" collisionType=static mass=100000 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="10000,10,10000" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="10000,10,10000" />
+      </collisionShapes>
+  </StaticEntity>
+  
+  <Pawn health=100 position="530,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
+      </collisionShapes>
+  </Pawn>
+  
+  <Pawn health=100 position="670,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
+      </collisionShapes>
+  </Pawn>
+  
+   <Pawn health=100 position="600,70,1500" direction="0,0,-1" collisionType=dynamic mass=1 >
+      <attached>
+        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
+      </collisionShapes>
+  </Pawn>
+  
+   <Pawn health=100 position="600,150,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
+      <attached>
+        <Model position="0,0,0" mesh="cube.mesh" scale3D="90,80,10" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="90,80,10" />
+      </collisionShapes>
+  </Pawn>
+  
+  <Pawn health=100 position="600,35,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
+      <attached>
+        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
+      </collisionShapes>
+  </Pawn>
+ 
+
+  <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
+
+
+<?lua
+for i = 1, 100, 1
+do
+j = math.random()
+g = math.random()
+h = math.random()
+?>
+  <Pawn position="<?lua print( (math.random()+10) * 1000 - 9800) ?>,<?lua print(math.random()) ?>,<?lua print( (math.random()+10) * 2000 - 19500) ?>" direction="<?lua print( (math.random()+10) * 10 - 100) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100)?> >
+      <attached>
+        <Model position="0,0,0" scale3D="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" mesh="cube<?lua
+	if math.mod(i,4)==0 then print('_green') end
+	if math.mod(i,4)==1 then print('_red') end
+	if math.mod(i,4)==2 then print('_orange') end
+	?>.mesh" /> <!--if it's 3, cube.mesh is taken -> yellow -->
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="0,0,0" halfExtents="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" />
+      </collisionShapes>
+  </Pawn>
+<?lua
+end
+?>
+
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/presentationHS09.oxw
===================================================================
--- code/trunk/data/levels/presentationHS09.oxw	(revision 7677)
+++ code/trunk/data/levels/presentationHS09.oxw	(revision 7679)
@@ -6,11 +6,11 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/pickup_representation_templates.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/pickupRepresentationTemplates.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/presentationHS09b.oxw
===================================================================
--- code/trunk/data/levels/presentationHS09b.oxw	(revision 7677)
+++ code/trunk/data/levels/presentationHS09b.oxw	(revision 7679)
@@ -7,16 +7,16 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_ghost.oxt")
-  include("templates/spaceship_HXY.oxt")
-  include("templates/spaceship_Transporter.oxt")
-  include("templates/spaceship_HXY_SL.oxt")
-  include("templates/spaceship_Transporter_SL.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipGhost.oxt")
+  include("templates/spaceshipHXY.oxt")
+  include("templates/spaceshipTransporter.oxt")
+  include("templates/spaceshipHXYSL.oxt")
+  include("templates/spaceshipTransporterSL.oxt")
 ?>
 
Index: code/trunk/data/levels/presentation_FS10.oxw
===================================================================
--- code/trunk/data/levels/presentation_FS10.oxw	(revision 7677)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<LevelInfo
- name = "Presentation XI FPS"
- description = "2nd Presentation level for Orxonox Convention XI, FPS"
- tags = "presentation"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "fps"
- description  = "tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="fish.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-  
-  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
-  
-  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-  
-<?lua
-for i = 1, 10, 1
-do ?>
-    <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
-<?lua
-end
-?>
-
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/presentation_FS10_ed.oxw
===================================================================
--- code/trunk/data/levels/presentation_FS10_ed.oxw	(revision 7677)
+++ 	(revision )
@@ -1,181 +1,0 @@
-<LevelInfo
- name = "Presentation XI FPS"
- description = "3rd Presentation level for Orxonox Convention XI, FPS"
- tags = "presentation"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/fps.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "fps"
- description  = "tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.1, 0.1, 0.1"
-   skybox       = "Orxonox/skypanoramagen1"
-   gravity      = "0,-1000,0"
-   negativeWorldRange = "-100000, -100000, -100000"
-   positiveWorldRange = " 100000,  100000,  100000"
-   hasPhysics   = true
-  >
-    <Light type=directional position="0,-100000,0" direction="0.02, -1, 0.05" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
-
-  <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
- 
-  <Pawn health=100 position="0,-35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
- 
-  <StaticEntity position="0,-50,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-   <StaticEntity position="210,-30,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_orange.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
- 
-   <StaticEntity position="600,-20,0" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
-
-<StaticEntity position="600,10,120" direction="0,-1,1" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
- 
-  <StaticEntity position="600,40,250" direction="0,-1,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="100,100,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="100,100,10" />
-      </collisionShapes>
-  </StaticEntity>
- 
- 
-   <StaticEntity position="6000,0,10250" direction="0,0,0" collisionType=static mass=100000 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_green.mesh" scale3D="10000,10,10000" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="10000,10,10000" />
-      </collisionShapes>
-  </StaticEntity>
-  
-  <Pawn health=100 position="530,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-  
-  <Pawn health=100 position="670,70,1450" direction="-1,0,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-  
-   <Pawn health=100 position="600,70,1500" direction="0,0,-1" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube_red.mesh" scale3D="60,60,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="60,60,10" />
-      </collisionShapes>
-  </Pawn>
-  
-   <Pawn health=100 position="600,150,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="cube.mesh" scale3D="90,80,10" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="90,80,10" />
-      </collisionShapes>
-  </Pawn>
-  
-  <Pawn health=100 position="600,35,1450" direction="0,-1,0" collisionType=dynamic mass=1 >
-      <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="25,25,25" />
-      </collisionShapes>
-  </Pawn>
- 
-
-  <SpawnPoint position="0,300,0" direction="0, 0, 0" lookat="0,0,100000000" spawnclass=FpsPlayer pawndesign=fps />
-
-
-<?lua
-for i = 1, 100, 1
-do
-j = math.random()
-g = math.random()
-h = math.random()
-?>
-  <Pawn position="<?lua print( (math.random()+10) * 1000 - 9800) ?>,<?lua print(math.random()) ?>,<?lua print( (math.random()+10) * 2000 - 19500) ?>" direction="<?lua print( (math.random()+10) * 10 - 100) ?>,<?lua print(math.random()) ?>,<?lua print(math.random()) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100)?> >
-      <attached>
-        <Model position="0,0,0" scale3D="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" mesh="cube<?lua
-	if math.mod(i,4)==0 then print('_green') end
-	if math.mod(i,4)==1 then print('_red') end
-	if math.mod(i,4)==2 then print('_orange') end
-	?>.mesh" /> <!--if it's 3, cube.mesh is taken -> yellow -->
-      </attached>
-      <collisionShapes>
-        <BoxCollisionShape position="0,0,0" halfExtents="<?lua print(j*100) ?>,<?lua print(g*100) ?>,<?lua print(h*100) ?>" />
-      </collisionShapes>
-  </Pawn>
-<?lua
-end
-?>
-
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/presentation_dm.oxw
===================================================================
--- code/trunk/data/levels/presentation_dm.oxw	(revision 7677)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<LevelInfo
- name = "Presentation DM"
- description = "Presentation Level"
- tags = "presentation"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Presentation"
- description  = "A simple testlevel"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-
-
-    <?lua
-      for i = 1, 10, 1 do
-    ?>
-      <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <?lua end ?>
-
-    <GlobalShader compositor="Bloom" visible=false>
-      <events>
-        <visibility>
-          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
-        </visibility>
-      </events>
-    </GlobalShader>
-
-    <?lua
-      for i = 1, 100, 1 do
-        j = math.random()
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-        </attached>
-        <collisionShapes>
-          <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-        </collisionShapes>
-      </MovableEntity>
-    <?lua end ?>
-
-<!--
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 30 + 10) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
--->
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/presentation_pong.oxw
===================================================================
--- code/trunk/data/levels/presentation_pong.oxw	(revision 7677)
+++ code/trunk/data/levels/presentation_pong.oxw	(revision 7679)
@@ -1,7 +1,7 @@
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("ponghud.oxo")
-  include("templates/lodinformation.oxt")
+  include("pongHUD.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/princessAeryn.oxw
===================================================================
--- code/trunk/data/levels/princessAeryn.oxw	(revision 7679)
+++ code/trunk/data/levels/princessAeryn.oxw	(revision 7679)
@@ -0,0 +1,278 @@
+<LevelInfo
+ name = "The Tale of Princess Aeryn"
+ description = "The Tale of the elusive but beautiful Princess Aeryn"
+ tags = ""
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  dofile("includes/CuboidSpaceStation.lua")
+?>
+
+<Level
+ name     = "The Tale of Princess Aeryn"
+ description  = "The Tale of Princess Aeryn"
+>
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.3, 0.3, 0.3"
+    skybox     = "Orxonox/skypanoramagen1"
+  >
+
+    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
+
+    <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" />
+
+    <!-- Quest: -->
+    <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
+      <QuestDescription title="The Tale of Princess Aeryn" description="Princess Aeryn has been kidnapped by evil Mr. M and you were just a little too late to save her.\nYou have to find and save her from her captors." failMessage="You cannot fail, how did you?" completeMessage="You did it John. You're a hero. Princess Aeryn however will still not marry you." />
+      <subquests>
+        <GlobalQuest id="43766602-7e2f-4d24-976a-3f9de1474d5b">
+          <QuestDescription title="Find Aeryn's S.H.O.E.S." description="Oh, the kidnappers must have been in a hurry because they overlooked princess Aeryns S.H.O.E.S. (Super Heavily Organized Escape Ship) hidden in the asteroid field over there.\nFind it and look there for clues to Princess Aeryns whereabouts." completeMessage="You did it, Looking through her stuff you find an odd looking device - Could this be the receiver of Princess Aeryns locator beacon? - But it must be broken, the screen remains blank." />
+          <complete-effects>
+            <AddQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
+          </complete-effects>
+        </GlobalQuest>
+        <GlobalQuest id="50845552-c8af-4091-947c-76bd850b224e">
+          <QuestDescription title="Repair the receiver." description="There is a space station called 'Serenity Station' near here. An engineer called Nathan Stark who shoud be able to help you lives there." completeMessage="'Yeah Nathan lives here, he'll shurely help you.'\nAnd he does, apparenty the device was just low on batteries so you're now able to locate your beloved Princess Aeryn." />
+          <hints>
+            <QuestHint id="b9b10841-b045-4797-b1d3-cfce760e1de6">
+              <QuestDescription title="The Katratzi Station" description="'We ain't buying!'\n'What do you want?'\n'No there lives no Nathan here.'\n'Fuck off.''" />
+            </QuestHint>
+            <QuestHint id="1ee785f8-b71d-4b51-b080-42cec5be8e3c">
+              <QuestDescription title="The Pegasus Station" description="'Hello friend.'\n'How can we help you?'\n'A Mr. Stark you say? Sorry no man with such a name lives here.'" />
+            </QuestHint>
+          </hints>
+          <complete-effects>
+            <AddQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
+          </complete-effects>
+        </GlobalQuest>
+        <GlobalQuest id="97628524-b243-492c-b7b6-498f325b21d4">
+          <QuestDescription title="Follow the dots" description="Just follow the dots, they'll lead you right to her." completeMessage="You found Princess Aeryn. Her captors give up at the shere sight ou you." />
+          <complete-effects>
+            <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+          </complete-effects>
+        </GlobalQuest>
+      </subquests>
+    </GlobalQuest>
+
+    <!-- Create spaceship spawner: -->
+    <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
+      <events>
+      <spawn>
+        <EventTrigger delay=1>
+        <events>
+          <trigger>
+          <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+          </trigger>
+        </events>
+        </EventTrigger>
+      </spawn>
+      </events>
+      <attached>
+      <QuestEffectBeacon position="0,0,0" times=1>
+        <effects>
+          <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+          <AddQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
+        </effects>
+        <events>
+          <execute>
+            <EventListener event=questbeacon1 />
+          </execute>
+        </events>
+        <attached>
+          <DistanceTrigger name=questbeacon1 position="0,0,0" distance=10 target="Pawn" />
+        </attached>
+      </QuestEffectBeacon>
+      </attached>
+    </ParticleSpawner>
+
+    <!-- Create world -->
+
+      <!-- Kidnapper flying away -->
+      <MovableEntity position="200,0,0" velocity="-140,0,-140" yaw=45>
+        <attached>
+          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" />
+          <ParticleSpawner position="0,0,10" source="Orxonox/fire3" lifetime=2.0 loop=0 autostart=1 />
+          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
+            <effects>
+              <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
+            </effects>
+            <events>
+              <execute>
+                <EventListener event=questbeacon7 />
+              </execute>
+            </events>
+            <attached>
+              <DistanceTrigger name=questbeacon7 position="0,0,0" distance=10 target="Pawn" />
+            </attached>
+          </QuestEffectBeacon>
+        </attached>
+      </MovableEntity>
+
+      <!-- Asteroid field -->
+      <StaticEntity position="-500,0,-3000">
+        <attached>
+          <?lua
+            for i = 1, 200 do
+          ?>
+            <MovableEntity position="<?lua print(math.random() * 2000 - 1000)?>, <?lua print(math.random() * 2000 - 1000) ?>, <?lua print(math.random() * 2000 - 1000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
+              <attached>
+                <Model scale="<?lua print(math.random() * 50) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+              </attached>
+            </MovableEntity>
+          <?lua end ?>
+          <!-- S.H.O.E.S -->
+          <StaticEntity position="-300,0,0">
+            <attached>
+              <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="assff.mesh" />
+              <QuestEffectBeacon position="0,0,0" times=-1>
+                <effects>
+                  <CompleteQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
+                </effects>
+                <events>
+                  <execute>
+                    <EventListener event=questbeacon2 />
+                  </execute>
+                </events>
+                <attached>
+                  <DistanceTrigger name=questbeacon2 position="0,0,0" distance=50 target="Pawn" />
+                </attached>
+              </QuestEffectBeacon>
+            </attached>
+          </StaticEntity>
+        </attached>
+      </StaticEntity>
+
+
+
+      <!-- Spacestations -->
+
+      <!-- Serenity Station -->
+      <StaticEntity scale=1 position="0,0,5000" yaw=30>
+        <attached>
+          <?lua
+            createSpaceStationPar(65461,2,1,2,1,2,1,100)
+          ?>
+          <QuestEffectBeacon position="0,450,0" times=1>
+            <effects>
+              <CompleteQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
+            </effects>
+            <events>
+              <execute>
+                <EventListener event=questbeacon3 />
+              </execute>
+            </events>
+            <attached>
+              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+              <DistanceTrigger name=questbeacon3 position="0,0,0" distance=100 target="Pawn" />
+            </attached>
+          </QuestEffectBeacon>
+        </attached>
+      </StaticEntity>
+
+      <!-- Katratzi Station -->
+      <StaticEntity scale=1 position="0,5000,300" yaw=60>
+        <attached>
+          <?lua
+            createSpaceStationPar(9851,2,1,2,1,2,1,100)
+          ?>
+          <QuestEffectBeacon position="0,450,0" times=1>
+            <effects>
+              <AddQuestHint hintId="b9b10841-b045-4797-b1d3-cfce760e1de6" />
+            </effects>
+            <events>
+              <execute>
+                <EventListener event=questbeacon4 />
+              </execute>
+            </events>
+            <attached>
+              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+              <DistanceTrigger name=questbeacon4 position="0,0,0" distance=100 target="Pawn" />
+            </attached>
+          </QuestEffectBeacon>
+        </attached>
+      </StaticEntity>
+
+      <!-- Pegasus Station -->
+      <StaticEntity scale=1 position="-5000,100,1000" roll=30>
+        <attached>
+          <?lua
+            createSpaceStationPar(3574,2,1,2,1,2,1,100)
+          ?>
+          <QuestEffectBeacon position="200,450,0" times=1>
+            <effects>
+              <AddQuestHint hintId="1ee785f8-b71d-4b51-b080-42cec5be8e3c" />
+            </effects>
+            <events>
+              <execute>
+                <EventListener event=questbeacon5 />
+              </execute>
+            </events>
+            <attached>
+              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
+              <DistanceTrigger name=questbeacon5 position="0,0,0" distance=100 target="Pawn" />
+            </attached>
+          </QuestEffectBeacon>
+        </attached>
+      </StaticEntity>
+
+      <!-- Trail -->
+      <EventDispatcher>
+        <targets>
+          <EventTarget target=trail />
+        </targets>
+        <events>
+          <visibility>
+            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
+          </visibility>
+          <activity>
+            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
+          </activity>
+        </events>
+      </EventDispatcher>
+
+      <?lua
+        for i = 1, 25 do
+      ?>
+        <Billboard position="<?lua print(i*5000/25) ?>,<?lua print(450+i*(5000-450)/25) ?>,5000" colour="1.0,0,0" material="Examples/Flare" name=trail visible=false/>
+      <?lua end ?>
+
+      <!-- Hideout -->
+      <StaticEntity position="5000,5000,5000" >
+        <attached>
+          <Model scale="100" mesh="ast2.mesh" shadow=false />
+        </attached>
+      </StaticEntity>
+
+      <StaticEntity position="5400,5400,5000" visible=false name=trail >
+        <attached>
+          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" visible=false name=trail />
+          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
+            <effects>
+              <CompleteQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
+            </effects>
+            <events>
+              <execute>
+                <EventListener event=questbeacon6 />
+              </execute>
+            </events>
+            <attached>
+              <DistanceTrigger name=questbeacon6 position="0,0,0" distance=100 target="Pawn" />
+            </attached>
+          </QuestEffectBeacon>
+        </attached>
+      </StaticEntity>
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/princessaeryn.oxw
===================================================================
--- code/trunk/data/levels/princessaeryn.oxw	(revision 7677)
+++ 	(revision )
@@ -1,278 +1,0 @@
-<LevelInfo
- name = "The Tale of Princess Aeryn"
- description = "The Tale of the elusive but beautiful Princess Aeryn"
- tags = ""
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<?lua
-  dofile("includes/CuboidSpaceStation.lua")
-?>
-
-<Level
- name     = "The Tale of Princess Aeryn"
- description  = "The Tale of Princess Aeryn"
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-    ambientlight = "0.3, 0.3, 0.3"
-    skybox     = "Orxonox/skypanoramagen1"
-  >
-
-    <Script code="showGUI NotificationLayer false true" needsGraphics="true" />
-
-    <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" />
-
-    <!-- Quest: -->
-    <GlobalQuest id="b80c2c60-e62c-4637-80f8-5aa18dc93b34">
-      <QuestDescription title="The Tale of Princess Aeryn" description="Princess Aeryn has been kidnapped by evil Mr. M and you were just a little too late to save her.\nYou have to find and save her from her captors." failMessage="You cannot fail, how did you?" completeMessage="You did it John. You're a hero. Princess Aeryn however will still not marry you." />
-      <subquests>
-        <GlobalQuest id="43766602-7e2f-4d24-976a-3f9de1474d5b">
-          <QuestDescription title="Find Aeryn's S.H.O.E.S." description="Oh, the kidnappers must have been in a hurry because they overlooked princess Aeryns S.H.O.E.S. (Super Heavily Organized Escape Ship) hidden in the asteroid field over there.\nFind it and look there for clues to Princess Aeryns whereabouts." completeMessage="You did it, Looking through her stuff you find an odd looking device - Could this be the receiver of Princess Aeryns locator beacon? - But it must be broken, the screen remains blank." />
-          <complete-effects>
-            <AddQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-          </complete-effects>
-        </GlobalQuest>
-        <GlobalQuest id="50845552-c8af-4091-947c-76bd850b224e">
-          <QuestDescription title="Repair the receiver." description="There is a space station called 'Serenity Station' near here. An engineer called Nathan Stark who shoud be able to help you lives there." completeMessage="'Yeah Nathan lives here, he'll shurely help you.'\nAnd he does, apparenty the device was just low on batteries so you're now able to locate your beloved Princess Aeryn." />
-          <hints>
-            <QuestHint id="b9b10841-b045-4797-b1d3-cfce760e1de6">
-              <QuestDescription title="The Katratzi Station" description="'We ain't buying!'\n'What do you want?'\n'No there lives no Nathan here.'\n'Fuck off.''" />
-            </QuestHint>
-            <QuestHint id="1ee785f8-b71d-4b51-b080-42cec5be8e3c">
-              <QuestDescription title="The Pegasus Station" description="'Hello friend.'\n'How can we help you?'\n'A Mr. Stark you say? Sorry no man with such a name lives here.'" />
-            </QuestHint>
-          </hints>
-          <complete-effects>
-            <AddQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-          </complete-effects>
-        </GlobalQuest>
-        <GlobalQuest id="97628524-b243-492c-b7b6-498f325b21d4">
-          <QuestDescription title="Follow the dots" description="Just follow the dots, they'll lead you right to her." completeMessage="You found Princess Aeryn. Her captors give up at the shere sight ou you." />
-          <complete-effects>
-            <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-          </complete-effects>
-        </GlobalQuest>
-      </subquests>
-    </GlobalQuest>
-
-    <!-- Create spaceship spawner: -->
-    <ParticleSpawner position="0,0,100" source="Orxonox/BigExplosion1part3" lifetime=2.0 loop=0 autostart=0>
-      <events>
-      <spawn>
-        <EventTrigger delay=1>
-        <events>
-          <trigger>
-          <SpawnPoint position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-          </trigger>
-        </events>
-        </EventTrigger>
-      </spawn>
-      </events>
-      <attached>
-      <QuestEffectBeacon position="0,0,0" times=1>
-        <effects>
-          <AddQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-          <AddQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-        </effects>
-        <events>
-          <execute>
-            <EventListener event=questbeacon1 />
-          </execute>
-        </events>
-        <attached>
-          <DistanceTrigger name=questbeacon1 position="0,0,0" distance=10 target="Pawn" />
-        </attached>
-      </QuestEffectBeacon>
-      </attached>
-    </ParticleSpawner>
-
-    <!-- Create world -->
-
-      <!-- Kidnapper flying away -->
-      <MovableEntity position="200,0,0" velocity="-140,0,-140" yaw=45>
-        <attached>
-          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" />
-          <ParticleSpawner position="0,0,10" source="Orxonox/fire3" lifetime=2.0 loop=0 autostart=1 />
-          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-            <effects>
-              <CompleteQuest questId="b80c2c60-e62c-4637-80f8-5aa18dc93b34" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon7 />
-              </execute>
-            </events>
-            <attached>
-              <DistanceTrigger name=questbeacon7 position="0,0,0" distance=10 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </MovableEntity>
-
-      <!-- Asteroid field -->
-      <StaticEntity position="-500,0,-3000">
-        <attached>
-          <?lua
-            for i = 1, 200 do
-          ?>
-            <MovableEntity position="<?lua print(math.random() * 2000 - 1000)?>, <?lua print(math.random() * 2000 - 1000) ?>, <?lua print(math.random() * 2000 - 1000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.abs(math.random() * 30 -10)) ?>">
-              <attached>
-                <Model scale="<?lua print(math.random() * 50) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-              </attached>
-            </MovableEntity>
-          <?lua end ?>
-          <!-- S.H.O.E.S -->
-          <StaticEntity position="-300,0,0">
-            <attached>
-              <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="assff.mesh" />
-              <QuestEffectBeacon position="0,0,0" times=-1>
-                <effects>
-                  <CompleteQuest questId="43766602-7e2f-4d24-976a-3f9de1474d5b" />
-                </effects>
-                <events>
-                  <execute>
-                    <EventListener event=questbeacon2 />
-                  </execute>
-                </events>
-                <attached>
-                  <DistanceTrigger name=questbeacon2 position="0,0,0" distance=50 target="Pawn" />
-                </attached>
-              </QuestEffectBeacon>
-            </attached>
-          </StaticEntity>
-        </attached>
-      </StaticEntity>
-
-
-
-      <!-- Spacestations -->
-
-      <!-- Serenity Station -->
-      <StaticEntity scale=1 position="0,0,5000" yaw=30>
-        <attached>
-          <?lua
-            createSpaceStationPar(65461,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="0,450,0" times=1>
-            <effects>
-              <CompleteQuest questId="50845552-c8af-4091-947c-76bd850b224e" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon3 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon3 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Katratzi Station -->
-      <StaticEntity scale=1 position="0,5000,300" yaw=60>
-        <attached>
-          <?lua
-            createSpaceStationPar(9851,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="0,450,0" times=1>
-            <effects>
-              <AddQuestHint hintId="b9b10841-b045-4797-b1d3-cfce760e1de6" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon4 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon4 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Pegasus Station -->
-      <StaticEntity scale=1 position="-5000,100,1000" roll=30>
-        <attached>
-          <?lua
-            createSpaceStationPar(3574,2,1,2,1,2,1,100)
-          ?>
-          <QuestEffectBeacon position="200,450,0" times=1>
-            <effects>
-              <AddQuestHint hintId="1ee785f8-b71d-4b51-b080-42cec5be8e3c" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon5 />
-              </execute>
-            </events>
-            <attached>
-              <Billboard position="0,0,0" colour="1.0,1.0,0" material="Examples/Flare" />
-              <DistanceTrigger name=questbeacon5 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-      <!-- Trail -->
-      <EventDispatcher>
-        <targets>
-          <EventTarget target=trail />
-        </targets>
-        <events>
-          <visibility>
-            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-          </visibility>
-          <activity>
-            <QuestListener questId="50845552-c8af-4091-947c-76bd850b224e" mode="complete" />
-          </activity>
-        </events>
-      </EventDispatcher>
-
-      <?lua
-        for i = 1, 25 do
-      ?>
-        <Billboard position="<?lua print(i*5000/25) ?>,<?lua print(450+i*(5000-450)/25) ?>,5000" colour="1.0,0,0" material="Examples/Flare" name=trail visible=false/>
-      <?lua end ?>
-
-      <!-- Hideout -->
-      <StaticEntity position="5000,5000,5000" >
-        <attached>
-          <Model scale="100" mesh="ast2.mesh" shadow=false />
-        </attached>
-      </StaticEntity>
-
-      <StaticEntity position="5400,5400,5000" visible=false name=trail >
-        <attached>
-          <Model position="0,0,0" scale=4 yaw=180 pitch=-90 roll=-90 mesh="pirate.mesh" visible=false name=trail />
-          <QuestEffectBeacon position="0,0,0" times=1 active=false name=trail >
-            <effects>
-              <CompleteQuest questId="97628524-b243-492c-b7b6-498f325b21d4" />
-            </effects>
-            <events>
-              <execute>
-                <EventListener event=questbeacon6 />
-              </execute>
-            </events>
-            <attached>
-              <DistanceTrigger name=questbeacon6 position="0,0,0" distance=100 target="Pawn" />
-            </attached>
-          </QuestEffectBeacon>
-        </attached>
-      </StaticEntity>
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/screenshot.oxw
===================================================================
--- code/trunk/data/levels/screenshot.oxw	(revision 7677)
+++ code/trunk/data/levels/screenshot.oxw	(revision 7679)
@@ -6,10 +6,10 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/sound.oxw
===================================================================
--- code/trunk/data/levels/sound.oxw	(revision 7677)
+++ code/trunk/data/levels/sound.oxw	(revision 7679)
@@ -7,11 +7,11 @@
 <?lua
   include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
 ?>
 
 <?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
 ?>
 
Index: code/trunk/data/levels/teamBaseMatch.oxw
===================================================================
--- code/trunk/data/levels/teamBaseMatch.oxw	(revision 7679)
+++ code/trunk/data/levels/teamBaseMatch.oxw	(revision 7679)
@@ -0,0 +1,246 @@
+<LevelInfo
+ name = "Teambase Match"
+ description = "Fight for the bases."
+ tags = ""
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("teamBaseMatchHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Presentation"
+ description  = "A simple testlevel"
+ gametype     = TeamBaseMatch
+>
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    <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" />
+
+    <TeamSpawnPoint team=0 position=" 900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=1 position="-900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+
+    <TeamBaseMatchBase
+     name              = "base 1"
+     position          = "1200, 0, 0"
+     pitch = -90
+
+     health            = 1000
+     maxhealth         = 1000
+     initialhealth     = 1000
+
+     collisionType     = "dynamic"
+     mass              = 10000
+     linearDamping     = 0.9
+     angularDamping    = 0.99999
+    >
+      <attached>
+        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
+        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
+
+        <?lua
+          for i = 1, 10, 1 do
+        ?>
+          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+            <events>
+              <spawn>
+                <EventListener event="base 1" />
+              </spawn>
+            </events>
+          </ParticleSpawner>
+        <?lua end ?>
+        
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="80"            position = "-100,0,0" />
+        <SphereCollisionShape radius="120"           position = "100,0,0" />
+        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
+      </collisionShapes>
+    </TeamBaseMatchBase>
+
+
+    <TeamBaseMatchBase
+     name              = "base 2"
+     position          = "-1200, 0, 0"
+     pitch = -90
+
+     health            = 1000
+     maxhealth         = 1000
+     initialhealth     = 1000
+
+     collisionType     = "dynamic"
+     mass              = 10000
+     linearDamping     = 0.9
+     angularDamping    = 0.99999
+    >
+      <attached>
+        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
+        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
+
+        <?lua
+          for i = 1, 10, 1 do
+        ?>
+          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+            <events>
+              <spawn>
+                <EventListener event="base 2" />
+              </spawn>
+            </events>
+          </ParticleSpawner>
+        <?lua end ?>
+        
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="80"            position = "-100,0,0" />
+        <SphereCollisionShape radius="120"           position = "100,0,0" />
+        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
+      </collisionShapes>
+    </TeamBaseMatchBase>
+
+
+    <TeamBaseMatchBase
+     name              = "base 3"
+     position          = "0, 0, 1200"
+     pitch = -90
+
+     health            = 1000
+     maxhealth         = 1000
+     initialhealth     = 1000
+
+     collisionType     = "dynamic"
+     mass              = 10000
+     linearDamping     = 0.9
+     angularDamping    = 0.99999
+    >
+      <attached>
+        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
+        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
+
+        <?lua
+          for i = 1, 10, 1 do
+        ?>
+          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+            <events>
+              <spawn>
+                <EventListener event="base 3" />
+              </spawn>
+            </events>
+          </ParticleSpawner>
+        <?lua end ?>
+
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="80"            position = "-100,0,0" />
+        <SphereCollisionShape radius="120"           position = "100,0,0" />
+        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
+      </collisionShapes>
+    </TeamBaseMatchBase>
+
+    <TeamBaseMatchBase
+     name              = "base 4"
+     position          = "0, 0, -1200"
+
+     health            = 1000
+     maxhealth         = 1000
+     initialhealth     = 1000
+     pitch = -90
+
+     collisionType     = "dynamic"
+     mass              = 10000
+     linearDamping     = 0.9
+     angularDamping    = 0.99999
+    >
+      <attached>
+        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
+        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
+
+        <?lua
+          for i = 1, 10, 1 do
+        ?>
+          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+            <events>
+              <spawn>
+                <EventListener event="base 4" />
+              </spawn>
+            </events>
+          </ParticleSpawner>
+        <?lua end ?>
+
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="80"            position = "-100,0,0" />
+        <SphereCollisionShape radius="120"           position = "100,0,0" />
+        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
+      </collisionShapes>
+    </TeamBaseMatchBase>
+
+
+    <TeamBaseMatchBase
+     name              = "base 5"
+     position          = "0, 0, 0"
+     pitch = -90
+
+     health            = 1000
+     maxhealth         = 1000
+     initialhealth     = 1000
+
+     collisionType     = "dynamic"
+     mass              = 10000
+     linearDamping     = 0.9
+     angularDamping    = 0.99999
+    >
+      <attached>
+        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
+        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
+        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
+
+        <?lua
+          for i = 1, 10, 1 do
+        ?>
+          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
+            <events>
+              <spawn>
+                <EventListener event="base 5" />
+              </spawn>
+            </events>
+          </ParticleSpawner>
+        <?lua end ?>
+
+      </attached>
+      <collisionShapes>
+        <SphereCollisionShape radius="80"            position = "-100,0,0" />
+        <SphereCollisionShape radius="120"           position = "100,0,0" />
+        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
+      </collisionShapes>
+    </TeamBaseMatchBase>
+
+    <!--Model position="0,0,0" scale=8 mesh="ast1.mesh" />
+    <StaticEntity position="0,0,0" collisionType=static>
+      <collisionShapes>
+        <SphereCollisionShape radius="20" />
+      </collisionShapes>
+    </StaticEntity-->
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/teamDeathMatch.oxw
===================================================================
--- code/trunk/data/levels/teamDeathMatch.oxw	(revision 7679)
+++ code/trunk/data/levels/teamDeathMatch.oxw	(revision 7679)
@@ -0,0 +1,85 @@
+<LevelInfo
+ name = "Team Deathmatch"
+ description = "Fight against each other in teams."
+ tags = ""
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Waypoints"
+ description  = "Testing waypoings for AI controlled spaceships."
+ gametype     = TeamDeathmatch
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.7, 0.6, 0.6"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    <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" />
+
+    <TeamSpawnPoint team=0 position="0,  0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=0 position="0, 50,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=0 position="0,100,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+    <TeamSpawnPoint team=0 position="0,150,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <TeamSpawnPoint team=1 position="2000,  0,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <TeamSpawnPoint team=1 position="2000, 50,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <TeamSpawnPoint team=1 position="2000,100,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+    <TeamSpawnPoint team=1 position="2000,150,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
+
+    <TeamSpawnPoint team=2 position="1000,  0,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
+    <TeamSpawnPoint team=2 position="1000, 50,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
+    <TeamSpawnPoint team=2 position="1000,100,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
+    <TeamSpawnPoint team=2 position="1000,150,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
+
+
+    <?lua
+      for i = 1, 70, 1 do
+    ?>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+
+      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+        <attached>
+          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
+        </attached>
+      </MovableEntity>
+    <?lua end ?>
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/teambasematchlevel.oxw
===================================================================
--- code/trunk/data/levels/teambasematchlevel.oxw	(revision 7677)
+++ 	(revision )
@@ -1,246 +1,0 @@
-<LevelInfo
- name = "Teambase Match"
- description = "Fight for the bases."
- tags = ""
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("teambasematchhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Presentation"
- description  = "A simple testlevel"
- gametype     = TeamBaseMatch
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-
-    <TeamSpawnPoint team=0 position=" 900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <TeamSpawnPoint team=1 position="-900,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-
-    <TeamBaseMatchBase
-     name              = "base 1"
-     position          = "1200, 0, 0"
-     pitch = -90
-
-     health            = 1000
-     maxhealth         = 1000
-     initialhealth     = 1000
-
-     collisionType     = "dynamic"
-     mass              = 10000
-     linearDamping     = 0.9
-     angularDamping    = 0.99999
-    >
-      <attached>
-        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
-        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
-
-        <?lua
-          for i = 1, 10, 1 do
-        ?>
-          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-            <events>
-              <spawn>
-                <EventListener event="base 1" />
-              </spawn>
-            </events>
-          </ParticleSpawner>
-        <?lua end ?>
-        
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="80"            position = "-100,0,0" />
-        <SphereCollisionShape radius="120"           position = "100,0,0" />
-        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
-      </collisionShapes>
-    </TeamBaseMatchBase>
-
-
-    <TeamBaseMatchBase
-     name              = "base 2"
-     position          = "-1200, 0, 0"
-     pitch = -90
-
-     health            = 1000
-     maxhealth         = 1000
-     initialhealth     = 1000
-
-     collisionType     = "dynamic"
-     mass              = 10000
-     linearDamping     = 0.9
-     angularDamping    = 0.99999
-    >
-      <attached>
-        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
-        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
-
-        <?lua
-          for i = 1, 10, 1 do
-        ?>
-          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-            <events>
-              <spawn>
-                <EventListener event="base 2" />
-              </spawn>
-            </events>
-          </ParticleSpawner>
-        <?lua end ?>
-        
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="80"            position = "-100,0,0" />
-        <SphereCollisionShape radius="120"           position = "100,0,0" />
-        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
-      </collisionShapes>
-    </TeamBaseMatchBase>
-
-
-    <TeamBaseMatchBase
-     name              = "base 3"
-     position          = "0, 0, 1200"
-     pitch = -90
-
-     health            = 1000
-     maxhealth         = 1000
-     initialhealth     = 1000
-
-     collisionType     = "dynamic"
-     mass              = 10000
-     linearDamping     = 0.9
-     angularDamping    = 0.99999
-    >
-      <attached>
-        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
-        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
-
-        <?lua
-          for i = 1, 10, 1 do
-        ?>
-          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-            <events>
-              <spawn>
-                <EventListener event="base 3" />
-              </spawn>
-            </events>
-          </ParticleSpawner>
-        <?lua end ?>
-
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="80"            position = "-100,0,0" />
-        <SphereCollisionShape radius="120"           position = "100,0,0" />
-        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
-      </collisionShapes>
-    </TeamBaseMatchBase>
-
-    <TeamBaseMatchBase
-     name              = "base 4"
-     position          = "0, 0, -1200"
-
-     health            = 1000
-     maxhealth         = 1000
-     initialhealth     = 1000
-     pitch = -90
-
-     collisionType     = "dynamic"
-     mass              = 10000
-     linearDamping     = 0.9
-     angularDamping    = 0.99999
-    >
-      <attached>
-        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
-        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
-
-        <?lua
-          for i = 1, 10, 1 do
-        ?>
-          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-            <events>
-              <spawn>
-                <EventListener event="base 4" />
-              </spawn>
-            </events>
-          </ParticleSpawner>
-        <?lua end ?>
-
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="80"            position = "-100,0,0" />
-        <SphereCollisionShape radius="120"           position = "100,0,0" />
-        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
-      </collisionShapes>
-    </TeamBaseMatchBase>
-
-
-    <TeamBaseMatchBase
-     name              = "base 5"
-     position          = "0, 0, 0"
-     pitch = -90
-
-     health            = 1000
-     maxhealth         = 1000
-     initialhealth     = 1000
-
-     collisionType     = "dynamic"
-     mass              = 10000
-     linearDamping     = 0.9
-     angularDamping    = 0.99999
-    >
-      <attached>
-        <Model scale=10 mesh="DuBall1.mesh" position = "-100,0,0"/>
-        <Model scale=10 mesh="DuBall2.mesh" position = "100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "-100,0,0"/>
-        <Billboard scale=7 material="Examples/Flare" colour="0.5,0.5,0.5" position = "100,0,0"/>
-
-        <?lua
-          for i = 1, 10, 1 do
-        ?>
-          <ParticleSpawner position="<?lua print(math.random() * 400 - 200) ?>,<?lua print(math.random() * 200 - 100) ?>,<?lua print(math.random() * 200 - 100) ?>" startdelay=<?lua print(math.random()) ?> source="Orxonox/BigExplosion1part1" lifetime=2.0 loop=0 autostart=0>
-            <events>
-              <spawn>
-                <EventListener event="base 5" />
-              </spawn>
-            </events>
-          </ParticleSpawner>
-        <?lua end ?>
-
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="80"            position = "-100,0,0" />
-        <SphereCollisionShape radius="120"           position = "100,0,0" />
-        <BoxCollisionShape    halfExtents="90,25,45" position = "-155,0,40" />
-      </collisionShapes>
-    </TeamBaseMatchBase>
-
-    <!--Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
-      <collisionShapes>
-        <SphereCollisionShape radius="20" />
-      </collisionShapes>
-    </StaticEntity-->
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/teamdeathmatch.oxw
===================================================================
--- code/trunk/data/levels/teamdeathmatch.oxw	(revision 7677)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<LevelInfo
- name = "Team Deathmatch"
- description = "Fight against each other in teams."
- tags = ""
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Waypoints"
- description  = "Testing waypoings for AI controlled spaceships."
- gametype     = TeamDeathmatch
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.7, 0.6, 0.6"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-
-    <TeamSpawnPoint team=0 position="0,  0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <TeamSpawnPoint team=0 position="0, 50,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <TeamSpawnPoint team=0 position="0,100,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-    <TeamSpawnPoint team=0 position="0,150,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <TeamSpawnPoint team=1 position="2000,  0,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000, 50,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000,100,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <TeamSpawnPoint team=1 position="2000,150,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-
-    <TeamSpawnPoint team=2 position="1000,  0,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000, 50,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000,100,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-    <TeamSpawnPoint team=2 position="1000,150,1500" direction="0,0,-1" spawnclass=SpaceShip pawndesign=spaceshipHtwo />
-
-
-    <?lua
-      for i = 1, 70, 1 do
-    ?>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 1000 + 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * -1000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * 1000 + 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * 6000 - 3000)?>, <?lua print(math.random() * -1000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-
-      <MovableEntity position="<?lua print(math.random() * 1000 + 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-      <MovableEntity position="<?lua print(math.random() * -1000 - 3000)?>, <?lua print(math.random() * 6000 - 3000) ?>, <?lua print(math.random() * 6000 - 3000) ?>" rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-        <attached>
-          <Model scale="<?lua print(math.random() * 50 + 20) ?>" mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" shadow=false />
-        </attached>
-      </MovableEntity>
-    <?lua end ?>
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/templates/FPS.oxt
===================================================================
--- code/trunk/data/levels/templates/FPS.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/FPS.oxt	(revision 7679)
@@ -0,0 +1,53 @@
+<Template name=fps>
+  <FpsPlayer
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 0;
+   auxilaryThrust    = 0;
+   rotationThrust    = 0;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+   friction	     = 0.01
+   
+   weapon            = "hs-w01.mesh"
+  >
+    <collisionShapes>
+      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
+    </collisionShapes>
+    
+    <camerapositions>
+      <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
+    </camerapositions>
+    
+    <?lua
+	include("includes/weaponSettingsFPS.oxi")
+    ?>
+
+  </FpsPlayer>
+</Template>
+<!--
+<Template name=fpscamera defaults=0>
+  <FpsPlayer>
+    <camerapositions>
+      <CameraPosition position="0,0,20" drag=false mouselook=true />
+      
+      <!--
+      CameraPosition position="0,150,-25" pitch=-90 drag=true />
+      <CameraPosition position="0,0,-40" yaw=180 drag=true />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
+      <CameraPosition position="50,5,-8" yaw=90 drag=true /
+      
+    </camerapositions>
+  </FpsPlayer>
+</Template>
+-->
Index: code/trunk/data/levels/templates/fps.oxt
===================================================================
--- code/trunk/data/levels/templates/fps.oxt	(revision 7677)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<Template name=fps>
-  <FpsPlayer
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 0;
-   auxilaryThrust    = 0;
-   rotationThrust    = 0;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-   friction	     = 0.01
-   
-   weapon            = "hs-w01.mesh"
-  >
-    <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="15,25,15" />
-    </collisionShapes>
-    
-    <camerapositions>
-      <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
-    </camerapositions>
-    
-    <?lua
-	include("includes/weaponsettings_fps.oxi")
-    ?>
-
-  </FpsPlayer>
-</Template>
-<!--
-<Template name=fpscamera defaults=0>
-  <FpsPlayer>
-    <camerapositions>
-      <CameraPosition position="0,0,20" drag=false mouselook=true />
-      
-      <!--
-      CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /
-      
-    </camerapositions>
-  </FpsPlayer>
-</Template>
--->
Index: code/trunk/data/levels/templates/lodInformation.oxt
===================================================================
--- code/trunk/data/levels/templates/lodInformation.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/lodInformation.oxt	(revision 7679)
@@ -0,0 +1,18 @@
+<Template name=lodtemplate_default defaults=false>
+  <Level>
+    <lodinformation>
+      <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />
+      <MeshLodInformation mesh=assff.mesh lodQuality=3 />
+      <MeshLodInformation mesh=rocket.mesh lodQuality=5 enabled=true />
+      <MeshLodInformation mesh=laserbeam.mesh enabled=false />
+      <MeshLodInformation mesh=HXY.mesh enabled=true numLevels=8 />
+      <MeshLodInformation mesh=Transporter.mesh enabled=true numLevels=8 />
+      <MeshLodInformation mesh=CuboidConnBody.mesh enabled=false/>
+      <MeshLodInformation mesh=CuboidBody.mesh enabled=false/>
+      <MeshLodInformation mesh=DoubleCuboidBody.mesh enabled=false/>
+      <MeshLodInformation mesh=SemiCircleCockpit.mesh enabled=false/>
+      <MeshLodInformation mesh=SolarPanel.mesh enabled=false/>
+      <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
+    </lodinformation>
+  </Level>
+</Template>
Index: code/trunk/data/levels/templates/lodinformation.oxt
===================================================================
--- code/trunk/data/levels/templates/lodinformation.oxt	(revision 7677)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<Template name=lodtemplate_default defaults=false>
-  <Level>
-    <lodinformation>
-      <MeshLodInformation mesh=Carrier.mesh lodQuality=1.8 />
-      <MeshLodInformation mesh=assff.mesh lodQuality=3 />
-      <MeshLodInformation mesh=rocket.mesh lodQuality=5 enabled=true />
-      <MeshLodInformation mesh=laserbeam.mesh enabled=false />
-      <MeshLodInformation mesh=HXY.mesh enabled=true numLevels=8 />
-      <MeshLodInformation mesh=Transporter.mesh enabled=true numLevels=8 />
-      <MeshLodInformation mesh=CuboidConnBody.mesh enabled=false/>
-      <MeshLodInformation mesh=CuboidBody.mesh enabled=false/>
-      <MeshLodInformation mesh=DoubleCuboidBody.mesh enabled=false/>
-      <MeshLodInformation mesh=SemiCircleCockpit.mesh enabled=false/>
-      <MeshLodInformation mesh=SolarPanel.mesh enabled=false/>
-      <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
-    </lodinformation>
-  </Level>
-</Template>
Index: code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt
===================================================================
--- code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/pickupRepresentationTemplates.oxt	(revision 7679)
@@ -0,0 +1,481 @@
+<!-- Shield pickups: -->
+
+<Template name=smallshieldpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.3 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smallshieldpickup>
+  <ShieldPickup
+    duration = 10
+    shieldabsorption = 0.7
+    shieldhealth = 300
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=mediumshieldpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=mediumshieldpickup>
+  <ShieldPickup
+    duration = 30
+    shieldabsorption = 0.8
+    shieldhealth = 500
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+
+<Template name=hugeshieldpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=hugeshieldpickup>
+  <ShieldPickup
+    duration = 60
+    shieldabsorption = 0.95
+    shieldhealth = 700
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<!-- Health pickups: -->
+
+<Template name=smallhealthpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.3 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smallhealthpickup>
+  <HealthPickup
+    health = 10
+    healthType = "limited"
+    activationType = "immediate"
+    durationType = "once"
+  />
+</Template>
+
+<Template name=mediumhealthpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=mediumhealthpickup>
+  <HealthPickup
+    health = 50
+    healthType = "limited"
+    activationType = "immediate"
+    durationType = "once"
+  />
+</Template>
+
+<Template name=hugehealthpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=hugehealthpickup>
+  <HealthPickup
+    health = 100
+    healthType = "limited"
+    activationType = "immediate"
+    durationType = "once"
+  />
+</Template>
+
+<Template name=crazyhealthpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=1.2 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=crazyhealthpickup>
+  <HealthPickup
+    health = 1000
+    healthType = "permanent"
+    activationType = "immediate"
+    durationType = "once"
+  />
+</Template>
+
+<!-- Meta pickups: -->
+
+<Template name=usepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=droppickupRepresentation>
+    <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.95,0.20,0.10" material="Arrow" scale=0.65 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<!-- Speed pickups -->
+
+<Template name=smallspeedpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.3 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smallspeedpickup>
+  <SpeedPickup
+    duration = 10.0
+    speedAdd = 0.0
+    SpeedMultiply = 10.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=mediumspeedpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=mediumspeedpickup>
+  <SpeedPickup
+    duration = 10.0
+    speedAdd = 0.0
+    SpeedMultiply = 25.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=hugespeedpickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=hugespeedpickup>
+  <SpeedPickup
+    duration = 10.0
+    speedAdd = 0.0
+    SpeedMultiply = 50.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=smalljumppickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="1,0,0" material="3arrowsup" scale=0.3 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smalljumppickup>
+  <SpeedPickup
+    duration = 0.7
+    speedAdd = 5000.0
+    SpeedMultiply = 1.0
+    activationType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<!-- Invisible pickups -->
+
+<Template name=smallinvisiblepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.5 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=smallinvisiblepickup>
+  <InvisiblePickup 
+    duration = 5.0
+    activaionType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=mediuminvisiblepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.7 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=mediuminvisiblepickup>
+  <InvisiblePickup 
+    duration = 10.0
+    activaionType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<Template name=hugeinvisiblepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.9 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=hugeinvisiblepickup>
+  <InvisiblePickup 
+    duration = 20.0
+    activaionType = "immediate"
+    durationType = "continuous"
+  />
+</Template>
+
+<!-- Pickup Collection pickups -->
+
+<Template name=triplehealthspeedinvisibilitypickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.95,0.85,0.27" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Billboard position="0,20,0" colour="0.36,0.81,0.10" material="Cross" scale=0.25 />
+                            <Billboard position="-20,-10,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.25 />
+                            <Billboard position="20,-10,0" colour="0.06,0.14,0.63" material="Eye" scale=0.35 />
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=triplehealthspeedinvisibilitypickup>
+    <PickupCollection>
+        <pickupables>
+            <HealthPickup template=mediumhealthpickup />
+            <SpeedPickup template=mediumspeedpickup />
+            <InvisiblePickup template=mediuminvisiblepickup />
+        </pickupables>
+    </PickupCollection>
+</Template>
+
+<!-- Drone Pickup -->
+
+<Template name=droneTemplate>
+    <Drone name="Drone"  mass= "50" linearDamping = "0.7" angularDamping = "0.99999" maxDistanceToOwner_=150 minDistanceToOwner_=75 maxShootingRange_=1000 primaryThrust_=250 auxilaryThrust_=250 rotationThrust_=50>
+        <attached>
+            <Model scale="1" mesh="drone.mesh"/>
+        </attached>
+        <collisionShapes>
+            <BoxCollisionShape position="0,0,0"      halfExtents="1, 1, 1" />
+        </collisionShapes>
+        <weaponslots>
+            <WeaponSlot position="    0,   0,0" />
+        </weaponslots>
+        <weaponsets>
+            <WeaponSet firemode=0 />
+        </weaponsets>
+        <weapons>
+            <WeaponPack>
+                <links>
+                    <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+                </links>
+                <Weapon>
+                    <attached>
+                        <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 />
+                        <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 />
+                    </attached>
+                    <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=1.5708 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" />
+                    <HsW01 mode=0 munitionpershot=0 delay=0     damage=1.5708 material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" />
+                </Weapon>
+            </WeaponPack>
+        </weapons>
+    </Drone>
+</Template>
+
+<Template name=dronepickupRepresentation>
+    <PickupRepresentation>
+        <spawner-representation>
+            <StaticEntity>
+                <attached>
+                    <Billboard position="0,0,0" colour="0.96,0.35,0.02" material="Sphere2" scale=0.1>
+                        <attached>
+                            <Model scale="5" mesh="drone.mesh"/>
+                        </attached>
+                    </Billboard>
+                </attached>
+            </StaticEntity>
+        </spawner-representation>
+    </PickupRepresentation>
+</Template>
+
+<Template name=dronepickup>
+    <DronePickup droneTemplate=droneTemplate />
+</Template>
+
Index: code/trunk/data/levels/templates/pickup_representation_templates.oxt
===================================================================
--- code/trunk/data/levels/templates/pickup_representation_templates.oxt	(revision 7677)
+++ 	(revision )
@@ -1,481 +1,0 @@
-<!-- Shield pickups: -->
-
-<Template name=smallshieldpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.3 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smallshieldpickup>
-  <ShieldPickup
-    duration = 10
-    shieldabsorption = 0.7
-    shieldhealth = 300
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=mediumshieldpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=mediumshieldpickup>
-  <ShieldPickup
-    duration = 30
-    shieldabsorption = 0.8
-    shieldhealth = 500
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-
-<Template name=hugeshieldpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="1,1,1" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1,1,1" material="Shield" scale=0.7 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=hugeshieldpickup>
-  <ShieldPickup
-    duration = 60
-    shieldabsorption = 0.95
-    shieldhealth = 700
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<!-- Health pickups: -->
-
-<Template name=smallhealthpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.3 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smallhealthpickup>
-  <HealthPickup
-    health = 10
-    healthType = "limited"
-    activationType = "immediate"
-    durationType = "once"
-  />
-</Template>
-
-<Template name=mediumhealthpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=mediumhealthpickup>
-  <HealthPickup
-    health = 50
-    healthType = "limited"
-    activationType = "immediate"
-    durationType = "once"
-  />
-</Template>
-
-<Template name=hugehealthpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=0.7 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=hugehealthpickup>
-  <HealthPickup
-    health = 100
-    healthType = "limited"
-    activationType = "immediate"
-    durationType = "once"
-  />
-</Template>
-
-<Template name=crazyhealthpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.50,0.90,0.25" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.36,0.81,0.10" material="Cross" scale=1.2 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=crazyhealthpickup>
-  <HealthPickup
-    health = 1000
-    healthType = "permanent"
-    activationType = "immediate"
-    durationType = "once"
-  />
-</Template>
-
-<!-- Meta pickups: -->
-
-<Template name=usepickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.60,0.97,0.23" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.40,0.81,0.10" material="Arrow" scale=0.65 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=droppickupRepresentation>
-    <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.95,0.20,0.10" material="Arrow" scale=0.65 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<!-- Speed pickups -->
-
-<Template name=smallspeedpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.3 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smallspeedpickup>
-  <SpeedPickup
-    duration = 10.0
-    speedAdd = 0.0
-    SpeedMultiply = 10.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=mediumspeedpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=mediumspeedpickup>
-  <SpeedPickup
-    duration = 10.0
-    speedAdd = 0.0
-    SpeedMultiply = 25.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=hugespeedpickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=hugespeedpickup>
-  <SpeedPickup
-    duration = 10.0
-    speedAdd = 0.0
-    SpeedMultiply = 50.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=smalljumppickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="1,0,0" material="3arrowsup" scale=0.3 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smalljumppickup>
-  <SpeedPickup
-    duration = 0.7
-    speedAdd = 5000.0
-    SpeedMultiply = 1.0
-    activationType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<!-- Invisible pickups -->
-
-<Template name=smallinvisiblepickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.5 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=smallinvisiblepickup>
-  <InvisiblePickup 
-    duration = 5.0
-    activaionType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=mediuminvisiblepickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.7 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=mediuminvisiblepickup>
-  <InvisiblePickup 
-    duration = 10.0
-    activaionType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<Template name=hugeinvisiblepickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.22,0.32,0.86" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,0,0" colour="0.06,0.14,0.63" material="Eye" scale=0.9 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=hugeinvisiblepickup>
-  <InvisiblePickup 
-    duration = 20.0
-    activaionType = "immediate"
-    durationType = "continuous"
-  />
-</Template>
-
-<!-- Pickup Collection pickups -->
-
-<Template name=triplehealthspeedinvisibilitypickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.95,0.85,0.27" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Billboard position="0,20,0" colour="0.36,0.81,0.10" material="Cross" scale=0.25 />
-                            <Billboard position="-20,-10,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.25 />
-                            <Billboard position="20,-10,0" colour="0.06,0.14,0.63" material="Eye" scale=0.35 />
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=triplehealthspeedinvisibilitypickup>
-    <PickupCollection>
-        <pickupables>
-            <HealthPickup template=mediumhealthpickup />
-            <SpeedPickup template=mediumspeedpickup />
-            <InvisiblePickup template=mediuminvisiblepickup />
-        </pickupables>
-    </PickupCollection>
-</Template>
-
-<!-- Drone Pickup -->
-
-<Template name=droneTemplate>
-    <Drone name="Drone"  mass= "50" linearDamping = "0.7" angularDamping = "0.99999" maxDistanceToOwner_=150 minDistanceToOwner_=75 maxShootingRange_=1000 primaryThrust_=250 auxilaryThrust_=250 rotationThrust_=50>
-        <attached>
-            <Model scale="1" mesh="drone.mesh"/>
-        </attached>
-        <collisionShapes>
-            <BoxCollisionShape position="0,0,0"      halfExtents="1, 1, 1" />
-        </collisionShapes>
-        <weaponslots>
-            <WeaponSlot position="    0,   0,0" />
-        </weaponslots>
-        <weaponsets>
-            <WeaponSet firemode=0 />
-        </weaponsets>
-        <weapons>
-            <WeaponPack>
-                <links>
-                    <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-                </links>
-                <Weapon>
-                    <attached>
-                        <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 />
-                        <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 />
-                    </attached>
-                    <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=1.5708 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" />
-                    <HsW01 mode=0 munitionpershot=0 delay=0     damage=1.5708 material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" />
-                </Weapon>
-            </WeaponPack>
-        </weapons>
-    </Drone>
-</Template>
-
-<Template name=dronepickupRepresentation>
-    <PickupRepresentation>
-        <spawner-representation>
-            <StaticEntity>
-                <attached>
-                    <Billboard position="0,0,0" colour="0.96,0.35,0.02" material="Sphere2" scale=0.1>
-                        <attached>
-                            <Model scale="5" mesh="drone.mesh"/>
-                        </attached>
-                    </Billboard>
-                </attached>
-            </StaticEntity>
-        </spawner-representation>
-    </PickupRepresentation>
-</Template>
-
-<Template name=dronepickup>
-    <DronePickup droneTemplate=droneTemplate />
-</Template>
-
Index: code/trunk/data/levels/templates/spaceshipAssff.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipAssff.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipAssff.oxt	(revision 7679)
@@ -0,0 +1,141 @@
+<Template name=spaceshipassff>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipassffcameras
+   engine                 = spaceshipassffengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+<?lua
+  include("includes/weaponSettings3.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,10, 40" drag=true mouselook=true />
+      <CameraPosition position="0,20, 80" drag=true mouselook=true />
+      <CameraPosition position="0,30,120" drag=true mouselook=true />
+      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
+      <CameraPosition position="0,0,-40" yaw=180 drag=true />
+      <CameraPosition position="0,3,-14" yaw=0 />
+      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
+      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipassffengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   defEngineSndNormal = "sounds/Engine_low.ogg"
+   defEngineSndBoost = "sounds/Engine_high.ogg"
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <EffectContainer condition="idle">
+      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+<!--
+      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
+-->
+    </EffectContainer>
+    <EffectContainer condition="normal or brake">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
+
+<!--Template name=spaceshippirate>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+    </attached>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipspacecruiser>
+  <SpaceShip
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   maxspeed          = 250
+   maxsecondaryspeed = 50
+   maxrotation       = 100
+   transacc          = 200
+   rotacc            = 140
+   transdamp         = 75
+  >
+    <attached>
+      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
+    </attached>
+  </SpaceShip>
+</Template-->
Index: code/trunk/data/levels/templates/spaceshipGhost.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipGhost.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipGhost.oxt	(revision 7679)
@@ -0,0 +1,84 @@
+<Template name=spaceshipghost>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipghostcameras
+   engine                 = spaceshipghostengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 600;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+
+    <attached>
+      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="ghost.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+<?lua
+  include("includes/weaponSettingsGhost.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipghostcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,20,80" drag=true mouselook=true />
+      <CameraPosition position="0,40,160" drag=true mouselook=true />
+      <CameraPosition position="0,50,200" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipghostengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 600
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 700
+   accelerationbrake     = 300
+   accelerationback      =  100
+   accelerationleftright =  100
+   accelerationupdown    =  100
+  >
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.4 position="7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+</MultiStateEngine>
+</Template>
+
Index: code/trunk/data/levels/templates/spaceshipH2.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipH2.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipH2.oxt	(revision 7679)
@@ -0,0 +1,87 @@
+<Template name=spaceshipHtwo>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipHtwocameras
+   engine                 = spaceshipHtwoengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+
+<?lua
+  include("includes/weaponSettingsH2.oxi")
+?>
+
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale3D="3,0.833,0.833" mesh="h2_green.mesh" />
+      <BlinkingBillboard position=" 11.7,4.0,8.5" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-11.7,4.0,8.5" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHtwocameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,10, 40" drag=true mouselook=true />
+      <CameraPosition position="0,20, 80" drag=true mouselook=true />
+      <CameraPosition position="0,30,120" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHtwoengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <active>
+      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 0.0, 2.0, 12.0" colour="0.0, 0.65, 0.0, 0.5" material="Examples/FlareZwei_1" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 3.8, 7.5, 11.0" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.05 position="-3.8, 7.5, 11.0" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 3.5, 0.0,-10.8" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.05 position="-3.5, 0.0,-10.8" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </active>
+    <forward>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 11.6" colour="0, 0.65, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.26, 1.66, 11.6" colour="0, 0.65, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </forward>
+    <boost>
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 11.6" colour="0.5, 0.85, 0.5, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.26, 1.66, 11.6" colour="0.5, 0.85, 0.5, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </boost>
+  </MultiStateEngine>
+</Template>
+
Index: code/trunk/data/levels/templates/spaceshipHXY.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipHXY.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipHXY.oxt	(revision 7679)
@@ -0,0 +1,94 @@
+<Template name=spaceshipHXY>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipHXYcameras
+   engine                 = spaceshipHXYengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+<?lua
+  include("includes/weaponSettingsHXY.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHXYcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,8, 60" drag=true mouselook=true />
+      <CameraPosition position="0,16, 120" drag=true mouselook=true />
+      <CameraPosition position="0,24,180" drag=true mouselook=true />
+      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHXYengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 6
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   defEngineSndNormal = "sounds/Engine_low.ogg"
+   defEngineSndBoost = "sounds/Engine_high.ogg"
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <EffectContainer condition="idle">
+      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or brake">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.3 position="-2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position="-2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
Index: code/trunk/data/levels/templates/spaceshipHXYSL.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipHXYSL.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipHXYSL.oxt	(revision 7679)
@@ -0,0 +1,90 @@
+<Template name=spaceshipHXYSL>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipHXYcameras
+   engine                 = spaceshipHXYengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+<?lua
+  include("includes/weaponSettingsHXY.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHXYcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,8, 60" drag=true mouselook=true />
+      <CameraPosition position="0,16, 120" drag=true mouselook=true />
+      <CameraPosition position="0,24,180" drag=true mouselook=true />
+      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipHXYengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 6
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <EffectContainer condition="idle">
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or brake">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.3 position="-2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.15 position="-2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
Index: code/trunk/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipPirate.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipPirate.oxt	(revision 7679)
@@ -0,0 +1,88 @@
+<Template name=spaceshippirate>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshippiratecameras
+   engine                 = spaceshippirateengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+      <BlinkingBillboard position=" 12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 />
+      <BlinkingBillboard position="-12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="90"/>
+      <BlinkingBillboard position=" 8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="30"/>
+      <BlinkingBillboard position="-8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="60"/>
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+<?lua
+  include("includes/weaponSettingsPirate.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshippiratecameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,8, 60" drag=true mouselook=true />
+      <CameraPosition position="0,16, 120" drag=true mouselook=true />
+      <CameraPosition position="0,24,180" drag=true mouselook=true />
+      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshippirateengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 150
+   speedback      =  50
+   speedleftright =  50
+   speedupdown    =  50
+
+   accelerationfront     = 500
+   accelerationbrake     = 500
+   accelerationback      =  125
+   accelerationleftright =  125
+   accelerationupdown    =  125
+  >
+    <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 0, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.02 position="-1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="  0,  5, 15.5" colour="1.0, 0.65, 0.2, 1.0" width=16 length=1600 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.1 position=" 4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.1 position="-4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
Index: code/trunk/data/levels/templates/spaceshipSwallow.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipSwallow.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipSwallow.oxt	(revision 7679)
@@ -0,0 +1,88 @@
+<Template name=spaceshipswallow>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipswallowcameras
+   engine                 = spaceshipswallowengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 600;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+
+    <attached>
+      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="swallow_mat.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+<?lua
+  include("includes/weaponSettingsSwallow.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipswallowcameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,25,85" drag=true mouselook=true />
+      <CameraPosition position="0,40,140" drag=true mouselook=true />
+      <CameraPosition position="0,50,160" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipswallowengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 600
+   speedback      =  60
+   speedleftright =  60
+   speedupdown    =  60
+
+   accelerationfront     = 700
+   accelerationbrake     = 300
+   accelerationback      =  100
+   accelerationleftright =  120
+   accelerationupdown    =  120
+  >
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=0.023 name=bltest position=" 2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
+      <Backlight mainstate=activity active=false scale=0.023 name=bltest position="-2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />      
+
+
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+      <FadingBillboard mainstate=activity active=false scale=0.4 position="6.6, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000 />
+      <FadingBillboard mainstate=activity active=false scale=0.4 position="-6.9, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000/>
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+</MultiStateEngine>
+</Template>
+
Index: code/trunk/data/levels/templates/spaceshipTransporter.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipTransporter.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipTransporter.oxt	(revision 7679)
@@ -0,0 +1,94 @@
+<Template name=spaceshipTransporter>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipTransportercameras
+   engine                 = spaceshipTransporterengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 1000
+   maxhealth         = 1500
+   initialhealth     = 1000
+
+   primaryThrust     = 50;
+   auxilaryThrust    = 10;
+   rotationThrust    = 15;
+
+   collisionType     = "dynamic"
+   mass              = 1000
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+<?lua
+  include("includes/weaponSettingsTransporter.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipTransportercameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,90,350" drag=true mouselook=true />
+      <CameraPosition position="0,150, 400" drag=true mouselook=true />
+      <CameraPosition position="0,200,550" drag=true mouselook=true />
+      <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipTransporterengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 50
+   speedback      =  10
+   speedleftright =  10
+   speedupdown    =  10
+
+   defEngineSndNormal = "sounds/Engine_low.ogg"
+   defEngineSndBoost = "sounds/Engine_high.ogg"
+
+   accelerationfront     = 20
+   accelerationbrake     = 20
+   accelerationback      = 10
+   accelerationleftright =  10
+   accelerationupdown    =  10
+  >
+    <EffectContainer condition="idle">
+      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or brake">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=2 position="-22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=1 position="22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=1 position="-22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
Index: code/trunk/data/levels/templates/spaceshipTransporterSL.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceshipTransporterSL.oxt	(revision 7679)
+++ code/trunk/data/levels/templates/spaceshipTransporterSL.oxt	(revision 7679)
@@ -0,0 +1,91 @@
+<Template name=spaceshipTransporterSL>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipTransportercameras
+   engine                 = spaceshipTransporterengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 1000
+   maxhealth         = 1500
+   initialhealth     = 1000
+
+   primaryThrust     = 50;
+   auxilaryThrust    = 10;
+   rotationThrust    = 15;
+
+   collisionType     = "dynamic"
+   mass              = 1000
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+
+<?lua
+  include("includes/weaponSettingsTransporter.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipTransportercameras defaults=0>
+  <SpaceShip>
+    <camerapositions>
+      <CameraPosition position="0,90,350" drag=true mouselook=true />
+      <CameraPosition position="0,150, 400" drag=true mouselook=true />
+      <CameraPosition position="0,200,550" drag=true mouselook=true />
+      <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
+    </camerapositions>
+  </SpaceShip>
+</Template>
+
+<Template name=spaceshipTransporterengine baseclass=MultiStateEngine>
+  <MultiStateEngine
+   boostfactor    = 2
+
+   speedfront     = 50
+   speedback      =  10
+   speedleftright =  10
+   speedupdown    =  10
+
+
+   accelerationfront     = 20
+   accelerationbrake     = 20
+   accelerationback      = 10
+   accelerationleftright =  10
+   accelerationupdown    =  10
+  >
+    <EffectContainer condition="idle">
+    </EffectContainer>
+    <EffectContainer condition="not idle">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or brake">
+
+    </EffectContainer>
+    <EffectContainer condition="normal or boost">
+      <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+      <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
+    </EffectContainer>
+    <EffectContainer condition="boost">
+      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+      <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
+    </EffectContainer>
+    <EffectContainer condition="brake">
+      <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=2 position="-22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=1 position="22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+      <FadingBillboard mainstate=activity active=false scale=1 position="-22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
+    </EffectContainer>
+  </MultiStateEngine>
+</Template>
Index: code/trunk/data/levels/templates/spaceship_H2.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_H2.oxt	(revision 7677)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<Template name=spaceshipHtwo>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipHtwocameras
-   engine                 = spaceshipHtwoengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-
-<?lua
-  include("includes/weaponsettings_H2.oxi")
-?>
-
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale3D="3,0.833,0.833" mesh="h2_green.mesh" />
-      <BlinkingBillboard position=" 11.7,4.0,8.5" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-11.7,4.0,8.5" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHtwocameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
-      <CameraPosition position="0,20, 80" drag=true mouselook=true />
-      <CameraPosition position="0,30,120" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHtwoengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <active>
-      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 0.0, 2.0, 12.0" colour="0.0, 0.65, 0.0, 0.5" material="Examples/FlareZwei_1" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 3.8, 7.5, 11.0" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.05 position="-3.8, 7.5, 11.0" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.05 position=" 3.5, 0.0,-10.8" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.05 position="-3.5, 0.0,-10.8" colour="1.0, 1.00, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </active>
-    <forward>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 11.6" colour="0, 0.65, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.26, 1.66, 11.6" colour="0, 0.65, 0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </forward>
-    <boost>
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.06, 1.66, 11.6" colour="0.5, 0.85, 0.5, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.26, 1.66, 11.6" colour="0.5, 0.85, 0.5, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </boost>
-  </MultiStateEngine>
-</Template>
-
Index: code/trunk/data/levels/templates/spaceship_HXY.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_HXY.oxt	(revision 7677)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<Template name=spaceshipHXY>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipHXYcameras
-   engine                 = spaceshipHXYengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-<?lua
-  include("includes/weaponsettings_HXY.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHXYcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,8, 60" drag=true mouselook=true />
-      <CameraPosition position="0,16, 120" drag=true mouselook=true />
-      <CameraPosition position="0,24,180" drag=true mouselook=true />
-      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHXYengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 6
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <EffectContainer condition="idle">
-      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.3 position="-2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position="-2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
Index: code/trunk/data/levels/templates/spaceship_HXY_SL.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_HXY_SL.oxt	(revision 7677)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<Template name=spaceshipHXYSL>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipHXYcameras
-   engine                 = spaceshipHXYengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=180 pitch=-90 roll=0 scale=4 mesh="HXY.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-<?lua
-  include("includes/weaponsettings_HXY.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHXYcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,8, 60" drag=true mouselook=true />
-      <CameraPosition position="0,16, 120" drag=true mouselook=true />
-      <CameraPosition position="0,24,180" drag=true mouselook=true />
-      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipHXYengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 6
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <EffectContainer condition="idle">
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 1.0" width=10 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-2, 0, 20" colour="1, 0.7, 0.1, 0.7" width=25 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.3 position="-2, 0, 20" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position="-2, 0, 20" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
Index: code/trunk/data/levels/templates/spaceship_Transporter.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_Transporter.oxt	(revision 7677)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<Template name=spaceshipTransporter>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipTransportercameras
-   engine                 = spaceshipTransporterengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 1000
-   maxhealth         = 1500
-   initialhealth     = 1000
-
-   primaryThrust     = 50;
-   auxilaryThrust    = 10;
-   rotationThrust    = 15;
-
-   collisionType     = "dynamic"
-   mass              = 1000
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-<?lua
-  include("includes/weaponsettings_Transporter.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipTransportercameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,90,350" drag=true mouselook=true />
-      <CameraPosition position="0,150, 400" drag=true mouselook=true />
-      <CameraPosition position="0,200,550" drag=true mouselook=true />
-      <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipTransporterengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 50
-   speedback      =  10
-   speedleftright =  10
-   speedupdown    =  10
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 20
-   accelerationbrake     = 20
-   accelerationback      = 10
-   accelerationleftright =  10
-   accelerationupdown    =  10
-  >
-    <EffectContainer condition="idle">
-      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=2 position="-22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=1 position="22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=1 position="-22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
Index: code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_Transporter_SL.oxt	(revision 7677)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<Template name=spaceshipTransporterSL>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipTransportercameras
-   engine                 = spaceshipTransporterengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 1000
-   maxhealth         = 1500
-   initialhealth     = 1000
-
-   primaryThrust     = 50;
-   auxilaryThrust    = 10;
-   rotationThrust    = 15;
-
-   collisionType     = "dynamic"
-   mass              = 1000
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=0 pitch=0 roll=0 scale=10 mesh="Transporter.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-<?lua
-  include("includes/weaponsettings_Transporter.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipTransportercameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,90,350" drag=true mouselook=true />
-      <CameraPosition position="0,150, 400" drag=true mouselook=true />
-      <CameraPosition position="0,200,550" drag=true mouselook=true />
-      <CameraPosition position="0,120,200" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipTransporterengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 50
-   speedback      =  10
-   speedleftright =  10
-   speedupdown    =  10
-
-
-   accelerationfront     = 20
-   accelerationbrake     = 20
-   accelerationback      = 10
-   accelerationleftright =  10
-   accelerationupdown    =  10
-  >
-    <EffectContainer condition="idle">
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=2 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=2 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 1.0" width=10 length=3000 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=3 name=bltest position=" 22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=3 name=bltest position="-22, -10, 87" colour="1, 0.7, 0.1, 0.7" width=25 length=2000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=2 position=" 22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=2 position="-22, -10, 87" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=1 position="22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=1 position="-22, -10, 87" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
Index: code/trunk/data/levels/templates/spaceship_assff.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_assff.oxt	(revision 7677)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<Template name=spaceshipassff>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   engine                 = spaceshipassffengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponsettings3.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,10, 40" drag=true mouselook=true />
-      <CameraPosition position="0,20, 80" drag=true mouselook=true />
-      <CameraPosition position="0,30,120" drag=true mouselook=true />
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipassffengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   defEngineSndNormal = "sounds/Engine_low.ogg"
-   defEngineSndBoost = "sounds/Engine_high.ogg"
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <EffectContainer condition="idle">
-      <WorldSound mainstate="activity" source="sounds/Engine_idle.ogg" looping=1 active=false/>
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="0, 0, 9" colour="0.2, 0.65, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-<!--
-      <Light mainstate=visibility position=" 8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
-      <Light mainstate=visibility position="-8, 0, 8" diffuse="0.3, 0.6, 1.0" specular="0.3, 0.6, 1.0" attenuation="600, 1.0, 0.007, 0.0002" type=point />
--->
-    </EffectContainer>
-    <EffectContainer condition="normal or brake">
-
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.2, 0.65, 1.0, 1.0" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 0, 6" colour="0.6, 0.75, 0.8, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.5, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position=" 8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.15 position="-8, 0, 6" colour="1.0, 0.0, 0.0, 1.0" material="Flares/backlightflare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
-
-<!--Template name=spaceshippirate>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="0,-10,-45" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-    </attached>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipspacecruiser>
-  <SpaceShip
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   maxspeed          = 250
-   maxsecondaryspeed = 50
-   maxrotation       = 100
-   transacc          = 200
-   rotacc            = 140
-   transdamp         = 75
-  >
-    <attached>
-      <Model position="8,-30,-120" yaw=90 pitch=-90 roll=0 scale=4 mesh="spacecruiser.mesh" />
-    </attached>
-  </SpaceShip>
-</Template-->
Index: code/trunk/data/levels/templates/spaceship_ghost.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_ghost.oxt	(revision 7677)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<Template name=spaceshipghost>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipghostcameras
-   engine                 = spaceshipghostengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 600;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-
-    <attached>
-      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="ghost.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponsettings_ghost.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipghostcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,20,80" drag=true mouselook=true />
-      <CameraPosition position="0,40,160" drag=true mouselook=true />
-      <CameraPosition position="0,50,200" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipghostengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 600
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 700
-   accelerationbrake     = 300
-   accelerationback      =  100
-   accelerationleftright =  100
-   accelerationupdown    =  100
-  >
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-7.6, 3, 6" colour="0.0, 0.0, 0.0, 0.7" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.4 position="7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.4 position="-7.6, 3, 6" colour="1, 1, 1, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="0.2, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-</MultiStateEngine>
-</Template>
-
Index: code/trunk/data/levels/templates/spaceship_pirate.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_pirate.oxt	(revision 7677)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<Template name=spaceshippirate>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshippiratecameras
-   engine                 = spaceshippirateengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 100;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-    <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
-      <BlinkingBillboard position=" 12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 />
-      <BlinkingBillboard position="-12.7,-3.8,0" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="90"/>
-      <BlinkingBillboard position=" 8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="30"/>
-      <BlinkingBillboard position="-8.7,-0.5,2.5" material="Examples/Flare" colour="1.0, 1.0, 1" amplitude=0.04 frequency=1 quadratic=1 phase="60"/>
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-
-<?lua
-  include("includes/weaponsettings_pirate.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshippiratecameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,8, 60" drag=true mouselook=true />
-      <CameraPosition position="0,16, 120" drag=true mouselook=true />
-      <CameraPosition position="0,24,180" drag=true mouselook=true />
-      <CameraPosition position="0,60,10" pitch="-80" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshippirateengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
-
-   accelerationfront     = 500
-   accelerationbrake     = 500
-   accelerationback      =  125
-   accelerationleftright =  125
-   accelerationupdown    =  125
-  >
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.02 position=" 0, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.02 position="-1.3, -4, -15" colour="1.0, 0.65, 0.2, 1.0" material="Examples/FlareZwei" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-13, -4,  9.5" colour="1.0, 0.65, 0.2, 1.0" width=8 length=800 lifetime=1 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="  0,  5, 15.5" colour="1.0, 0.65, 0.2, 1.0" width=16 length=1600 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.1 position=" 4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.1 position="-4.4, -5.5, 5" colour="0.8, 0.0, 0.0, 0.3" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-  </MultiStateEngine>
-</Template>
Index: code/trunk/data/levels/templates/spaceship_swallow.oxt
===================================================================
--- code/trunk/data/levels/templates/spaceship_swallow.oxt	(revision 7677)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<Template name=spaceshipswallow>
-  <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipswallowcameras
-   engine                 = spaceshipswallowengine
-   spawnparticlesource    = "Orxonox/fairytwirl"
-   spawnparticleduration  = 3
-   explosionchunks        = 6
-
-   health            = 100
-   maxhealth         = 200
-   initialhealth     = 100
-
-   primaryThrust     = 600;
-   auxilaryThrust    = 30;
-   rotationThrust    = 25;
-
-   collisionType     = "dynamic"
-   mass              = 100
-   linearDamping     = 0.7
-   angularDamping    = 0.9999999
-  >
-
-    <attached>
-      <Model position="0,0,0" scale=2 yaw=90 pitch=-90 roll=0 mesh="swallow_mat.mesh" />
-    </attached>
-    <collisionShapes>
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    </collisionShapes>
-<?lua
-  include("includes/weaponsettings_swallow.oxi")
-?>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipswallowcameras defaults=0>
-  <SpaceShip>
-    <camerapositions>
-      <CameraPosition position="0,25,85" drag=true mouselook=true />
-      <CameraPosition position="0,40,140" drag=true mouselook=true />
-      <CameraPosition position="0,50,160" drag=true mouselook=true />
-    </camerapositions>
-  </SpaceShip>
-</Template>
-
-<Template name=spaceshipswallowengine baseclass=MultiStateEngine>
-  <MultiStateEngine
-   boostfactor    = 2
-
-   speedfront     = 600
-   speedback      =  60
-   speedleftright =  60
-   speedupdown    =  60
-
-   accelerationfront     = 700
-   accelerationbrake     = 300
-   accelerationback      =  100
-   accelerationleftright =  120
-   accelerationupdown    =  120
-  >
-    <EffectContainer condition="normal or boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=15 length=1500 lifetime=2 elements=50 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Flares/ThrusterFlare1" />
-      <Backlight mainstate=activity active=false scale=0.023 name=bltest position=" 2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />
-      <Backlight mainstate=activity active=false scale=0.023 name=bltest position="-2.1, 1.66, 23.8" colour="0.5, 0.15, 0.0, 1.0" width=40 length=10 lifetime=1 elements=30 trailmaterial="Trail/backlighttrailzwei" turnontime=1 turnofftime=500000 material="Examples/Flaredrei" />      
-
-
-    </EffectContainer>
-    <EffectContainer condition="boost">
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position=" 6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-      <Backlight mainstate=activity active=false scale=0.4 name=bltest position="-6.6, 0, 22" colour="1.0, 1.0, 1.0, 0.5" width=40 length=1000 lifetime=1 elements=30 trailmaterial="Trail/backlighttrail" turnontime=1 turnofftime=1 material="Examples/Flare" />
-    </EffectContainer>
-    <EffectContainer condition="not idle">
-      <FadingBillboard mainstate=activity active=false scale=0.4 position="6.6, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000 />
-      <FadingBillboard mainstate=activity active=false scale=0.4 position="-6.9, 0, 22" colour="0, 0.6, 0.85, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=10000/>
-    </EffectContainer>
-    <EffectContainer condition="brake">
-      <FadingBillboard mainstate=activity active=false scale=0.3 position=" 8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-      <FadingBillboard mainstate=activity active=false scale=0.3 position="-8, 0, 6" colour="1.0, 1.0, 1.0, 1.0" material="Examples/Flare" turnontime=0.5 turnofftime=0.5 />
-    </EffectContainer>
-</MultiStateEngine>
-</Template>
-
Index: code/trunk/data/levels/testStars.oxw
===================================================================
--- code/trunk/data/levels/testStars.oxw	(revision 7679)
+++ code/trunk/data/levels/testStars.oxw	(revision 7679)
@@ -0,0 +1,54 @@
+<LevelInfo
+ name = "Stars Testlevel"
+ description = "Level to test stars"
+ tags = "test"
+/>
+
+<?lua
+  include("stats.oxo")
+  include("HUDTemplates3.oxo")
+  include("templates/lodInformation.oxt")
+?>
+
+<?lua
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipPirate.oxt")
+?>
+
+<Level
+ name         = "Sample"
+ description  = "Just a few tests"
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+    ambientlight = "0.8, 0.8, 0.8"
+  >
+
+<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
+      <attached>
+        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
+	  <attached>
+           <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
+           <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
+           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
+	   <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
+          </attached>
+	  </Model>
+	</attached>
+    </Rocket-->
+    
+    <CreateStars numStars="6000" material="Examples/Flare" colour="1,1,1" radius=10000 colourDiff=0.1/>
+
+    <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" />
+    <SpawnPoint position="0,0,100" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <ParticleEmitter position="0,10000,0" source="Orxonox/fog" />
+    <ParticleEmitter position="6000,7000,0" source="Orxonox/fog2" />
+    <ParticleEmitter position="-6000,-7000,0" source="Orxonox/fog3" />
+    <ParticleEmitter position="-6000,0,9000" source="Orxonox/fog4" />
+    <ParticleEmitter position="2000,-7000,-5963" source="Orxonox/fog3" />
+  </Scene>
+</Level>
Index: code/trunk/data/levels/testSwallow.oxw
===================================================================
--- code/trunk/data/levels/testSwallow.oxw	(revision 7679)
+++ code/trunk/data/levels/testSwallow.oxw	(revision 7679)
@@ -0,0 +1,63 @@
+<LevelInfo
+ name = "Swallow Testlevel"
+ description = "Level to test the swallow spaceship."
+ tags = "test"
+/>
+
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("templates/spaceshipSwallow.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "Presentation_swallow"
+ description  = "presentation level for Orxonox Convention X"
+
+>
+
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    <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" />
+
+<SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
+
+
+<?lua
+max = 20
+for i = 1, max, 1
+do
+    x = math.sin(i/max*6)*40000
+    y = math.cos(i/max*6)*40000
+    z = i*100
+    ?>
+<?lua
+for k = 1, 25, 1
+do
+j = math.random()
+?>
+
+    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
+      <attached>
+        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+      </attached>
+      <?lua if i == 5 then ?><collisionShapes>
+        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
+      </collisionShapes> <?lua end ?>
+    </MovableEntity>
+<?lua
+end
+?>
+<?lua end ?>
+    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
+
+  </Scene>
+</Level>
Index: code/trunk/data/levels/test_stars.oxw
===================================================================
--- code/trunk/data/levels/test_stars.oxw	(revision 7677)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<LevelInfo
- name = "Stars Testlevel"
- description = "Level to test stars"
- tags = "test"
-/>
-
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("templates/lodinformation.oxt")
-?>
-
-<?lua
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-?>
-
-<Level
- name         = "Sample"
- description  = "Just a few tests"
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-    ambientlight = "0.8, 0.8, 0.8"
-  >
-
-<!--Rocket position="-10, 3.5,800" velocity="0,0,-100">
-      <attached>
-        <Model pitch=180 position="0,0,0" scale=1.5 mesh="rocket_test.mesh" >
-	  <attached>
-           <ParticleEmitter pitch=0 roll=0 position="0,5,0" source="Orxonox/laser" lifetime=2.0 loop=1 startdelay=3.0/>
-           <ParticleEmitter pitch=-90 roll=0 position="0,-5,0" source="Orxonox/particlecanon" lifetime=2.0 loop=1 startdelay=3.0/>
-           <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/rocketfire" lifetime=2.0 loop=1 startdelay=3.0 />
-	   <ParticleEmitter pitch=-90 roll=0 position="0,0,-2" source="Orxonox/smoke" lifetime=2.0 loop=1 startdelay=3.0 />
-          </attached>
-	  </Model>
-	</attached>
-    </Rocket-->
-    
-    <CreateStars numStars="6000" material="Examples/Flare" colour="1,1,1" radius=10000 colourDiff=0.1/>
-
-    <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" />
-    <SpawnPoint position="0,0,100" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <ParticleEmitter position="0,10000,0" source="Orxonox/fog" />
-    <ParticleEmitter position="6000,7000,0" source="Orxonox/fog2" />
-    <ParticleEmitter position="-6000,-7000,0" source="Orxonox/fog3" />
-    <ParticleEmitter position="-6000,0,9000" source="Orxonox/fog4" />
-    <ParticleEmitter position="2000,-7000,-5963" source="Orxonox/fog3" />
-  </Scene>
-</Level>
Index: code/trunk/data/levels/test_swallow.oxw
===================================================================
--- code/trunk/data/levels/test_swallow.oxw	(revision 7677)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<LevelInfo
- name = "Swallow Testlevel"
- description = "Level to test the swallow spaceship."
- tags = "test"
-/>
-
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_swallow.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Presentation_swallow"
- description  = "presentation level for Orxonox Convention X"
-
->
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-  <Scene
-   ambientlight = "0.5, 0.5, 0.5"
-   skybox       = "Orxonox/skypanoramagen1"
-  >
-    <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" />
-
-<SpawnPoint position="<?lua print(math.sin(1.5) *40000) ?>,<?lua print(math.cos(1.5) *40000) ?>,<?lua print(500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow />
-
-
-<?lua
-max = 20
-for i = 1, max, 1
-do
-    x = math.sin(i/max*6)*40000
-    y = math.cos(i/max*6)*40000
-    z = i*100
-    ?>
-<?lua
-for k = 1, 25, 1
-do
-j = math.random()
-?>
-
-    <MovableEntity position="<?lua print(x + math.random() * 10000-2500) ?>,<?lua print(y + math.random() * 5000-2500) ?>,<?lua print(z + math.random() * 1000-500) ?>" <?lua if i == 5 then ?> collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 50) ?> <?lua end ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>">
-      <attached>
-        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <?lua if i == 5 then ?><collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
-      </collisionShapes> <?lua end ?>
-    </MovableEntity>
-<?lua
-end
-?>
-<?lua end ?>
-    <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
-
-  </Scene>
-</Level>
Index: code/trunk/data/levels/theTimeMachine.oxw
===================================================================
--- code/trunk/data/levels/theTimeMachine.oxw	(revision 7679)
+++ code/trunk/data/levels/theTimeMachine.oxw	(revision 7679)
@@ -0,0 +1,660 @@
+<LevelInfo
+ name = "The Time Machine"
+ description = "A simple level. The only goal is to defeat as much enemies as you can."
+ tags = "singleplayer"
+/>
+
+<?lua 
+    include("stats.oxo")
+    include("HUDTemplates3.oxo")
+    include("templates/lodInformation.oxt")
+    include("templates/spaceshipAssff.oxt")
+    include("templates/spaceshipPirate.oxt")
+?>
+
+<!--*****************************************************************************************************************************************************************************************-->
+<!--Including Template for triggering on player-->
+
+<Template name=spaceshipassffplayer>
+  <SpaceShip
+   hudtemplate            = spaceshiphud
+   camerapositiontemplate = spaceshipassffcameras
+   engine                 = spaceshipassffengine
+   spawnparticlesource    = "Orxonox/fairytwirl"
+   spawnparticleduration  = 3
+   explosionchunks        = 6
+
+   health            = 100
+   maxhealth         = 200
+   initialhealth     = 100
+
+   primaryThrust     = 100;
+   auxilaryThrust    = 30;
+   rotationThrust    = 25;
+
+   collisionType     = "dynamic"
+   mass              = 100
+   linearDamping     = 0.7
+   angularDamping    = 0.9999999
+  >
+    <attached>
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
+      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
+      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
+      <DistanceTriggerBeacon name="PlayerDistanceTrigger" /> <!--added DistanceTriggerBeacon-->
+    </attached>
+    <collisionShapes>
+      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
+      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
+      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
+      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
+      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
+    </collisionShapes>
+<?lua
+  include("includes/weaponSettings3.oxi")
+?>
+  </SpaceShip>
+</Template>
+
+<!--*****************************************************************************************************************************************************************************************-->
+
+<Level
+    name="The Time Machine"
+    description="A simple level. The only goal is to defeat as much enemies as you can."
+    gametype=TeamDeathmatch
+>
+    <templates>
+        <Template link=lodtemplate_default />
+    </templates>
+    <Scene
+        ambientlight="0.8,0.8,0.8"
+        skybox="Orxonox/skypanoramagen2"
+    >
+
+        <Light type=directional position="0,0,0" direction="0, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
+
+<!--CREATING SPAWNPOINTS_____________________________________________________________________________________________________________________________________________________________________-->
+<?lua for i=0,4,1 do
+    x=500
+?>    
+
+        <TeamSpawnPoint team=0 position="-4000,0,<?lua print(i*x-1000) ?>" direction="5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshipassffplayer />
+<!--friendly spaceships spawnpoints-->
+        <!-- TeamSpawnPoint team=0 position="-4000,0,<?lua print(i*x-1000) ?>" lookat="5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
+
+<!--enemy spaceship spawnpoint-->
+        <!--TeamSpawnPoint team=1 position="4000,0,<?lua print(i*x-1000) ?>" lookat="-5000,0,<?lua print(i*x-1000) ?>" spawnclass=SpaceShip pawndesign=spaceshippirate /-->
+<?lua end ?>
+
+<!--CREATING SPAWNPOINTS END______________________________________________________________________________________________________________________________________________________________-->
+
+
+<!--Triggers (used for the Time Machine effect)___________________________________________________________________________________________________________________________________________-->
+    
+        <!--TRIGGERS IF THE PLAYERS REACHES THE "TIME MACHINE"-->
+        <DistanceTrigger name="EnterTimeMachine" position="0,0,0" distance="100" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" >
+            <attached>
+                <Billboard position="0,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="100,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="0,100,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="0,0,100" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="-100,0,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="0,-100,0" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+                <Billboard position="0,0,-100" material="Examples/Flare" colour="0, 0, 1" scale=1/>
+            </attached>
+        </DistanceTrigger>
+
+        <EventTrigger switch=true name=trigger4>
+            <events>
+                <trigger>
+                    <EventListener event=BotDied />
+                </trigger>
+            </events>
+        </EventTrigger>
+
+        <!-- This Trigger flips to true if the player is in the TimeMachine and shoots another player and flips right back after that. -->
+        <Trigger name=trigger1 mode=and >
+            <EventTrigger name=trigger6>
+                <events>
+                    <trigger>
+                        <EventListener event=EnterTimeMachine />
+                    </trigger>
+                </events>
+            </EventTrigger>
+            <EventTrigger switch=true name=trigger4>
+                <events>
+                    <trigger>
+                        <EventListener event=BotDied />
+                        <EventListener event=trigger2 />
+                    </trigger>
+                </events>
+            </EventTrigger>
+            <EventTrigger invert=true name=trigger5>
+                <events>
+                    <trigger>
+                        <EventListener event=trigger2 />
+                    </trigger>
+                </events>
+            </EventTrigger>
+        </Trigger>
+
+        <!-- This Trigger is true if the player is in the TimeMachine and has shot another player -->
+        <EventTrigger name=trigger2 switch=true >
+            <events>
+                <trigger>
+                    <EventListener event=trigger1 />
+                    <EventListener event=trigger3 />
+                </trigger>
+            </events>
+        </EventTrigger>
+
+        <!-- This Trigger flips trigger2 back to false after the player has left the TimeMachine. -->
+        <Trigger name=trigger3 mode=and >
+            <EventTrigger>
+                <events>
+                    <trigger>
+                        <EventListener event=trigger2 />
+                    </trigger>
+                </events>
+            </EventTrigger>
+            <EventTrigger invert=true>
+                <events>
+                    <trigger>
+                        <EventListener event=EnterTimeMachine />
+                    </trigger>
+                </events>
+            </EventTrigger>
+        </Trigger>
+
+    
+<!--Triggers (used for the Time Machine effect)_____________________________________________________________________________________________________________________________________________-->
+
+<!--Creating Spaceships_____________________________________________________________________________________________________________________________________________________________________-->
+    
+<?lua for i=0,5,1 do 
+    y=math.random(-500,500)
+    z=math.random(-1000,1000)
+    y2=math.random(-500,500)
+    z2=math.random(-1000,1000)
+    health=230
+    addh=100
+?>
+    
+        <EventTrigger name="BotDied" >
+            <events>
+                <trigger>
+                    <SpaceShip position="-4000,<?lua print(y) ?>,<?lua print(z) ?>" lookat="1000,<?lua print(y) ?>,<?lua print(z) ?>" health=<?lua print(health) ?> maxhealth=<?lua print(health) ?> initialhealth=<?lua print(health) ?> >
+                        <templates>
+                            <Template link=spaceshipassff />
+                         </templates>
+                          <controller>
+                            <WaypointPatrolController alertnessradius=1000 team=0 active=1 >
+                                <waypoints>
+                                    <Model mesh="cube.mesh" scale=0 position="1000,<?lua print(math.random(-1000,1000)) ?>,<?lua print(math.random(-1000,1000)) ?>" />
+                                </waypoints>
+                                <events>
+                                    <activity>
+                                        <Trigger mode=or>
+                                            <EventTrigger invert=true>
+                                                <events>
+                                                    <trigger>
+                                                        <EventListener event=EnterTimeMachine />
+                                                    </trigger>
+                                                </events>
+                                            </EventTrigger>
+                                            <EventTrigger>
+                                                <events>
+                                                    <trigger>
+                                                        <EventListener event=trigger2 />
+                                                    </trigger>
+                                                </events>
+                                            </EventTrigger>
+                                        </Trigger>
+                                    </activity>
+                                </events>
+                            </WaypointPatrolController>
+                          </controller>
+                    </SpaceShip>
+                </trigger>
+            </events>
+        </EventTrigger>
+
+        <EventTrigger name="BotDied" >
+            <events>
+                <trigger>
+                    <SpaceShip position="4000,<?lua print(y2) ?>,<?lua print(z2) ?>" lookat="-1000,<?lua print(y2) ?>, <?lua print(z2) ?>" health=<?lua print(health+addh) ?> maxhealth=<?lua print(health+addh) ?> initialhealth=<?lua print(health+addh) ?> >
+                        <templates>
+                            <Template link=spaceshippirate />
+                         </templates>
+                          <controller>
+                            <WaypointPatrolController alertnessradius=1000 team=1 active=1 >
+                                <waypoints>
+                                    <Model mesh="cube.mesh" scale=0 position="-1000,<?lua print(math.random(-1000,1000)) ?>, <?lua print(math.random(-1000,1000)) ?>" />
+                                </waypoints>
+                                <events>
+                                    <activity>
+                                        <Trigger mode=or>
+                                            <EventTrigger invert=true>
+                                                <events>
+                                                    <trigger>
+                                                        <EventListener event=EnterTimeMachine />
+                                                    </trigger>
+                                                </events>
+                                            </EventTrigger>
+                                            <EventTrigger>
+                                                <events>
+                                                    <trigger>
+                                                        <EventListener event=trigger2 />
+                                                    </trigger>
+                                                </events>
+                                            </EventTrigger>
+                                        </Trigger>
+                                    </activity>
+                                </events>
+                            </WaypointPatrolController>
+                          </controller>
+                    </SpaceShip>
+                </trigger>
+            </events>
+        </EventTrigger>
+<?lua end ?>
+
+<!--Creating Spaceships_____END_____________________________________________________________________________________________________________________________________________________________-->
+
+<!--BILLBOARD IN THE MIDDLE OF THE BATTLEFIELD-->
+        <Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Flares/backlightflare" scale=1 />
+    
+<!--TIME MACHINE____________________________________________________________________________________________________________________________________________________________________________-->
+<ForceField mode="invertedSphere" position="0,0,0" velocity=50000 diameter=6500 length=500 />
+        <StaticEntity>
+            <attached>
+                <MovableEntity position="0,0,0">
+                    <attached>
+<!--MIDDLE-->
+<?lua for i=0,2,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=<?lua print(-255-i*120) ?> >
+                            <attached>
+                                <Billboard position="<?lua print(10+i*10) ?>,<?lua print(-10-i*10) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                            </attached>
+                        </MovableEntity>
+    
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=<?lua print(-245-i*90) ?> >
+                            <attached>
+                                <Billboard position="<?lua print(10+i*20) ?>,<?lua print(-10-i*20) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                <Billboard position="<?lua print(-10-i*20) ?>,<?lua print(10+i*20) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                            </attached>
+                        </MovableEntity>
+    
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=<?lua print(265+i*110) ?> >
+                            <attached>
+                                <Billboard position="<?lua print(10+i*20) ?>,0,<?lua print(-10-i*20) ?>" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                <Billboard position="<?lua print(-10-i*20) ?>,0,<?lua print(10+i*20) ?>" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                            </attached>
+                        </MovableEntity>
+    
+                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=<?lua print(240+i*80) ?> >
+                            <attached>
+                                <Billboard position="<?lua print(15+i*30) ?>,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                <Billboard position="<?lua print(-15-i*30) ?>,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                            </attached>
+                        </MovableEntity>
+
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=<?lua print(232+i*70) ?> >
+                            <attached>
+                                <Billboard position="0,<?lua print(15+i*30) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                <Billboard position="0,<?lua print(-15-i*30) ?>,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+
+
+<!--FIRST DISTANT PAIR-->
+<?lua for i=0,1,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=10 >
+                            <attached>
+                                <MovableEntity position="<?lua print(1500-3000*i) ?>,0,0">
+                                    <attached>
+                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
+                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
+                                            <attached>
+                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
+                                            <attached>
+                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
+                                            <attached>
+                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                    </attached>
+                                </MovableEntity>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+<!--SECOND DISTANT PAIR-->
+<?lua for i=0,1,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=8 >
+                            <attached>
+                                <MovableEntity position="0,<?lua print(1500-3000*i) ?>,0">
+                                    <attached>
+                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
+                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
+                                            <attached>
+                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
+                                            <attached>
+                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
+                                            <attached>
+                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                    </attached>
+                                </MovableEntity>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+<!--THIRD DISTANT PAIR-->
+<?lua for i=0,1,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=9 >
+                            <attached>
+                                <MovableEntity position="<?lua print(1000-2000*i) ?>,<?lua print(-1000+2000*i) ?>,0">
+                                    <attached>
+                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
+                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
+                                            <attached>
+                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
+                                            <attached>
+                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
+                                            <attached>
+                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                    </attached>
+                                </MovableEntity>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+<!--FOURTH DISTANT PAIR-->
+<?lua for i=0,1,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=12 >
+                            <attached>
+                                <MovableEntity position="<?lua print(1000-2000*i) ?>,<?lua print(-1000+2000*i) ?>,0">
+                                    <attached>
+                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
+                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
+                                            <attached>
+                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
+                                            <attached>
+                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
+                                            <attached>
+                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                    </attached>
+                                </MovableEntity>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+<!--FIFTH DISTANT PAIR-->
+<?lua for i=0,1,1 do ?>
+                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=11 >
+                            <attached>
+                                <MovableEntity position="<?lua print(1000-2000*i) ?>,0,<?lua print(-1000+2000*i) ?>">
+                                    <attached>
+                                        <ForceField position="0,0,0" mode="sphere" diameter=500 velocity=100000 />
+                                        <Billboard position="0,0,0" material="Examples/Flare" colour="1.0,1.0,1.0" scale=0.3/>
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,1,0" rotationrate=-255 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=-245 >
+                                            <attached>
+                                                <Billboard position="10,-10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,10,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,1" rotationrate=265 >
+                                            <attached>
+                                                <Billboard position="10,0,-10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-10,0,10" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="0,1,0" rotationrate=240 >
+                                            <attached>
+                                                <Billboard position="15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="-15,0,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                        <MovableEntity    position="0,0,0" rotationaxis="1,0,0" rotationrate=232 >
+                                            <attached>
+                                                <Billboard position="0,15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                                <Billboard position="0,-15,0" material="Examples/Flare" colour="0.8, 0.8, 0.8" scale=0.1/>
+                                            </attached>
+                                        </MovableEntity>
+
+                                    </attached>
+                                </MovableEntity>
+                            </attached>
+                        </MovableEntity>
+<?lua end ?>
+                    </attached>
+                </MovableEntity>
+            </attached>
+        </StaticEntity>
+    
+
+<!--TIME MACHINE END____________________________________________________________________________________________________________________________________________________________________-->
+
+<!--Forcefields_________________________________________________________________________________________________________________________________________________________________________-->
+
+<!--NO 1-->
+        <ForceField position="-2500,0,800" direction="1,0,0" diameter=500 velocity=5000 length=1000 />
+        <MovableEntity position="-2500,0,800">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0" scale=2/>
+                <?lua for i=0,20,1 do ?>
+                    <Billboard position="<?lua print(i*200) ?>,0,-100" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                    <Billboard position="<?lua print(i*200) ?>,0,100" material="Examples/Flare" colour="0.5,0,0" scale=1/>
+                <?lua end ?>
+                </attached>
+        </MovableEntity>
+<!--NO 2-->
+        <ForceField position="2500,0,-800" direction="-1,0,0" diameter=500 velocity=5000 length=1000 />
+        <MovableEntity position="2500,0,-800">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0,0.5,0" scale=2/>
+                <?lua for i=0,20,1 do ?>
+                    <Billboard position="<?lua print(-i*200) ?>,0,-100" material="Examples/Flare" colour="0,0.5,0" scale=1/>
+                    <Billboard position="<?lua print(-i*200) ?>,0,100" material="Examples/Flare" colour="0,0.5,0" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+    
+<!--NO 3-->
+        <ForceField position="-2500,0,-600" direction="0.75,0.5,1" diameter=500 velocity=5000 length=1000 />
+        <MovableEntity position="-2500,0,-600">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0,0.5" scale=2/>
+                <?lua for i=0,20,1 do ?>
+                    <Billboard position="<?lua print(i*115-100) ?>,<?lua print(i*75) ?>,<?lua print(i*150) ?>" material="Examples/Flare" colour="0.5,0,0.5" scale=1/>
+                    <Billboard position="<?lua print(i*115+100) ?>,<?lua print(i*75) ?>,<?lua print(i*150) ?>" material="Examples/Flare" colour="0.5,0,0.5" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--NO 4-->
+        <ForceField position="2500,0,600" direction="-0.75,-0.5,-1" diameter=500 velocity=5000 length=1000 />
+        <MovableEntity position="2500,0,600">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0,0.5,0.5" scale=2/>
+                <?lua for i=0,20,1 do ?>
+                    <Billboard position="<?lua print(i*(-115)-100) ?>,<?lua print(i*(-75)) ?>,<?lua print(i*(-150)) ?>" material="Examples/Flare" colour="0,0.5,0.5" scale=1/>
+                    <Billboard position="<?lua print(i*(-115)+100) ?>,<?lua print(i*-(75)) ?>,<?lua print(i*(-150)) ?>" material="Examples/Flare" colour="0,0.5,0.5" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--NO 5 (samller)-->
+        <ForceField position="0,-500,500" direction="0,1,0" diameter=500 velocity=3000 length=1000 />
+        <MovableEntity position="0,-500,500">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.5,0" scale=2/>
+                <?lua for i=0,15,1 do ?>
+                    <Billboard position="0,<?lua print(i*100) ?>,0" material="Examples/Flare" colour="0.5,0.5,0" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--No 6 (smaller)-->
+        <ForceField position="0,500,-500" direction="0,-1,0" diameter=500 velocity=3000 length=1000 />
+        <MovableEntity position="0,500,-500">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.3,0.2" scale=2/>
+                <?lua for i=0,15,1 do ?>
+                    <Billboard position="0,<?lua print(i*(-100)) ?>,0" material="Examples/Flare" colour="0.5,0.3,0.2" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--No 7 (smaller)-->
+        <ForceField position="500,0,-500" direction="0,0,1" diameter=500 velocity=2500 length=750 />
+        <MovableEntity position="500,0,-500">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.5,0.4,0.6" scale=2/>
+                <?lua for i=0,8,1 do ?>
+                    <Billboard position="0,0,<?lua print(i*(100)) ?>" material="Examples/Flare" colour="0.5,0.4,0.6" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--No 8 (smaller)-->
+        <ForceField position="-500,0,500" direction="0,0,-1" diameter=500 velocity=2500 length=750 />
+        <MovableEntity position="-500,0,500">
+            <attached>
+                <Billboard position="0,0,0" material="Flares/ringflare2" colour="0.7,0.4,0.1" scale=2/>
+                <?lua for i=0,8,1 do ?>
+                    <Billboard position="0,0,<?lua print(i*(-100)) ?>" material="Examples/Flare" colour="0.7,0.4,0.1" scale=1/>
+                <?lua end ?>
+            </attached>
+        </MovableEntity>
+
+<!--Invisible Forcefield (immediatly sends the player to the time machine)-->
+        <ForceField position="-2500,2500,800" direction="1,-1,-0.32" diameter=200 velocity=10000 length=880 />
+        <Billboard position="-2500,2500,800" material="Examples/Flare" colour="1,1,1" /> <!--This Billboard looks like a star on the Skybox-->
+    
+    
+    </Scene>
+</Level>
Index: code/trunk/data/levels/tutorial.oxw
===================================================================
--- code/trunk/data/levels/tutorial.oxw	(revision 7677)
+++ code/trunk/data/levels/tutorial.oxw	(revision 7679)
@@ -6,8 +6,8 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
Index: code/trunk/data/levels/underAttack.oxw
===================================================================
--- code/trunk/data/levels/underAttack.oxw	(revision 7679)
+++ code/trunk/data/levels/underAttack.oxw	(revision 7679)
@@ -0,0 +1,167 @@
+<?lua
+  include("HUDTemplates3.oxo")
+  include("stats.oxo")
+  include("underAttackHUD.oxo")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/lodInformation.oxt")
+?>
+
+<Level
+ name         = "UnderAttack testing"
+ description  = "A simple testlevel"
+ gametype     = UnderAttack
+>
+  <templates>
+    <Template link=lodtemplate_default />
+  </templates>
+
+  <Scene
+   ambientlight = "0.5, 0.5, 0.5"
+   skybox       = "Orxonox/skypanoramagen1"
+  >
+    <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" />
+
+    <?lua for i = 1, 30, 1 do ?>
+      <MovableEntity
+          position="<?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>, <?lua print(math.random() * 10000 - 5000) ?>"
+          velocity="<?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>, <?lua print(math.random() * 500 - 250) ?>"
+      >
+        <attached>
+          <Model
+              <?lua x = math.random() * 150 + 30 ?>
+              scale="<?lua print(x) ?>"
+              mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh"
+              position="0,0,0"
+          />
+        </attached>
+          <collisionShapes>
+            <SphereCollisionShape radius=<?lua print(x) ?> position="0,0,0" />
+          </collisionShapes>
+      </MovableEntity>
+    <?lua end ?>
+
+    <Destroyer
+      position          = "100,150,0"
+      collisionType     = dynamic
+      mass              = 100000
+      velocity          = "-35,0,0"
+      angularDamping    = 0.9999999
+      health            = 10000
+      maxhealth         = 10000
+      initialhealth     = 10000
+    >
+
+      <attached>
+        <TeamSpawnPoint team=1 position="150,0,7" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <TeamSpawnPoint team=1 position="0,0,7" lookat="-1,0,0" roll="90"  yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <TeamSpawnPoint team=1 position="-50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <TeamSpawnPoint team=1 position="100,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <TeamSpawnPoint team=1 position="50,0,7" lookat="-1,0,0" roll="90" yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff />
+        <?lua for i = 1, 100, 1 do ?>
+          <TeamSpawnPoint
+            team=0
+            position="<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>,<?lua print((math.random() * 500 + 500) * (math.floor(math.random() + 0.5) * 2 - 1)) ?>"
+            lookat="0,0,0"
+            spawnclass=SpaceShip
+            pawndesign=spaceshipassff
+          />
+
+          <!--more spawnpoints for team1-->
+          <!--
+          <TeamSpawnPoint
+            team=1 position="<?lua print((math.random() * 500 + 500)) ?>,<?lua print((math.random() * 500 + 500) ) ?>,<?lua print((math.random() * 500 + 500)) ?>"
+            lookat="0,0,0"
+            spawnclass=SpaceShip
+            pawndesign=spaceshipassff
+          />-->
+        <?lua end ?>
+
+        <Model mesh="Carrier.mesh" scale="5" />
+        <Backlight
+          mainstate=activity
+          active=false
+          scale=0.4
+          name=bltest
+          position=" 7.6, 0, 6"
+          colour="0.2, 0.65, 1.0, 1.0"
+          width=15
+          length=1500
+          lifetime=2
+          elements=50
+          trailmaterial="Trail/backlighttrail"
+          turnontime=1
+          turnofftime=1
+          material="Flares/ThrusterFlare1"
+        />
+        <?lua for i=0,8,1 do ?>
+          <BlinkingBillboard
+            position="<?lua print(200-270/8*i)?> ,15,2"
+            material="Examples/Flare"
+            colour="1.0, 0.5, 0.3"
+            phase=<?lua print(-360/8*i)?>
+            amplitude=0.1
+            frequency=0.5
+            quadratic=1
+          />
+
+          <BlinkingBillboard
+            position="<?lua print(200-270/8*i)?>,-15,2"
+            material="Examples/Flare"
+            colour="1.0, 0.5, 0.3"
+            phase=<?lua print(-360/8*i)?>
+            amplitude=0.1
+            frequency=0.5
+            quadratic=1
+          />
+        <?lua end ?>
+
+        <Backlight
+          scale=1
+          position=" 169, 75, -15"
+          colour="1, 0.85, 0.5, 0.5"
+          width=40
+          length=1000
+          lifetime=5
+          elements=15
+          trailmaterial="Trail/backlighttrail"
+          material="Examples/Flare"
+        />
+        <Backlight
+          scale=1
+          position=" 169, -75, -15"
+          colour="1, 0.85, 0.5, 0.5"
+          width=40
+          length=1000
+          lifetime=5
+          elements=15
+          trailmaterial="Trail/backlighttrail"
+          material="Examples/Flare" />
+      </attached>
+      <collisionShapes>
+        <BoxCollisionShape position="70,0,-25"      halfExtents="150, 50, 25" />
+        <BoxCollisionShape position="95,75,-16"     halfExtents="70, 10, 12" />
+        <BoxCollisionShape position="95,-75,-16"    halfExtents="70, 10, 12" />
+        <BoxCollisionShape position="77,47,30"      halfExtents="110, 2, 30" />
+        <BoxCollisionShape position="77,-47,30"     halfExtents="110, 2, 30" />
+        <BoxCollisionShape position="77,0,50"       halfExtents="110, 45, 6" />
+        <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
+      </collisionShapes>
+    </Destroyer>
+
+    <GlobalShader compositor="Bloom" visible=false>
+      <events>
+        <visibility>
+          <DistanceTrigger position="0,0,0" distance=30 target="Spectator" switch=true />
+        </visibility>
+      </events>
+    </GlobalShader>
+
+    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
+    <StaticEntity position="0,0,0" collisionType=static>
+      <collisionShapes>
+        <SphereCollisionShape radius="20" />
+      </collisionShapes>
+    </StaticEntity>
+    
+  </Scene>
+</Level>
Index: code/trunk/data/levels/waypoints.oxw
===================================================================
--- code/trunk/data/levels/waypoints.oxw	(revision 7677)
+++ code/trunk/data/levels/waypoints.oxw	(revision 7679)
@@ -6,10 +6,10 @@
 
 <?lua
-  include("hudtemplates3.oxo")
+  include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_H2.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
+  include("templates/spaceshipAssff.oxt")
+  include("templates/spaceshipH2.oxt")
+  include("templates/spaceshipPirate.oxt")
+  include("templates/lodInformation.oxt")
 ?>
 
