Changeset 10485 for code/branches/presentationFS15/data

Timestamp:

May 26, 2015, 12:40:33 PM (10 years ago)

Author:

maxima

Message:

ParticleEffects branch merged to presentation. New level PresentationFS15. New SpaceShip spaceshipFS15 with both RocketFire and RocketFireOld

Location:

code/branches/presentationFS15

Files:

• . (modified) (1 prop)
• data/defaultConfig/keybindings.ini (modified) (1 diff)
• data/levels/emptyLevel.oxw (modified) (2 diffs)
• data/levels/includes/weaponSettingsAssff.oxi (modified) (1 diff)
• data/levels/includes/weaponSettingsFS15.oxi (added)
• data/levels/presentationFS15.oxw (added)
• data/levels/templates/spaceshipFS15.oxt (added)
• data/particle/orxonox_explosionAfterglow.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionAfterglow.particle)
• data/particle/orxonox_explosionFlame.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame.particle)
• data/particle/orxonox_explosionFlame2.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlame2.particle)
• data/particle/orxonox_explosionFlash.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash.particle)
• data/particle/orxonox_explosionFlash2.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionFlash2.particle)
• data/particle/orxonox_explosionShockwave.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave.particle)
• data/particle/orxonox_explosionShockwave2.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionShockwave2.particle)
• data/particle/orxonox_explosionSparks.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks.particle)
• data/particle/orxonox_explosionSparks2.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionSparks2.particle)
• data/particle/orxonox_explosionStreak1.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak1.particle)
• data/particle/orxonox_explosionStreak2.particle (copied) (copied from code/branches/ParticleEffectsFS15/data/particle/orxonox_explosionStreak2.particle)

code/branches/presentationFS15/data/defaultConfig/keybindings.ini

@@ -142 +142 @@
 KeyWebStop=
 KeyX="selectClosest"
-KeyY=
+KeyY="onpress fire 4"
 KeyYen=
 KeyZ="selectNext"

code/branches/presentationFS15/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 />
+    
+    
+    
+    <SpaceShip position="0,500,500" lookat="0,0,0" team=1 >
+      <templates>
+        <Template link=spaceshipassff />
+      </templates>
+    </SpaceShip>
     
   </Scene>

code/branches/presentationFS15/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>