Changeset 5550 for data

Timestamp:

May 25, 2009, 3:01:34 PM (16 years ago)

Author:

jsmely

Message:

end version

Location:

data/media

Files:

• levels/includes/weaponsettings3.oxi (added)
• levels/presentation_dm.oxw (modified) (3 diffs)
• levels/templates/spaceship_assff.oxt (modified) (1 diff)
• materials/scripts/LightningGun-s.material (modified) (1 diff)
• materials/scripts/LightningGun.material (modified) (1 diff)
• materials/textures/Lightning_gun4.tga (added)
• materials/textures/Lightning_gun_pic2.tga (added)

data/media/levels/presentation_dm.oxw

@@ -17 +17 @@
 
 
-<Model mesh="can.mesh" scale=10 position="0,0,-100" />
-
-
 <?lua
-for i = 1, 10, 1
+for i = 1, 10, 1 
 do ?>
     <SpawnPoint position="<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>,<?lua print(math.random() * 1000 - 500) ?>" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-<?lua
+<?lua 
 end
 ?>
-    <Model position="1,2,3" mesh="cube.mesh" />
-
 
     <GlobalShader compositor="Bloom" visible=false>
@@ -40 +35 @@
 
 <?lua
-for i = 1, 50, 1
+for i = 1, 100, 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 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) ?>">
+    
+    <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 * 50) ?> 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) ?> mass=<?lua print(j * 30) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
+        <Model position="0,0,0" scale=<?lua print(j * 10) ?> mesh="ast<?lua print( math.mod(i,6) + 1) ?>.mesh" />
       </attached>
       <collisionShapes>
@@ -53 +48 @@
       </collisionShapes>
     </MovableEntity>
-<?lua
+<?lua 
 end
 ?>

data/media/levels/templates/spaceship_assff.oxt

@@ -35 +35 @@
     </collisionShapes>
 <?lua
-  include("levels/includes/weaponsettings2.oxi")
+  include("levels/includes/weaponsettings3.oxi")
 ?>
   </SpaceShip>

data/media/materials/scripts/LightningGun-s.material

@@ -11 +11 @@
                         texture_unit
                         {
-                                texture LightningGun-s.tga
+                                texture Lightning_gun4.tga
                                 colour_op modulate
                         }

data/media/materials/scripts/LightningGun.material

@@ -11 +11 @@
                         texture_unit
                         {
-                                texture LightningGun.tga
+                                texture Lightning_gun4.tga
                                 colour_op modulate
                         }