[Orxonox-commit 270] r2086 - media/levels

[landauf at orxonox.net]

Author: landauf
Date: 2009-04-18 18:16:39 +0200 (Sat, 18 Apr 2009)
New Revision: 2086

Added:
   media/levels/weaponsettings2.oxw
Modified:
   media/levels/weaponsettings1.oxw
Log:
Added a second weaponsettings-file for the new features in the "weapons" branch. If you use this branch, change line 37 in spaceshiptemplates_presentation.oxw to include the new file.

Modified: media/levels/weaponsettings1.oxw
===================================================================
--- media/levels/weaponsettings1.oxw	2009-04-18 12:34:41 UTC (rev 2085)
+++ media/levels/weaponsettings1.oxw	2009-04-18 16:16:39 UTC (rev 2086)
@@ -9,10 +9,6 @@
     </weaponsets>
     <weapons>
       <WeaponPack firemode=0>
-        <links>
-          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
         <LaserGun
             position="0,0,0"
             munitionType="LaserGunMunition"
@@ -31,12 +27,9 @@
         />
       </WeaponPack>
       <WeaponPack firemode=1>
-        <links>
-          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
-        </links>
-        <LaserGun
+        <Fusion
             position="0,0,0"
-            munitionType="LaserGunMunition"
+            munitionType="FusionMunition"
             bulletLoadingTime="0.3"
             magazineLoadingTime="3"
             speed="600"

Added: media/levels/weaponsettings2.oxw
===================================================================
--- media/levels/weaponsettings2.oxw	                        (rev 0)
+++ media/levels/weaponsettings2.oxw	2009-04-18 16:16:39 UTC (rev 2086)
@@ -0,0 +1,33 @@
+    <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>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon munitionType="FusionMunition">
+          <LaserFire mode=0 />
+        </Weapon>
+        <Weapon munitionType="FusionMunition">
+          <LaserFire mode=0 />
+          <aLaserFire mode=1 muzzleoffset="5,0,0" />
+          <aLaserFire mode=1 muzzleoffset="-5,0,0" />
+        </Weapon>
+      </WeaponPack>
+      <WeaponPack>
+        <links>
+          <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+        </links>
+        <Weapon munitionType="FusionMunition">
+          <FusionFire mode=0 />
+        </Weapon>
+      </WeaponPack>
+    </weapons>


Property changes on: media/levels/weaponsettings2.oxw
___________________________________________________________________
Added: svn:eol-style
   + native