Changeset 10428 for code/branches/ParticleEffectsFS15/data

Timestamp:

May 7, 2015, 2:29:09 PM (10 years ago)

Author:

gpregger

Message:

waste of time + New Explosion in 'rocket.cc' + old Rocket in 'rocketOld.cc' with 'RocketFireOld.cc'

Location:

code/branches/ParticleEffectsFS15/data

Files:

• DefaultResources.oxr (modified) (1 diff)
• levels/emptyLevel.oxw (modified) (2 diffs)
• levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• particle/orxonox_explosionFlame.particle (added)
• particle/orxonox_explosionFlash.particle (added)
• particle/orxonox_explosionShockwave.particle (added)
• particle/orxonox_explosionSparks.particle (added)
• particle/orxonox_explosionStreak1.particle (added)

code/branches/ParticleEffectsFS15/data/DefaultResources.oxr

@@ -10 +10 @@
     <ResourceLocation path = "gui/schemes" />
     <ResourceLocation path = "gui/scripts" />
+    
 </ResourceCollection>

code/branches/ParticleEffectsFS15/data/levels/emptyLevel.oxw

@@ -13 +13 @@
 
 <?lua
-  include("templates/spaceshipAssff2.oxt")
+  include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipEscort.oxt")
@@ -30 +30 @@
 
     <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=spaceshipescort />
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
     
   </Scene>

code/branches/ParticleEffectsFS15/data/levels/includes/weaponSettingsAssff.oxi

@@ -39 +39 @@
         </Weapon>
         <Weapon>
-          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+          <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
           <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
         </Weapon>