[Orxonox-commit 224] r2070 - media/levels

[polakma at orxonox.net]

Author: polakma
Date: 2009-04-02 16:09:49 +0200 (Thu, 02 Apr 2009)
New Revision: 2070

Added:
   media/levels/weaponsettings1.oxw
Modified:
   media/levels/spaceshiptemplates_presentation.oxw
Log:
committing the right weaponsettings

Modified: media/levels/spaceshiptemplates_presentation.oxw
===================================================================
--- media/levels/spaceshiptemplates_presentation.oxw	2009-04-01 18:51:39 UTC (rev 2069)
+++ media/levels/spaceshiptemplates_presentation.oxw	2009-04-02 14:09:49 UTC (rev 2070)
@@ -33,24 +33,9 @@
       <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes>
-    <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="1.0" speed="1250" />
-        <LaserGun position="0,0,0" munitionType="LaserGunMunition" bulletLoadingTime="0.2" magazineLoadingTime="1.0" speed="1250" />
-      </WeaponPack>
-      <WeaponPack firemode=1>
-        <Fusion position="0,0,0" munitionType="LaserGunMunition" bulletLoadingTime="0.5" magazineLoadingTime="0" speed="500" />
-      </WeaponPack>
-    </weapons>
+<?lua
+  include("levels/weaponsettings1.oxw")
+?>
   </SpaceShip>
 </Template>
 

Added: media/levels/weaponsettings1.oxw
===================================================================
--- media/levels/weaponsettings1.oxw	                        (rev 0)
+++ media/levels/weaponsettings1.oxw	2009-04-02 14:09:49 UTC (rev 2070)
@@ -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="3"
+            magazineLoadingTime="3"
+            speed="600"
+            unlimitedMunition=false
+        />
+      </WeaponPack>
+    </weapons>