[Orxonox-commit 3749] r8429 - in code/branches/weapons/data/levels: . includes

[jonas at orxonox.net]

Author: jonas
Date: 2011-05-09 15:38:24 +0200 (Mon, 09 May 2011)
New Revision: 8429

Modified:
   code/branches/weapons/data/levels/emptyLevel.oxw
   code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi
Log:
model attached, flare stimmt, effect noch nicht...

Modified: code/branches/weapons/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/weapons/data/levels/emptyLevel.oxw	2011-05-09 13:29:57 UTC (rev 8428)
+++ code/branches/weapons/data/levels/emptyLevel.oxw	2011-05-09 13:38:24 UTC (rev 8429)
@@ -28,6 +28,8 @@
     skybox       = "Orxonox/Starbox"
   >
 <Model mesh="stunweapon.mesh" position="0,0,0" scale=".5" />
+<ParticleEmitter position="0,0,6.4" source="Orxonox/weaponflare" />
+<ParticleEmitter position="0,0,6.2" source="Orxonox/weaponshoot" />
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     

Modified: code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi
===================================================================
--- code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi	2011-05-09 13:29:57 UTC (rev 8428)
+++ code/branches/weapons/data/levels/includes/weaponSettingsAssff.oxi	2011-05-09 13:38:24 UTC (rev 8429)
@@ -19,19 +19,21 @@
         </links>
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="100" 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_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
+            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="-1.9,-.5,1" scale=".5" />
+	    <BlinkingBillboard position="-1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
           </attached>
-          <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+          <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" >
+		<attached>
+			<ParticleEmitter position="0,0,6.2" source="Orxonox/weaponshoot" />
+		</attached>
+	  </HsW01>
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
           <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
         </Weapon>
         <Weapon>
           <attached>
-            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
-            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
-            <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
+            <Model mesh="stunweapon.mesh" pitch="180" roll="0" yaw="0" position="1.9,-.5,1" scale=".5"/>
+	    <BlinkingBillboard position="1.9, -.5, -5.5" material="PE/lensflare" colour="0.128, 0.28, 1" amplitude=0.25 frequency=16 quadratic=0 />
           </attached>
           <HsW01 mode=0 munitionpershot=0 delay=0     damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
           <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />