Changeset 5502

Timestamp:

May 11, 2009, 4:02:34 PM (16 years ago)

Author:

jsmely

Message:

weapon updated

Location:

data/media

Files:

• levels/presentation_dm.oxw (modified) (1 diff)
• levels/spaceshiptemplates_presentation.oxw (modified) (1 diff)
• levels/tutorial.oxw (modified) (1 diff)
• levels/weaponsettings2.oxw (modified) (2 diffs)
• materials/scripts/Flares.material (modified) (1 diff)
• materials/scripts/LightningGun-s.material (added)
• materials/scripts/LightningGun-s.tga (added)
• materials/scripts/LightningGun.material (added)
• materials/textures/LightningBall_1.tga (added)
• materials/textures/LightningBall_2.tga (added)
• materials/textures/LightningBall_3.tga (added)
• materials/textures/LightningBall_4.tga (added)
• materials/textures/LightningBall_5.tga (added)
• materials/textures/LightningBall_6.tga (added)
• materials/textures/LightningBall_7.tga (added)
• materials/textures/LightningBall_8.tga (added)
• materials/textures/LightningGun.tga (added)
• models/LightningGun-s.mesh (added)
• models/LightningGun.mesh (added)

data/media/levels/presentation_dm.oxw

@@ -32 +32 @@
       </events>
     </GlobalShader>
-    <Model position="0,0,0" scale=8 mesh="ast1.mesh" />
-    <StaticEntity position="0,0,0" collisionType=static>
+
+<?lua
+for i = 1, 50, 1 
+do
+j = math.random()
+?>
+    
+    <MovableEntity position="<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000-2000) ?>,<?lua print(math.random() * 3000 - 2000) ?>" collisionType=dynamic linearDamping=0.8 angularDamping=0.8 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="20" />
+        <SphereCollisionShape radius="<?lua print(j * 70) ?>" />
       </collisionShapes>
-    </StaticEntity>
+    </MovableEntity>
+<?lua 
+end
+?>
+
 <!--
 <?lua

data/media/levels/spaceshiptemplates_presentation.oxw

@@ -35 +35 @@
     </collisionShapes>
 <?lua
-  include("levels/weaponsettings1.oxw")
+  include("levels/weaponsettings2.oxw")
 ?>
   </SpaceShip>

data/media/levels/tutorial.oxw

@@ -26 +26 @@
     <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" />
 
+<Drone primaryThrust=100 auxiliaryThrust=100 rotationThrust=100 mass = 50 linearDamping = 0.9 angularDamping = 0.7>
+  <attached>
+    <Model scale="10" mesh="Cylinder.mesh"/>
+  </attached>
+  <collisionShapes>
+    <BoxCollisionShape position="0,0,0"      halfExtents="10, 10, 10" />
+  </collisionShapes>
+</Drone>
 
 <Drone primaryThrust="100" auxilaryThrust="30" rotationThrust="10"

data/media/levels/weaponsettings2.oxw

@@ -16 +16 @@
         <Weapon>
           <attached>
-            <Model mesh="hs-w01.mesh" />
+            <Model mesh="LightningGun.mesh" pitch="78" roll="90" yaw="90" position="0,-1.3,0" scale="0.5,0.5,0.5"/>
+            <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" scale="0.5,0.5,0.5"/>
           </attached>
-          <LaserFire mode=0 muzzleoffset="0,0,-25" />
+          <LightningGun mode=0 muzzleoffset="0,0,-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" />
@@ -24 +25 @@
         <Weapon>
           <attached>
-            <Model mesh="hs-w01.mesh" />
+            <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" scale="0.5,0.5,0.5"/>
+            <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" scale="0.5,0.5,0.5"/>
           </attached>
-          <LaserFire mode=0 muzzleoffset="0,0,-25" />
+          <LightningGun mode=0 muzzleoffset="0,0,-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" />

data/media/materials/scripts/Flares.material

@@ -128 +128 @@
         }
 }
+
+material Flares/LightningBall_1
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_1.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_2
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_2.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_3
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_3.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_4
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_4.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_5
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_5.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_6
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_6.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_7
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_7.tga
+                        }
+                }
+        }
+}
+
+material Flares/LightningBall_8
+{
+        technique
+        {
+                pass
+                {
+                        lighting off
+                        scene_blend add
+                        depth_write off
+
+                        texture_unit
+                        {
+                                texture LightningBall_8.tga
+                        }
+                }
+        }
+}