Index: code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi
===================================================================
--- code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi	(revision 9175)
+++ code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi	(revision 9213)
@@ -1,6 +1,6 @@
      <weaponslots>
       <WeaponSlot position="-15.0,-1.5,0" />
-      <!--WeaponSlot position=" 15.0,-1.5,0" /-->
-      <!--WeaponSlot position="    0,   0,0" /-->
+      <WeaponSlot position=" 15.0,-1.5,0" />
+      <WeaponSlot position="    0,   0,0" />
     </weaponslots>
     <weaponsets>
@@ -20,14 +20,14 @@
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" scale=1/>
-            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale=1 />
-            <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,0.3" scale=100 />
+            <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" scale=20/>
+            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale=20 />
+            <Model mesh="hs-w01_reduced.mesh" roll="45" pitch="-76" yaw="-45" position="-1.5,1,200" scale=20 />
           </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" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.005 damage=31.4159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=314.159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
           <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
         </Weapon>
         
-        <!--Weapon>
+        <Weapon>
           <attached>
             <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
@@ -38,9 +38,9 @@
           <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>
+        </Weapon>
+        <Weapon>
           <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
-        </Weapon-->
+        </Weapon>
         
       </WeaponPack>
Index: code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt
===================================================================
--- code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt	(revision 9175)
+++ code/branches/newlevel2012/data/levels/templates/spaceshipPirate.oxt	(revision 9213)
@@ -35,9 +35,10 @@
    angularDamping    = 0.9999999
   >
+
     <engines>
       <MultiStateEngine position=" 0, 0, 0" template=spaceshippirateengine />
     </engines>
     <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="pirate.mesh" />
+      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=20 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"/>
Index: code/branches/newlevel2012/data/levels/templates/tower.oxt
===================================================================
--- code/branches/newlevel2012/data/levels/templates/tower.oxt	(revision 9175)
+++ code/branches/newlevel2012/data/levels/templates/tower.oxt	(revision 9213)
@@ -9,11 +9,16 @@
 
    collisionType     = "dynamic"
-   team = 13
+   team = 2
+
 
   >
 
-     <controller>
+   
+
+  <controller>
         <WaypointPatrolController alertnessradius=10000 team=5>
-       
+       		 <waypoints>
+            <Model mesh="cube.mesh" scale=20 position=" 700, 200, 100" />
+          </waypoints>
         </WaypointPatrolController>
       </controller>
@@ -21,5 +26,5 @@
 
     <attached>
-      <Model position="0,0,0" scale=50 mesh="Tower_ME.mesh" />
+      <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
     </attached>
 
Index: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw	(revision 9175)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw	(revision 9213)
@@ -76,10 +76,10 @@
  	<!--SpawnPoint team=0 position="0,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
  	
-	<SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=10>
+	<SpaceShip position="-700,-500, 100" lookat="0,0,0" scale=2 team=1 >
       <templates>
         <Template link=spaceshipassff />
       </templates>
       <controller>
-        <WaypointController accuracy=40>
+        <WaypointController accuracy=60>
           <waypoints>
 			  <!-- 1,3 10,3 10,11, 13,11 -->
