Index: code/branches/dockingsystem2/data/levels/docking.oxw
===================================================================
--- code/branches/dockingsystem2/data/levels/docking.oxw	(revision 8257)
+++ code/branches/dockingsystem2/data/levels/docking.oxw	(revision 8382)
@@ -17,5 +17,5 @@
 >
   <templates>
-    <Template link=lodtemplate_default />
+    <Template link="lodtemplate_default" />
   </templates>
 
@@ -25,13 +25,13 @@
   >
 
-    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0" />
+    <Light type="directional" position="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() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+      <SpawnPoint position="<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>,<?lua print(math.random() * 500 - 250) ?>" lookat="0,0,0" spawnclass="SpaceShip" pawndesign="spaceshipassff" />
     <?lua end ?>
 
     <Dock position="-50,-100,50">
             <effects>
-                <DockToShip target="asdf" />
+                <DockToShip target="theDestroyer" />
             </effects>
             <events>
@@ -41,5 +41,5 @@
             </events>
             <attached>
-                <DistanceTrigger position="0,0,0" distance="20" target="Pawn" beaconMode="exclude" targetname="beacon1" name="dockMe" />
+                <DistanceTrigger position="0,0,0" distance="20" target="Pawn" beaconMode="exclude" targetname="destroyerBeacon" name="dockMe" />
                 <Billboard material="Examples/Flare" colour="1.0, 0, 0" />
             </attached>
@@ -47,24 +47,26 @@
 
 
+    
+
       <SpaceShip
-   hudtemplate            = spaceshiphud
-   camerapositiontemplate = spaceshipassffcameras
-   engine                 = spaceshipassffengine
+   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;
+   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
+   mass              = "100"
+   linearDamping     = "0.7"
+   angularDamping    = "0.9999999"
   >
     <attached>
@@ -72,8 +74,8 @@
         <DockingTarget name="asdf" />
 
-      <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-->
+      <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" />
     </attached>
     <collisionShapes>
@@ -90,34 +92,36 @@
   </SpaceShip>
 
-
-    <!--  <Destroyer
+    
+
+
+    <Destroyer
       position          = "100,150,0"
-      collisionType     = dynamic
-      mass              = 100000
+      collisionType     = "dynamic"
+      mass              = "100000"
       velocity          = "0,0,0"
-      angularDamping    = 0.9999999
-      health            = 10000
-      maxhealth         = 10000
-      initialhealth     = 10000
+      angularDamping    = "0.9999999"
+      health            = "10000"
+      maxhealth         = "10000"
+      initialhealth     = "10000"
     >
 
       <attached>
-        
-        <DistanceTriggerBeacon name="beacon1" />
-        <DockingTarget name="asdf" />
-
-
-        <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 />
+
+        <DistanceTriggerBeacon name="destroyerBeacon" />
+        <DockingTarget name="theDestroyer" />
+
+
+        <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
+            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
+            spawnclass="SpaceShip"
+            pawndesign="spaceshipassff"
           />
         <?lua end ?>
@@ -125,19 +129,41 @@
         <Model mesh="Carrier.mesh" scale="5" />
         <Backlight
-          mainstate=activity
-          active=false
-          scale=0.4
-          name=bltest
+          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
+          width="15"
+          length="1500"
+          lifetime="2"
+          elements="50"
           trailmaterial="Trail/backlighttrail"
-          turnontime=1
-          turnofftime=1
+          turnontime="1"
+          turnofftime="1"
           material="Flares/ThrusterFlare1"
         />
+        <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"
+         />
         <?lua for i=0,8,1 do ?>
           <BlinkingBillboard
@@ -146,7 +172,7 @@
             colour="1.0, 0.5, 0.3"
             phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
+            amplitude="0.1"
+            frequency="0.5"
+            quadratic="1"
           />
 
@@ -156,31 +182,10 @@
             colour="1.0, 0.5, 0.3"
             phase="<?lua print(-360/8*i)?>"
-            amplitude=0.1
-            frequency=0.5
-            quadratic=1
+            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>
@@ -193,6 +198,6 @@
         <BoxCollisionShape position="167,0,70"      halfExtents="17, 20, 20" />
       </collisionShapes>
+
     </Destroyer>
-    //-->
 
   </Scene>
