Index: code/branches/presentation3/data/levels/Level(Deathmatch).oxw
===================================================================
--- code/branches/presentation3/data/levels/Level(Deathmatch).oxw	(revision 7060)
+++ 	(revision )
@@ -1,430 +1,0 @@
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("underattackhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_Transporter.oxt")
-  include("templates/lodinformation.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>
-
-<!--*****************************************************************************************************************************************************************************************-->
-<!-- Ausgang: Level ===> name/description -->
-<Level
-  name="Level"
-  description="Level zerstoeren von Transportern"
-  gametype=TeamDeathmatch
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-	<!-- Ausgang: Szene ===> ambientlight/skybox -->
-	<Scene
-	  ambientlight="0.8,0.8,0.8"
-	  skybox="Orxonox/skypanoramagen1"
-	>
-		
-		<!--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 ==> id/title/description/failMessage/completeMessage-->
-	<GlobalQuest id="Levelname.nameofQuest1.testsasimplequesttoseehowitworks">    <!--QUESTIDS MUST HAVE AT LEAST 32 CHARACTERS-->
-		<QuestDescription title="ErkundungsFlug" description="Ein Erkundungsflug durch die Skybox!" failMessage="You failed!" completeMessage="You win!" />
-	</GlobalQuest>
-
-
-<!--QuestEnd-->
-<!--*****************************************************************************************************************************************************************************************-->
-
-		<!--Spieler Spawnpoint ===> position/direction-->
-		<SpawnPoint position="150,0,-50" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="true" name=spawn1> 
-			<events>
-				<activity>
-					<EventListener event="activateFirstSpawnpoint" />
-				</activity>
-			</events>
-			<attached>
-			    <Billboard position="0,0,0" colour="0,1.0,0" material="Examples/Flare"/>
-			</attached>
-		</SpawnPoint>
-
-		<SpawnPoint position="10000,0,3000" direction="2000,0,-1000" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0 active="false" name=spawn2> 
-			<events>
-				<activity>
-					<EventListener event="activateSecondSpawnpoint" />
-				</activity>
-			</events>
-			<attached>
-			    <Billboard position="0,0,0" colour="1.0,0,0" material="Examples/Flare"/>
-			</attached>
-		</SpawnPoint>
-
-
-<!--Auslosen der 1 testQuest-->
-<!-- Funktioniert noch nicht (Fehler beim mehrfachen Ausfuehren)-->
-<!--		<QuestEffectBeacon position="1000,0,0" times="1">
-			<effects>
-				<AddQuest questId="Levelname.nameofQuest1.testsasimplequesttoseehowitworks"/>
-			</effects>
-			<events>
-				<execute>
-					<EventListener event="Levelnamequest1"/>
-				</execute>
-			</events>
-			<attached>
-				<Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare"/>
-				<DistanceTrigger name="Levelnamequest1" position="0,0,0" distance="50" target="ControllableEntity"/>
-			</attached>
-		</QuestEffectBeacon><!---->
-
-<!--Erstellen der Transporter________nur noch zwei_________________________________________________________________________________________________________________________________________OK-->
-
-
-<?lua for i=0,0,1 do
-x=800
-health=1600
-?>
-		<!--Transporter 1 ++ FUNKTIONIERT-->
-	<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 ++ FUNKTIONIERT-->
-	<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 ?>
-
-
-<!--Erstellen der Transporter______ENDE______________________________________________________________________________________________________________________________________________________-->
-
-<!--Erstellen der Schiffe des ErkundungsTrupps_____________________________________________________________________________________________________________________________________________OK-->
-		<!--Spaceships team 0 (player:team=0)FUNKTIONIERT-->
-		<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)FUNKTIONIERT-->
-		<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)FUNKTIONIERT-->
-		<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>
-<!--Erstellen der Schiffe des ErkundungsTrupps ______ENDE ___________________________________________________________________________________________________________________________________-->
-
-
-<!--Erstellen des Asteroidenfeldes___FUNKTIONIERT_________________________________________________________________________________________________________________________________________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 ?>
-
-<!--Erstellen des Ateroidenfeldes______ENDE__________________________________________________________________________________________________________________________________________________-->
-
-<!--Erstellen von Asteroiden die zufaellig plaziert sind___________________________________________________________________________________________________________________________________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 ?>
-
-<!--Erstellen von Asteroiden die zufaellig plaziert sind______ENDE___________________________________________________________________________________________________________________________-->
-
-<!--Erstellen der Hilfsschiffe_____________________________________________________________________________________________________________________________________________________________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 ?>
-
-<!---->
-<!--Erstellen der Hilfsschiffe______ENDE_____________________________________________________________________________________________________________________________________________________-->
-
-<!--Erstellen von Feinden die den Transportern zu Hilfe eilen_______________________________________________________________________________________________________________________________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-4000) ?>,<?lua print(y) ?>,<?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 ?>
-<!---->
-<!--Erstellen von Feinden die dem Transporter zu Hilfe eilen_________________________________________________________________________________________________________________________________-->
-
-<!--Erstellen von Feinden auf dem Weg zu den Transportern___________________________________________________________________________________(noch besser machen [mehr Feinde/ Koordinierung])-->
-<?lua for i=0,1,1 do 
-z=math.random(-300,300)
-?>
-		<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>
-
-
-		<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 ?>
-
-<?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 ?>
-<!--Erstellen von Feinden auf dem Weg zu den Transportern______ENDE__________________________________________________________________________________________________________________________-->
-
-<Trigger name=activateFirstSpawnpoint invert=true >
-    <DistanceTrigger name="activateSecondSpawnpoint" position="150,0,-300" distance="10" target="DistanceTriggerBeacon" targetname="PlayerDistanceTrigger" activations="1" stayactive="true">
-        <attached>
-                <Billboard position="0,0,0" colour="0,0,1.0" material="Examples/Flare" />
-        </attached>
-    </DistanceTrigger>
-</Trigger>
-
-	</Scene>
-</Level>
-
-
-
-
-
-
-
-
-
-
-
-
Index: code/branches/presentation3/data/levels/Level(UnderAttack).oxw
===================================================================
--- code/branches/presentation3/data/levels/Level(UnderAttack).oxw	(revision 7060)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("underattackhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_destroyer.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<!-- Ausgang: Level ===> name/description -->
-<Level
-  name="Level"
-  description="Level zerstoeren von Transportern"
-  gametype=UnderAttack
->
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-	<!-- Ausgang: Szene ===> ambientlight/skybox -->
-	<Scene
-	  ambientlight="0.8,0.8,0.8"
-	  skybox="Orxonox/skypanoramagen1"
-	>
-		
-		<!--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 ==> id/title/description/failMessage/completeMessage-->
-	<GlobalQuest id="Levelname.nameofQuest1.testsasimplequesttoseehowitworks">    <!--QUESTIDS MUST HAVE AT LEAST 32 CHARACTERS-->
-		<QuestDescription title="ErkundungsFlug" description="Ein Erkundungsflug durch die Skybox!" failMessage="You failed!" completeMessage="You win!" />
-	</GlobalQuest>
-
-
-<!--QuestEnd-->
-<!--******************************************************************************************************************************************************************************************-->
-
-		<!--Spieler Spawnpoint ===> position/direction-->
-		<SpawnPoint position="-100,50,0" direction="1000,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff team=0 />
-
-
-		<!--Auslosen der 1 testQuest-->
-<!-- Funktioniert noch nicht Fehler mit einem Argument in Quest-->
-		<QuestEffectBeacon position="1000,0,0" times="1">
-			<effects>
-				<AddQuest questId="Levelname.nameofQuest1.testsasimplequesttoseehowitworks"/>
-			</effects>
-			<events>
-				<execute>
-					<EventListener event="Levelnamequest1"/>
-				</execute>
-			</events>
-			<attached>
-				<Billboard position="0,0,0" colour="1.0,1.0,1.0" material="Examples/Flare"/>
-				<DistanceTrigger name="Levelnamequest1" position="0,0,0" distance="50" target="ControllableEntity"/>
-			</attached>
-		</QuestEffectBeacon>
-
-		<!--Destroyer 1 ++ Benutzen des spaceship_destroyer template (Fehler mit dem Ziel ==> muss nur den letzten transporter zerstoeren) ==> health/maxHealth/initialHealth-->
-		<Destroyer
-			position="3000,0,3000"
-			velocity="-25,0,0"
-			template=spaceshipDestroyer
-			health=1000
-			maxHealth = 1000
-			initialHealth = 1000
-		>
-		</Destroyer>
-
-<!--Erstellen der Schiffe des ErkundungsTrupps__________________________________________________________________-->
-		<!--Spaceships team 0 (player:team=0)-->
-		<SpaceShip position="75,0,0" lookat="1000,0,0" >
-	  		<templates>
-	   			<Template link=spaceshipassff />
-	 		</templates>
-	  		<controller>
-				<WaypointPatrolController alertnessradius=1000 team=0>
-					<waypoints>
-						<Model mesh="cube.mesh" scale=0 position="3025,0,0" />
-            					<Model mesh="cube.mesh" scale=0 position="4025,0,1000" />
-            					<Model mesh="cube.mesh" scale=0 position="3025,0,3000" />
-					</waypoints>
-				</WaypointPatrolController>
-	  		</controller>
-		</SpaceShip>
-		<!--Second Spaceship team 0 (player: team 0)-->
-		<SpaceShip position="0,0,75" lookat="1000,0,75" >
-	  		<templates>
-	   			<Template link=spaceshipassff />
-	 		</templates>
-	  		<controller>
-				<WaypointPatrolController alertnessradius=1000 team=0>
-					<waypoints>
-						<Model mesh="cube.mesh" scale=0 position="3000,0,25" />
-            					<Model mesh="cube.mesh" scale=0 position="4000,0,1025" />
-            					<Model mesh="cube.mesh" scale=0 position="3000,0,3025" />
-					</waypoints>
-				</WaypointPatrolController>
-	  		</controller>
-		</SpaceShip>
-		<!--third Spaceship team 0 (player: team 0)-->
-		<SpaceShip position="0,0,-75" lookat="1000,0,-75" >
-	  		<templates>
-	   			<Template link=spaceshipassff />
-	 		</templates>
-	  		<controller>
-				<WaypointPatrolController alertnessradius=1000 team=0>
-					<waypoints>
-						<Model mesh="cube.mesh" scale=0 position="3000,0,-25" />
-            					<Model mesh="cube.mesh" scale=0 position="4000,0,975" />
-            					<Model mesh="cube.mesh" scale=0 position="3000,0,2975" />
-					</waypoints>
-				</WaypointPatrolController>
-	  		</controller>
-		</SpaceShip>
-<!--Erstellen der Schiffe des ErkundungsTrupps ______ENDE ______________________________________________-->
-
-
-	</Scene>
-</Level>
Index: code/branches/presentation3/data/levels/empty_level.oxw
===================================================================
--- code/branches/presentation3/data/levels/empty_level.oxw	(revision 7060)
+++ code/branches/presentation3/data/levels/empty_level.oxw	(revision 7061)
@@ -25,25 +25,6 @@
     <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/branches/presentation3/data/levels/mylevel.oxw
===================================================================
--- code/branches/presentation3/data/levels/mylevel.oxw	(revision 7060)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?lua
-  include("stats.oxo")
-  include("hudtemplates3.oxo")
-  include("underattackhud.oxo")
-  include("templates/spaceship_assff.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/spaceship_Transporter.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<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="test" />
-    </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>
-
-<!-- Ausgang: Level ===> name/description -->
-<Level
-  name="Level"
-  description="Level zerstoeren von Transportern"
-  gametype=TeamDeathmatch
->
-
-  <!-- Ausgang: Szene ===> ambientlight/skybox -->
-  <Scene
-    ambientlight="0.8,0.8,0.8"
-    skybox="Orxonox/skypanoramagen1"
-  >
-
-    <!--Light: noch zu aendern -->
-    <Light type=directional position="0,0,0" direction="1000, 0, 0" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 1.0, 0.9" />
-
-    <SpawnPoint position="0,0,0" direction="1000,0,0" spawnclass=SpaceShip pawndesign=spaceshipassffplayer team=0/>
-
-<!--
-    <EventTrigger name="testdestroy" activations=1 stayactive="true">
-      <events>
-        <trigger>
-          <SpaceShip position="2000,0,3000" lookat="0,0,0" team=1>
-            <templates>
-              <Template link=spaceshippirate/>
-            </templates>
-            <controller>
-              <AIController activity="false"/>
-            </controller>
-          </SpaceShip>
-        </trigger>
-      </events>
-    </EventTrigger>
--->
-
-    <SpaceShip position="1000,0,200" lookat="0,0,0">
-      <templates>
-        <Template link=spaceshipassff/>
-      </templates>
-      <controller>
-        <AIController active="false"/>
-      </controller>
-    </SpaceShip>
-
-    <DistanceTrigger name="triggername" position="1000,0,0" distance="500" target="DistanceTriggerBeacon" targetname="test" activations=1 stayactive="true" />
-
-    <SpaceShip position="1000,0,0" lookat="2000,0,0" >
-      <templates>
-        <Template link=spaceshipassff />
-      </templates>
-      <controller>
-        <WaypointPatrolController alertnessradius=5000 team=0 active="false" >
-          <waypoints>
-            <Model mesh="cube.mesh" scale=0 position="2000,0,0" />
-          </waypoints>
-          <events>
-            <activity>
-              <EventListener event="triggername" />
-            </activity>
-          </events>
-        </WaypointPatrolController>
-      </controller>
-    </SpaceShip>
-
-<!-- ZUM ERSTELLEN DER DESTROYTRIGGER
-    <EventTrigger name="triggername" activations=1 stayactive=true >
-      <events>
-        <trigger>
-          <Spaceship />
-        </trigger>
-      </events>
-    </EventTrigger>
-
-    <Spaceship>
-      <controller>
-        <SomeController activity="false">
-          <events>
-            <activity>
-              <EventListener event="triggername" />
-            </activity>
-          </events>
-        </SomeController>
-      </controller>
-    </Spacehip>
--->
-
-  </Scene>
-</Level>
Index: code/branches/presentation3/data/levels/old/presentationLOD.oxw
===================================================================
--- code/branches/presentation3/data/levels/old/presentationLOD.oxw	(revision 7061)
+++ code/branches/presentation3/data/levels/old/presentationLOD.oxw	(revision 7061)
@@ -0,0 +1,35 @@
+<?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>
+  <lodinformation>
+      <MeshLodInformation mesh=ast2.mesh lodQuality=500 />
+  </lodinformation>
+  <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 position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+    <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
+    <Model position="0,-10,0" scale=3 mesh="ast2.mesh"/>
+
+  </Scene>
+</Level>
Index: code/branches/presentation3/data/levels/presentationLOD.oxw
===================================================================
--- code/branches/presentation3/data/levels/presentationLOD.oxw	(revision 7060)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?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>
-  <lodinformation>
-      <MeshLodInformation mesh=ast2.mesh lodQuality=500 />
-  </lodinformation>
-  <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 position="0,0,100" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-    <Model position="0,10,0" scale=3 mesh="ast3.mesh"/>
-    <Model position="0,-10,0" scale=3 mesh="ast2.mesh"/>
-
-  </Scene>
-</Level>
Index: code/branches/presentation3/data/levels/quest_test.oxw
===================================================================
--- code/branches/presentation3/data/levels/quest_test.oxw	(revision 7060)
+++ 	(revision )
@@ -1,367 +1,0 @@
-<?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"
->
-
-    <NotificationQueue
-	     name     = "notification"
-	     position = "0.40, 0.05"
-	     font     = "VeraMono"
-	     textsize = 0.020
-	     length   = 3
-	     width    = 50
-    />
-
-  <templates>
-    <Template link=lodtemplate_default />
-  </templates>
-
-    <Scene
-        ambientlight = "0.3, 0.3, 0.3"
-        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" />
-	      
-	      
-	      <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="There are more of them..." 
-					description="Now you can see it: There are more pirates... the pirates you killed were only a small part of the whole fleet. You recieved 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>
-						<QuestHint id="9930a598-98bc-4ff8-8cc0-31311a6ccaaa">
-						<QuestDescription title=":(" description="Here isn't the base you look for... try another way."/>
-						</QuestHint>
-					</hints>
-				</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 "
-					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 />
-			  </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>
-		
-		
-		
-		<!-- AddSubQuest1 (Questbeacon2)-->
-		<QuestEffectBeacon position="<?lua print(math.random()*100-500)?>,<?lua print(math.random()*100-500)?>,<?lua print(math.random()*200-2000)?>" times=1>
-					<attached>
-						<Billboard position="0,0,0" scale=3 colour="1.0,1.0,0" material="Examples/Flare" />
-						<DistanceTrigger name=questbeacon2  position="0,0,0" distance=200 target="Pawn" />
-					</attached>
-					<effects>
-						<AddQuest questId="3159b4d4-bc86-4190-ba1d-4530668dfe31" />
-					</effects>
-					<events>
-						<execute>
-							<EventListener event=questbeacon2 />
-						</execute>
-					</events>
-			    </QuestEffectBeacon>
-			    
-		<!-- hint (Questbeacon3)-->
-		<QuestEffectBeacon position="0,0,0" times=1>
-					<attached>
-						<DistanceTrigger name=questbeacon3  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me delay="10" />
-					</attached>
-					<effects>
-						<AddQuestHint hintId="2b85f32c-2433-4f1a-bdd4-f24d20c9403c" />
-					</effects>
-					<events>
-						<execute>
-							<EventListener event=questbeacon3 />
-						</execute>
-					</events>
-			    </QuestEffectBeacon>	
-			    
-			    
-		<!-- finish SubQuest (Questbeacon4)-->
-		<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>
-			    
-			    
-		<!-- Navihint 1(Questbeacon5)-->
-		<QuestEffectBeacon position="7600,300,-8000" times=1>
-					<attached>
-						<DistanceTrigger name=questbeacon5  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
-					</attached>
-					<effects>
-						<AddQuestHint hintId="9930a598-98bc-4ff8-8cc0-31311a6ccaaa" />
-					</effects>
-					<events>
-						<execute>
-							<EventListener event=questbeacon5 />
-						</execute>
-					</events>
-			    </QuestEffectBeacon>	
-			    
-		<!-- Navi2(Questbeacon6)-->
-		<QuestEffectBeacon position="4600,5300,-11000" times=1>
-					<attached>
-						<DistanceTrigger name=questbeacon6  position="0,0,0" distance=300 target=DistanceTriggerBeacon targetname=Me />
-					</attached>
-					<effects>
-						<CompleteQuest questId="8d8ed3a6-74a6-4491-9172-26155cff151d" />
-						<AddQuest questId="8a62408b-c47b-4e02-bd3d-06bb9ec0b363" />
-						
-					</effects>
-					<events>
-						<execute>
-							<EventListener event=questbeacon6 />
-						</execute>
-					</events>
-			    </QuestEffectBeacon>
-			    
-		<!--Navigation System-->			    
-	<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
-            ?>
-		
-		
-	<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 />
-                </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>
-
-	
-	
-	
-		<!-- 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 team=0 active=true>
-			  <waypoints>
-			    <StaticEntity position="0,<?lua print(math.random()*50)?> ,<?lua print(i*50 -2000) ?>" />
-			  </waypoints>
-			</WaypointPatrolController>
-		      </controller>
-		      <attached>
-		      </attached>
-		    </SpaceShip>
-		<?lua
-		end
-		?>
-		
-		<?lua
-		for i = 1,2, 1
-		do
-		?>
-		    <SpaceShip position="600,300,-6000">
-		      <templates>
-			<Template link=spaceshippirate />
-		      </templates>
-		      <controller>
-			<WaypointPatrolController alertnessradius=1000 team=0 active=true>
-			  <waypoints>
-			    <StaticEntity position="600,300,-6000" />
-			  </waypoints>
-			</WaypointPatrolController>
-		      </controller>
-		      <attached>
-		      </attached>
-		    </SpaceShip>
-		<?lua
-		end
-		?>
-		
-		
-	<!-- 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>
-		
-		
-	</Scene>
-</Level>
Index: code/branches/presentation3/data/levels/test_ghost.oxw
===================================================================
--- code/branches/presentation3/data/levels/test_ghost.oxw	(revision 7060)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?lua
-  include("hudtemplates3.oxo")
-  include("stats.oxo")
-  include("templates/spaceship_ghost.oxt")
-  include("templates/spaceship_pirate.oxt")
-  include("templates/lodinformation.oxt")
-?>
-
-<Level
- name         = "Presentation09"
- 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=spaceshipghost />
-
-    <?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
-        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
-      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>
