Changeset 7052 for code/branches/fps/data/levels

Timestamp:

May 31, 2010, 3:40:41 PM (14 years ago)

Author:

freicy

Message:

by Cyrill Frei

Location:

code/branches/fps/data/levels

Files:

• includes/weaponsettings_fps.oxi (modified) (2 diffs)
• presentation_FS10.oxw (modified) (3 diffs)
• templates/fps.oxt (modified) (2 diffs)

code/branches/fps/data/levels/includes/weaponsettings_fps.oxi

@@ -1 +1 @@
     <weaponslots>
-      <WeaponSlot position="0,-6,0.5" yaw=0 pitch=0 roll=0 />
- <!--     <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
+      <WeaponSlot position="0,0,0" yaw=0 pitch=0 roll=0 />
+ <!--      <WeaponSlot position="-0.5,0.8,2.5" 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>
@@ -16 +17 @@
         </links>
         <Weapon>
-          <attached>
-            <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
-            <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 />
-            <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 />
-          </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" />
-          <HsW01 mode=0 munitionpershot=0 delay=0     material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" />
-          <LightningGun mode=1 muzzleoffset="0,0,0" />
+           <HsW01 mode=0 munitionpershot=0 delay=0.0 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5, -4" />
+           <LightningGun mode=1 muzzleoffset="0,0,0" />
         </Weapon>
         <LaserGun

code/branches/fps/data/levels/presentation_FS10.oxw

@@ -23 +23 @@
   <Pawn health=100 position="600,35,0" direction="0,-1,0" collisionType=dynamic mass=100000>
       <attached>
-        <Model position="0,0,0" mesh="crate.mesh" scale3D="5,5,5" />
+        <Model position="0,0,0" mesh="fish.mesh" scale3D="5,5,5" />
       </attached>
       <collisionShapes>
@@ -83 +83 @@
       </collisionShapes>
   </StaticEntity>
+  
 <?lua
 for i = 1, 10, 1
@@ -91 +92 @@
 ?>
 
-<!--
-<?lua
-for i = 1, 200, 1
-do
-j = math.random()
-?>
 
-    <MovableEntity position="<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000-2000) ?>,<?lua print(math.random() * 5000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0 mass=<?lua print(j * 100) ?> scale=<?lua print(j * 5) ?> rotationaxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationrate="<?lua print(math.random() * 30 + 5) ?>" >
-      <attached>
-        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
-      </attached>
-      <collisionShapes>
-        <SphereCollisionShape radius="<?lua print(j * 100) ?>" />
-      </collisionShapes>
-    </MovableEntity>
-<?lua
-end
-?>
--->
   </Scene>
 </Level>

code/branches/fps/data/levels/templates/fps.oxt

@@ -2 +2 @@
   <FpsPlayer
    hudtemplate            = fpshud
-   camerapositiontemplate = fpscamera
- 
+   
    spawnparticlesource    = "Orxonox/fairytwirl"
    spawnparticleduration  = 3
@@ -21 +20 @@
    angularDamping    = 0.9999999
    friction          = 0.01
+   
+   weapon            = "hs-w01.mesh"
   >
- <!--   <attached>
-      <Model position="0,0,0" yaw=90 pitch=-90 roll=0 scale=4 mesh="assff.mesh" />
-      <BlinkingBillboard position="17,-1.5,0" material="Examples/Flare" colour="1.0, 0.5, 0.3" amplitude=0.1 frequency=0.5 quadratic=1 />
-      <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
-    </attached>
--->
     <collisionShapes>
-      <BoxCollisionShape position="0,0,0" halfExtents="7,7,7" />
-    <!--
-      <SphereCollisionShape radius="10" />
-      
-      <BoxCollisionShape position="0,0,0"      halfExtents="10, 3, 5" />
-      <BoxCollisionShape position="13,-1.3,0"  halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" />
-      <BoxCollisionShape position="0,0,7"      halfExtents="3, 2, 2" />
-      <BoxCollisionShape position="0,0.1,-11"  halfExtents="2.2, 1.8, 6" />
-      <BoxCollisionShape position="0,0.1,-19"  halfExtents="1.4, 1, 2" />
-    -->
+      <BoxCollisionShape position="0,0,0" halfExtents="8,20,8" />
     </collisionShapes>
+    
+    <camerapositions>
+      <CameraPosition position="-0.5,0.8,2.5" drag=false mouselook=true />
+    </camerapositions>
+    
+    <?lua
+        include("includes/weaponsettings_fps.oxi")
+    ?>
 
-<?lua
-  include("includes/weaponsettings_fps.oxi")
-?>
   </FpsPlayer>
 </Template>
-
+<!--
 <Template name=fpscamera defaults=0>
   <FpsPlayer>
     <camerapositions>
       <CameraPosition position="0,0,20" drag=false mouselook=true />
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
+      
+      <!--
+      CameraPosition position="0,150,-25" pitch=-90 drag=true />
       <CameraPosition position="0,0,-40" yaw=180 drag=true />
       <CameraPosition position="0,3,-14" yaw=0 />
       <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
+      <CameraPosition position="50,5,-8" yaw=90 drag=true /
+      
     </camerapositions>
   </FpsPlayer>
 </Template>
+-->