[Orxonox-commit 2340] r7055 - in code/branches/fps/data/levels: includes templates

[freicy at orxonox.net]

Author: freicy
Date: 2010-05-31 16:10:35 +0200 (Mon, 31 May 2010)
New Revision: 7055

Modified:
   code/branches/fps/data/levels/includes/weaponsettings_fps.oxi
   code/branches/fps/data/levels/templates/fps.oxt
Log:
by Cyrill Frei

Modified: code/branches/fps/data/levels/includes/weaponsettings_fps.oxi
===================================================================
--- code/branches/fps/data/levels/includes/weaponsettings_fps.oxi	2010-05-31 14:03:06 UTC (rev 7054)
+++ code/branches/fps/data/levels/includes/weaponsettings_fps.oxi	2010-05-31 14:10:35 UTC (rev 7055)
@@ -16,7 +16,7 @@
           <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
         </links>
 	<Weapon>
-	   <HsW01 mode=0 munitionpershot=0 delay=0.0 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5, -4" />
+	   <HsW01 mode=0 munitionpershot=0 delay=0.0 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
            <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
         <LaserGun
@@ -24,7 +24,7 @@
             munitionType="LaserGunMunition"
             bulletLoadingTime="0.2"
             magazineLoadingTime="5.0"
-            speed="250"
+            speed="1000"
             unlimitedMunition=true
         />
   <!--       <LaserGun

Modified: code/branches/fps/data/levels/templates/fps.oxt
===================================================================
--- code/branches/fps/data/levels/templates/fps.oxt	2010-05-31 14:03:06 UTC (rev 7054)
+++ code/branches/fps/data/levels/templates/fps.oxt	2010-05-31 14:10:35 UTC (rev 7055)
@@ -23,11 +23,11 @@
    weapon            = "hs-w01.mesh"
   >
     <collisionShapes>
-      <BoxCollisionShape position="0,-20,0" halfExtents="8,25,8" />
+      <BoxCollisionShape position="0,-20,0" halfExtents="10,25,10" />
     </collisionShapes>
     
     <camerapositions>
-      <CameraPosition position="0,0,0" drag=false mouselook=true />
+      <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
     </camerapositions>
     
     <?lua