[Orxonox-commit 480] r2160 - in media/levels: includes templates

[landauf at orxonox.net]

Author: landauf
Date: 2009-05-25 04:22:22 +0200 (Mon, 25 May 2009)
New Revision: 2160

Modified:
   media/levels/includes/weaponsettings_pirate.oxi
   media/levels/templates/spaceship_assff.oxt
Log:
adapted weaponsettings to the new weaponsystem in the trunk. If you're using a branch, try to keep the old files (or change line 37 in spaceship_assff.oxt back to weaponsettings1.oxi).

Modified: media/levels/includes/weaponsettings_pirate.oxi
===================================================================
--- media/levels/includes/weaponsettings_pirate.oxi	2009-05-25 01:27:58 UTC (rev 2159)
+++ media/levels/includes/weaponsettings_pirate.oxi	2009-05-25 02:22:22 UTC (rev 2160)
@@ -7,22 +7,31 @@
       <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>
+        <links>
+          <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+          <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+        </links>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="195"/>
+            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="2,0.2,-20" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
+        <Weapon>
+          <attached>
+            <Model mesh="hs-w01.mesh" roll="165"/>
+            <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,-0.5,0"/>
+          </attached>
+          <HsW01 mode=0 munitionpershot=0 delay=0  material="Flares/point_lensflare"muzzleoffset="2,-0.2,-20" />
+          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-2,0.2,-20" />
+          <!--LaserFire mode=0 munitionpershot=0 muzzleoffset="0,0,-25" /-->
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,5,0" />
+          <LaserFire mode=1 damage=1 munitionpershot=0 reloadtime=1 muzzleoffset="0,-5,0" />
+        </Weapon>
       </WeaponPack>
-    </weapons>
+    </weapons>
\ No newline at end of file

Modified: media/levels/templates/spaceship_assff.oxt
===================================================================
--- media/levels/templates/spaceship_assff.oxt	2009-05-25 01:27:58 UTC (rev 2159)
+++ media/levels/templates/spaceship_assff.oxt	2009-05-25 02:22:22 UTC (rev 2160)
@@ -34,7 +34,7 @@
       <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
     </collisionShapes>
 <?lua
-  include("levels/includes/weaponsettings1.oxi")
+  include("levels/includes/weaponsettings2.oxi")
 ?>
   </SpaceShip>
 </Template>