From 07c16a2f3851f8be9e0cf516523f0cfd9bbdcd5b Mon Sep 17 00:00:00 2001 From: thecelloman Date: Mon, 25 Mar 2013 16:49:08 -0400 Subject: [PATCH] Relocating the particles image directory out of art/shapes/particles to art/particles. This should be a more logical and intuitive location. Relevant managed particle related datablock save location defaults have been adjusted as well. --- .../particles/managedParticleData.cs | 0 .../particles/managedParticleEmitterData.cs | 0 Templates/Empty/game/art/shapes/.gitignore | 1 + .../tools/particleEditor/particleEditor.ed.cs | 2 +- .../particleEmitterEditor.ed.cs | 2 +- .../particleParticleEditor.ed.cs | 2 +- .../Full/game/art/datablocks/particles.cs | 10 ++-- Templates/Full/game/art/datablocks/player.cs | 8 +-- .../Full/game/art/datablocks/teleporter.cs | 4 +- .../game/art/datablocks/weapons/Lurker.cs | 8 +-- .../game/art/datablocks/weapons/grenade.cs | 20 +++---- .../art/datablocks/weapons/grenadeLauncher.cs | 36 ++++++------ .../art/datablocks/weapons/rocketLauncher.cs | 54 +++++++++--------- .../game/art/{shapes => }/particles/Dust.png | Bin .../{shapes => }/particles/Sparkparticle.png | Bin .../art/{shapes => }/particles/Streak.png | Bin .../art/{shapes => }/particles/bubble.png | Bin .../art/{shapes => }/particles/droplet.png | Bin .../{shapes => }/particles/dustParticle.png | Bin .../game/art/{shapes => }/particles/ember.png | Bin .../game/art/{shapes => }/particles/fire.png | Bin .../art/{shapes => }/particles/fireball.png | Bin .../art/{shapes => }/particles/firefly.png | Bin .../game/art/{shapes => }/particles/flame.png | Bin .../game/art/{shapes => }/particles/flare.png | Bin .../art/{shapes => }/particles/impact.png | Bin .../particles/managedParticleData.cs | 0 .../particles/managedParticleEmitterData.cs | 0 .../{shapes => }/particles/millsplash01.png | Bin .../art/{shapes => }/particles/ricochet.png | Bin .../game/art/{shapes => }/particles/smoke.png | Bin .../game/art/{shapes => }/particles/spark.png | Bin .../art/{shapes => }/particles/spark_wet.png | Bin .../art/{shapes => }/particles/splash.png | Bin .../game/art/{shapes => }/particles/steam.png | Bin .../game/art/{shapes => }/particles/wake.png | Bin .../art/{shapes => }/particles/waterDrip.png | Bin .../Full/game/core/scripts/server/game.cs | 4 +- .../Full/game/scripts/client/default.bind.cs | 1 - Templates/Full/game/scripts/server/game.cs | 4 +- .../tools/particleEditor/particleEditor.ed.cs | 2 +- .../particleEmitterEditor.ed.cs | 2 +- .../particleParticleEditor.ed.cs | 2 +- 43 files changed, 81 insertions(+), 81 deletions(-) rename Templates/Empty/game/art/{shapes => }/particles/managedParticleData.cs (100%) rename Templates/Empty/game/art/{shapes => }/particles/managedParticleEmitterData.cs (100%) create mode 100644 Templates/Empty/game/art/shapes/.gitignore rename Templates/Full/game/art/{shapes => }/particles/Dust.png (100%) rename Templates/Full/game/art/{shapes => }/particles/Sparkparticle.png (100%) rename Templates/Full/game/art/{shapes => }/particles/Streak.png (100%) rename Templates/Full/game/art/{shapes => }/particles/bubble.png (100%) rename Templates/Full/game/art/{shapes => }/particles/droplet.png (100%) rename Templates/Full/game/art/{shapes => }/particles/dustParticle.png (100%) rename Templates/Full/game/art/{shapes => }/particles/ember.png (100%) rename Templates/Full/game/art/{shapes => }/particles/fire.png (100%) rename Templates/Full/game/art/{shapes => }/particles/fireball.png (100%) rename Templates/Full/game/art/{shapes => }/particles/firefly.png (100%) rename Templates/Full/game/art/{shapes => }/particles/flame.png (100%) rename Templates/Full/game/art/{shapes => }/particles/flare.png (100%) rename Templates/Full/game/art/{shapes => }/particles/impact.png (100%) rename Templates/Full/game/art/{shapes => }/particles/managedParticleData.cs (100%) rename Templates/Full/game/art/{shapes => }/particles/managedParticleEmitterData.cs (100%) rename Templates/Full/game/art/{shapes => }/particles/millsplash01.png (100%) rename Templates/Full/game/art/{shapes => }/particles/ricochet.png (100%) rename Templates/Full/game/art/{shapes => }/particles/smoke.png (100%) rename Templates/Full/game/art/{shapes => }/particles/spark.png (100%) rename Templates/Full/game/art/{shapes => }/particles/spark_wet.png (100%) rename Templates/Full/game/art/{shapes => }/particles/splash.png (100%) rename Templates/Full/game/art/{shapes => }/particles/steam.png (100%) rename Templates/Full/game/art/{shapes => }/particles/wake.png (100%) rename Templates/Full/game/art/{shapes => }/particles/waterDrip.png (100%) diff --git a/Templates/Empty/game/art/shapes/particles/managedParticleData.cs b/Templates/Empty/game/art/particles/managedParticleData.cs similarity index 100% rename from Templates/Empty/game/art/shapes/particles/managedParticleData.cs rename to Templates/Empty/game/art/particles/managedParticleData.cs diff --git a/Templates/Empty/game/art/shapes/particles/managedParticleEmitterData.cs b/Templates/Empty/game/art/particles/managedParticleEmitterData.cs similarity index 100% rename from Templates/Empty/game/art/shapes/particles/managedParticleEmitterData.cs rename to Templates/Empty/game/art/particles/managedParticleEmitterData.cs diff --git a/Templates/Empty/game/art/shapes/.gitignore b/Templates/Empty/game/art/shapes/.gitignore new file mode 100644 index 000000000..1bc0e838a --- /dev/null +++ b/Templates/Empty/game/art/shapes/.gitignore @@ -0,0 +1 @@ +# Keep directory in git repo diff --git a/Templates/Empty/game/tools/particleEditor/particleEditor.ed.cs b/Templates/Empty/game/tools/particleEditor/particleEditor.ed.cs index a11f992f8..4156e38d6 100644 --- a/Templates/Empty/game/tools/particleEditor/particleEditor.ed.cs +++ b/Templates/Empty/game/tools/particleEditor/particleEditor.ed.cs @@ -47,7 +47,7 @@ function ParticleEditor::initEditor( %this ) }; datablock ParticleData(PE_ParticleEditor_NotDirtyParticle) { - textureName = "art/shapes/particles/defaultParticle"; + textureName = "art/particles/defaultParticle"; }; PE_UnlistedEmitters.add( PE_EmitterEditor_NotDirtyEmitter ); diff --git a/Templates/Empty/game/tools/particleEditor/particleEmitterEditor.ed.cs b/Templates/Empty/game/tools/particleEditor/particleEmitterEditor.ed.cs index 710549842..11678a053 100644 --- a/Templates/Empty/game/tools/particleEditor/particleEmitterEditor.ed.cs +++ b/Templates/Empty/game/tools/particleEditor/particleEmitterEditor.ed.cs @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/shapes/particles/managedParticleEmitterData.cs"; +$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData.cs"; //============================================================================================= diff --git a/Templates/Empty/game/tools/particleEditor/particleParticleEditor.ed.cs b/Templates/Empty/game/tools/particleEditor/particleParticleEditor.ed.cs index cafd80bf6..373e69de3 100644 --- a/Templates/Empty/game/tools/particleEditor/particleParticleEditor.ed.cs +++ b/Templates/Empty/game/tools/particleEditor/particleParticleEditor.ed.cs @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/shapes/particles/managedParticleData.cs"; +$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData.cs"; //============================================================================================= diff --git a/Templates/Full/game/art/datablocks/particles.cs b/Templates/Full/game/art/datablocks/particles.cs index 2afffa6fd..0b965e1b5 100644 --- a/Templates/Full/game/art/datablocks/particles.cs +++ b/Templates/Full/game/art/datablocks/particles.cs @@ -29,7 +29,7 @@ datablock ParticleEmitterNodeData(DefaultEmitterNodeData) datablock ParticleData(Smoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 0.3; gravityCoefficient = -0.2; // rises slowly inheritedVelFactor = 0.00; @@ -71,7 +71,7 @@ datablock ParticleEmitterNodeData(SmokeEmitterNode) datablock ParticleData(EmberParticle) { - textureName = "art/shapes/particles/ember"; + textureName = "art/particles/ember"; dragCoefficient = 0.0; windCoefficient = 0.0; gravityCoefficient = -0.05; // rises slowly @@ -120,7 +120,7 @@ datablock ParticleEmitterNodeData(EmberNode) datablock ParticleData(FireParticle) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 0.0; windCoefficient = 0.0; gravityCoefficient = -0.05; // rises slowly @@ -173,7 +173,7 @@ datablock ParticleEmitterNodeData(FireNode) datablock ParticleData(TorchFire1) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 0.0; gravityCoefficient = -0.3; // rises slowly inheritedVelFactor = 0.00; @@ -199,7 +199,7 @@ datablock ParticleData(TorchFire1) datablock ParticleData(TorchFire2) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 0.0; gravityCoefficient = -0.5; // rises slowly inheritedVelFactor = 0.00; diff --git a/Templates/Full/game/art/datablocks/player.cs b/Templates/Full/game/art/datablocks/player.cs index c975ab503..ca5b78199 100644 --- a/Templates/Full/game/art/datablocks/player.cs +++ b/Templates/Full/game/art/datablocks/player.cs @@ -180,7 +180,7 @@ datablock ParticleData(PlayerFoamParticle) useInvAlpha = false; spinRandomMin = -90.0; spinRandomMax = 500.0; - textureName = "art/shapes/particles/millsplash01"; + textureName = "art/particles/millsplash01"; colors[0] = "0.7 0.8 1.0 0.20"; colors[1] = "0.7 0.8 1.0 0.20"; colors[2] = "0.7 0.8 1.0 0.00"; @@ -246,7 +246,7 @@ datablock ParticleEmitterData( PlayerFoamDropletsEmitter ) datablock ParticleData( PlayerWakeParticle ) { - textureName = "art/shapes/particles/wake"; + textureName = "art/particles/wake"; dragCoefficient = "0.0"; gravityCoefficient = "0.0"; inheritedVelFactor = "0.0"; @@ -348,7 +348,7 @@ datablock SplashData(PlayerSplash) acceleration = -3.0; texWrap = 5.0; - texture = "art/shapes/particles/millsplash01"; + texture = "art/particles/millsplash01"; emitter[0] = PlayerSplashEmitter; emitter[1] = PlayerSplashMistEmitter; @@ -421,7 +421,7 @@ datablock ParticleData(LiftoffDust) colors[0] = "1.0 1.0 1.0 1.0"; sizes[0] = 1.0; times[0] = 1.0; - textureName = "art/shapes/particles/dustParticle"; + textureName = "art/particles/dustParticle"; }; datablock ParticleEmitterData(LiftoffDustEmitter) diff --git a/Templates/Full/game/art/datablocks/teleporter.cs b/Templates/Full/game/art/datablocks/teleporter.cs index 7545478ed..c5f29ebb2 100644 --- a/Templates/Full/game/art/datablocks/teleporter.cs +++ b/Templates/Full/game/art/datablocks/teleporter.cs @@ -46,7 +46,7 @@ datablock ParticleData(TeleporterParticles) { lifetimeMS = "750"; lifetimeVarianceMS = "100"; - textureName = "art/shapes/particles/Streak.png"; + textureName = "art/particles/Streak.png"; useInvAlpha = "0"; gravityCoefficient = "-1"; spinSpeed = "0"; @@ -61,7 +61,7 @@ datablock ParticleData(TeleporterParticles) times[0] = 0.0; times[1] = "0.415686"; times[2] = "0.74902"; - animTexName = "art/shapes/particles/Streak.png"; + animTexName = "art/particles/Streak.png"; inheritedVelFactor = "0.0998043"; constantAcceleration = "-2"; colors[3] = "0.694118 0.843137 0.945098 0"; diff --git a/Templates/Full/game/art/datablocks/weapons/Lurker.cs b/Templates/Full/game/art/datablocks/weapons/Lurker.cs index 4a703944e..6789c3759 100644 --- a/Templates/Full/game/art/datablocks/weapons/Lurker.cs +++ b/Templates/Full/game/art/datablocks/weapons/Lurker.cs @@ -78,7 +78,7 @@ datablock SFXPlayList(LurkerFireSoundList) // ---------------------------------------------------------------------------- datablock ParticleData(GunFireSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 0; gravityCoefficient = "-1"; windCoefficient = 0; @@ -101,7 +101,7 @@ datablock ParticleData(GunFireSmoke) times[0] = 0.0; times[1] = "0.498039"; times[2] = 1.0; - animTexName = "art/shapes/particles/smoke"; + animTexName = "art/particles/smoke"; }; datablock ParticleEmitterData(GunFireSmokeEmitter) @@ -123,7 +123,7 @@ datablock ParticleEmitterData(GunFireSmokeEmitter) datablock ParticleData(BulletDirtDust) { - textureName = "art/shapes/particles/impact"; + textureName = "art/particles/impact"; dragCoefficient = "1"; gravityCoefficient = "-0.100122"; windCoefficient = 0; @@ -146,7 +146,7 @@ datablock ParticleData(BulletDirtDust) times[0] = 0.0; times[1] = "0.498039"; times[2] = 1.0; - animTexName = "art/shapes/particles/impact"; + animTexName = "art/particles/impact"; }; datablock ParticleEmitterData(BulletDirtDustEmitter) diff --git a/Templates/Full/game/art/datablocks/weapons/grenade.cs b/Templates/Full/game/art/datablocks/weapons/grenade.cs index f6ae4202e..435b36099 100644 --- a/Templates/Full/game/art/datablocks/weapons/grenade.cs +++ b/Templates/Full/game/art/datablocks/weapons/grenade.cs @@ -41,7 +41,7 @@ datablock SFXProfile(GrenadeExplosionSound) datablock ParticleData(GrenadeDebrisFireParticle) { - textureName = "art/shapes/particles/impact"; + textureName = "art/particles/impact"; dragCoeffiecient = 0; gravityCoefficient = -1.00366; inheritedVelFactor = 0.0; @@ -61,7 +61,7 @@ datablock ParticleData(GrenadeDebrisFireParticle) times[0] = 0.0; times[1] = 0.494118; times[2] = 1.0; - animTexName = "art/shapes/particles/impact"; + animTexName = "art/particles/impact"; colors[3] = "1 1 1 0.407"; sizes[3] = "0.5"; }; @@ -116,7 +116,7 @@ datablock DebrisData(GrenadeDebris) datablock ParticleData(GrenadeExpFire) { - textureName = "art/shapes/particles/fireball.png"; + textureName = "art/particles/fireball.png"; dragCoeffiecient = 0; windCoeffiecient = 0.5; gravityCoefficient = -1; @@ -137,7 +137,7 @@ datablock ParticleData(GrenadeExpFire) times[0] = 0.0; times[1] = 0.25; times[2] = 0.5; - animTexName = "art/shapes/particles/fireball.png"; + animTexName = "art/particles/fireball.png"; times[3] = "1"; dragCoefficient = "1.99902"; sizes[3] = "10"; @@ -159,7 +159,7 @@ datablock ParticleEmitterData(GrenadeExpFireEmitter) datablock ParticleData(GrenadeExpDust) { - textureName = "art/shapes/particles/smoke.png"; + textureName = "art/particles/smoke.png"; dragCoefficient = 0.498534; gravityCoefficient = 0; inheritedVelFactor = 1; @@ -179,7 +179,7 @@ datablock ParticleData(GrenadeExpDust) times[0] = 0.0; times[1] = 0.494118; times[2] = 1.0; - animTexName = "art/shapes/particles/smoke.png"; + animTexName = "art/particles/smoke.png"; colors[3] = "0.996078 0.996078 0.996078 0"; sizes[3] = "15"; }; @@ -203,7 +203,7 @@ datablock ParticleEmitterData(GrenadeExpDustEmitter) datablock ParticleData(GrenadeExpSpark) { - textureName = "art/shapes/particles/Sparkparticle"; + textureName = "art/particles/Sparkparticle"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -240,7 +240,7 @@ datablock ParticleEmitterData(GrenadeExpSparkEmitter) datablock ParticleData(GrenadeExpSparks) { - textureName = "art/shapes/particles/droplet"; + textureName = "art/particles/droplet"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -280,7 +280,7 @@ datablock ParticleEmitterData(GrenadeExpSparksEmitter) datablock ParticleData(GrenadeExpSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0; gravityCoefficient = -0.40293; inheritedVelFactor = 0.0; @@ -300,7 +300,7 @@ datablock ParticleData(GrenadeExpSmoke) times[0] = 0; times[1] = 0.498039; times[2] = 1; - animTexName = "art/shapes/particles/smoke"; + animTexName = "art/particles/smoke"; times[3] = "1"; }; diff --git a/Templates/Full/game/art/datablocks/weapons/grenadeLauncher.cs b/Templates/Full/game/art/datablocks/weapons/grenadeLauncher.cs index 4aad0a83a..2b01f5a04 100644 --- a/Templates/Full/game/art/datablocks/weapons/grenadeLauncher.cs +++ b/Templates/Full/game/art/datablocks/weapons/grenadeLauncher.cs @@ -93,7 +93,7 @@ datablock LightDescription(GrenadeLauncherWaterLightDesc) datablock ParticleData(GrenadeDebrisFireParticle) { - textureName = "art/shapes/particles/impact"; + textureName = "art/particles/impact"; dragCoeffiecient = 0.0; gravityCoefficient = -1; inheritedVelFactor = 0.0; @@ -173,7 +173,7 @@ datablock ParticleData(GrenadeSplashMist) spinRandomMax = 500.0; spinSpeed = 1; - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; colors[0] = "0.7 0.8 1.0 1.0"; colors[1] = "0.7 0.8 1.0 0.5"; @@ -213,7 +213,7 @@ datablock ParticleData(GrenadeSplashParticle) constantAcceleration = -1.4; lifetimeMS = 600; lifetimeVarianceMS = 200; - textureName = "art/shapes/particles/droplet"; + textureName = "art/particles/droplet"; colors[0] = "0.7 0.8 1.0 1.0"; colors[1] = "0.7 0.8 1.0 0.5"; @@ -248,7 +248,7 @@ datablock ParticleEmitterData(GrenadeSplashEmitter) datablock ParticleData(GrenadeSplashRingParticle) { - textureName = "art/shapes/particles/wake"; + textureName = "art/particles/wake"; dragCoefficient = 0.0; gravityCoefficient = 0.0; inheritedVelFactor = 0.0; @@ -306,7 +306,7 @@ datablock SplashData(GrenadeSplash) // startRadius = 0.0; // acceleration = -3.0; // texWrap = 5.0; -// texture = "art/shapes/particles/splash"; +// texture = "art/particles/splash"; emitter[0] = GrenadeSplashEmitter; emitter[1] = GrenadeSplashMistEmitter; @@ -329,7 +329,7 @@ datablock SplashData(GrenadeSplash) datablock ParticleData(GrenadeExpFire) { - textureName = "art/shapes/particles/fireball"; + textureName = "art/particles/fireball"; dragCoeffiecient = 0; windCoeffiecient = 0.5; gravityCoefficient = -0.300366; @@ -350,7 +350,7 @@ datablock ParticleData(GrenadeExpFire) times[0] = 0.0; times[1] = 0.498039; times[2] = 1.0; - animTexName = "art/shapes/particles/Fireball"; + animTexName = "art/particles/Fireball"; times[3] = "1"; }; @@ -368,7 +368,7 @@ datablock ParticleEmitterData(GrenadeExpFireEmitter) datablock ParticleData(GrenadeExpDust) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoefficient = 1.0; gravityCoefficient = -0.01; inheritedVelFactor = 0.0; @@ -408,7 +408,7 @@ datablock ParticleEmitterData(GrenadeExpDustEmitter) datablock ParticleData(GrenadeExpSpark) { - textureName = "art/shapes/particles/ricochet"; + textureName = "art/particles/ricochet"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -445,7 +445,7 @@ datablock ParticleEmitterData(GrenadeExpSparkEmitter) datablock ParticleData(GrenadeExpSparks) { - textureName = "art/shapes/particles/droplet"; + textureName = "art/particles/droplet"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -485,7 +485,7 @@ datablock ParticleEmitterData(GrenadeExpSparksEmitter) datablock ParticleData(GrenadeExpSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0; gravityCoefficient = -0.40293; inheritedVelFactor = 0.0; @@ -505,7 +505,7 @@ datablock ParticleData(GrenadeExpSmoke) times[0] = 0; times[1] = 0.498039; times[2] = 1; - animTexName = "art/shapes/particles/smoke"; + animTexName = "art/particles/smoke"; times[3] = "1"; }; @@ -527,7 +527,7 @@ datablock ParticleEmitterData(GrenadeExpSmokeEmitter) datablock ParticleData(GLWaterExpDust) { - textureName = "art/shapes/particles/steam"; + textureName = "art/particles/steam"; dragCoefficient = 1.0; gravityCoefficient = -0.01; inheritedVelFactor = 0.0; @@ -567,7 +567,7 @@ datablock ParticleEmitterData(GLWaterExpDustEmitter) datablock ParticleData(GLWaterExpSparks) { - textureName = "art/shapes/particles/spark_wet"; + textureName = "art/particles/spark_wet"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -607,7 +607,7 @@ datablock ParticleEmitterData(GLWaterExpSparkEmitter) datablock ParticleData(GLWaterExpSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0.4; gravityCoefficient = -0.25; inheritedVelFactor = 0.025; @@ -646,7 +646,7 @@ datablock ParticleEmitterData(GLWaterExpSmokeEmitter) datablock ParticleData(GLWaterExpBubbles) { - textureName = "art/shapes/particles/millsplash01"; + textureName = "art/particles/millsplash01"; dragCoefficient = 0.0; gravityCoefficient = -0.05; inheritedVelFactor = 0.0; @@ -776,7 +776,7 @@ datablock ExplosionData(GrenadeLauncherExplosion) datablock ParticleData(GrenadeTrailWaterParticle) { - textureName = "art/shapes/particles/bubble"; + textureName = "art/particles/bubble"; dragCoefficient = 0.0; gravityCoefficient = 0.1; inheritedVelFactor = 0.0; @@ -822,7 +822,7 @@ datablock ParticleEmitterData(GrenadeTrailWaterEmitter) datablock ParticleData(GrenadeProjSmokeTrail) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0.0; gravityCoefficient = -0.2; inheritedVelFactor = 0.0; diff --git a/Templates/Full/game/art/datablocks/weapons/rocketLauncher.cs b/Templates/Full/game/art/datablocks/weapons/rocketLauncher.cs index ed30f1eec..af84bd3c4 100644 --- a/Templates/Full/game/art/datablocks/weapons/rocketLauncher.cs +++ b/Templates/Full/game/art/datablocks/weapons/rocketLauncher.cs @@ -106,7 +106,7 @@ datablock LightDescription(RocketLauncherWaterLightDesc) datablock ParticleData(RocketDebrisTrailParticle) { - textureName = "art/shapes/particles/impact"; + textureName = "art/particles/impact"; dragCoeffiecient = 0; inheritedVelFactor = 0.0; constantAcceleration = 0.0; @@ -125,7 +125,7 @@ datablock ParticleData(RocketDebrisTrailParticle) times[0] = 0.0; times[1] = 0.498039; times[2] = 1.0; - animTexName = "art/shapes/particles/impact"; + animTexName = "art/particles/impact"; times[3] = "1"; }; @@ -186,7 +186,7 @@ datablock ParticleData(RocketSplashMist) spinRandomMin = -90.0; spinRandomMax = 500.0; spinSpeed = 1; - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; colors[0] = "0.7 0.8 1.0 1.0"; colors[1] = "0.7 0.8 1.0 0.5"; colors[2] = "0.7 0.8 1.0 0.0"; @@ -223,7 +223,7 @@ datablock ParticleData(RocketSplashParticle) constantAcceleration = -1.4; lifetimeMS = 600; lifetimeVarianceMS = 200; - textureName = "art/shapes/particles/droplet"; + textureName = "art/particles/droplet"; colors[0] = "0.7 0.8 1.0 1.0"; colors[1] = "0.7 0.8 1.0 0.5"; colors[2] = "0.7 0.8 1.0 0.0"; @@ -255,7 +255,7 @@ datablock ParticleEmitterData(RocketSplashEmitter) datablock ParticleData(RocketSplashRingParticle) { - textureName = "art/shapes/particles/wake"; + textureName = "art/particles/wake"; dragCoefficient = 0.0; gravityCoefficient = 0.0; inheritedVelFactor = 0.0; @@ -309,7 +309,7 @@ datablock SplashData(RocketSplash) // startRadius = 0.0; // acceleration = -3.0; // texWrap = 5.0; -// texture = "art/shapes/particles/splash"; +// texture = "art/particles/splash"; emitter[0] = RocketSplashEmitter; emitter[1] = RocketSplashMistEmitter; @@ -338,8 +338,8 @@ datablock ParticleData(RocketExpFire) spinSpeed = "1"; spinRandomMin = "-200"; spinRandomMax = "0"; - textureName = "art/shapes/particles/smoke"; - animTexName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; + animTexName = "art/particles/smoke"; colors[0] = "1 0.897638 0.795276 1"; colors[1] = "0.795276 0.393701 0 0.6"; colors[2] = "0 0 0 0"; @@ -363,13 +363,13 @@ datablock ParticleEmitterData(RocketExpFireEmitter) datablock ParticleData(RocketExpFireball) { - textureName = "art/shapes/particles/fireball.png"; + textureName = "art/particles/fireball.png"; lifetimeMS = "300"; lifetimeVarianceMS = "299"; spinSpeed = "1"; spinRandomMin = "-400"; spinRandomMax = "0"; - animTexName = "art/shapes/particles/fireball.png"; + animTexName = "art/particles/fireball.png"; colors[0] = "1 0.897638 0.795276 0.2"; colors[1] = "1 0.496063 0 0.6"; colors[2] = "0.0944882 0.0944882 0.0944882 0"; @@ -398,8 +398,8 @@ datablock ParticleData(RocketExpSmoke) { lifetimeMS = 1200;//"1250"; lifetimeVarianceMS = 299;//200;//"250"; - textureName = "art/shapes/particles/smoke"; - animTexName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; + animTexName = "art/particles/smoke"; useInvAlpha = "1"; gravityCoefficient = "-0.100122"; spinSpeed = "1"; @@ -428,10 +428,10 @@ datablock ParticleEmitterData(RocketExpSmokeEmitter) datablock ParticleData(RocketExpSparks) { - textureName = "art/shapes/particles/droplet.png"; + textureName = "art/particles/droplet.png"; lifetimeMS = "100"; lifetimeVarianceMS = "50"; - animTexName = "art/shapes/particles/droplet.png"; + animTexName = "art/particles/droplet.png"; inheritedVelFactor = "0.391389"; sizes[0] = "1.99902"; sizes[1] = "2.49954"; @@ -463,14 +463,14 @@ datablock ParticleEmitterData(RocketExpSparksEmitter) datablock ParticleData(RocketExpSubFireParticles) { - textureName = "art/shapes/particles/fireball.png"; + textureName = "art/particles/fireball.png"; gravityCoefficient = "-0.202686"; lifetimeMS = "400"; lifetimeVarianceMS = "299"; spinSpeed = "1"; spinRandomMin = "-200"; spinRandomMax = "0"; - animTexName = "art/shapes/particles/fireball.png"; + animTexName = "art/particles/fireball.png"; colors[0] = "1 0.897638 0.795276 0.2"; colors[1] = "1 0.496063 0 1"; colors[2] = "0.0944882 0.0944882 0.0944882 0"; @@ -495,14 +495,14 @@ datablock ParticleEmitterData(RocketExpSubFireEmitter) datablock ParticleData(RocketExpSubSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; gravityCoefficient = "-0.40293"; lifetimeMS = "800"; lifetimeVarianceMS = "299"; spinSpeed = "1"; spinRandomMin = "-200"; spinRandomMax = "0"; - animTexName = "art/shapes/particles/smoke"; + animTexName = "art/particles/smoke"; colors[0] = "0.4 0.35 0.3 0.393701"; colors[1] = "0.45 0.45 0.45 0.795276"; colors[2] = "0.4 0.4 0.4 0"; @@ -531,7 +531,7 @@ datablock ParticleEmitterData(RocketExpSubSmokeEmitter) datablock ParticleData(RLWaterExpDust) { - textureName = "art/shapes/particles/steam"; + textureName = "art/particles/steam"; dragCoefficient = 1.0; gravityCoefficient = -0.01; inheritedVelFactor = 0.0; @@ -569,7 +569,7 @@ datablock ParticleEmitterData(RLWaterExpDustEmitter) datablock ParticleData(RLWaterExpSparks) { - textureName = "art/shapes/particles/spark_wet"; + textureName = "art/particles/spark_wet"; dragCoefficient = 1; gravityCoefficient = 0.0; inheritedVelFactor = 0.2; @@ -606,7 +606,7 @@ datablock ParticleEmitterData(RLWaterExpSparkEmitter) datablock ParticleData(RLWaterExpSmoke) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0.4; gravityCoefficient = -0.25; inheritedVelFactor = 0.025; @@ -642,7 +642,7 @@ datablock ParticleEmitterData(RLWaterExpSmokeEmitter) datablock ParticleData(RLWaterExpBubbles) { - textureName = "art/shapes/particles/millsplash01"; + textureName = "art/particles/millsplash01"; dragCoefficient = 0.0; gravityCoefficient = -0.05; inheritedVelFactor = 0.0; @@ -765,7 +765,7 @@ datablock ExplosionData(RocketLauncherExplosion) datablock ParticleData(RocketTrailWaterParticle) { - textureName = "art/shapes/particles/bubble"; + textureName = "art/particles/bubble"; dragCoefficient = 0.0; gravityCoefficient = 0.1; inheritedVelFactor = 0.0; @@ -811,7 +811,7 @@ datablock ParticleEmitterData(RocketTrailWaterEmitter) datablock ParticleData(RocketProjSmokeTrail) { - textureName = "art/shapes/particles/smoke"; + textureName = "art/particles/smoke"; dragCoeffiecient = 0; gravityCoefficient = -0.202686; inheritedVelFactor = 0.0; @@ -834,7 +834,7 @@ datablock ParticleData(RocketProjSmokeTrail) times[0] = 0.0; times[1] = 0.4; times[2] = 1.0; - animTexName = "art/shapes/particles/smoke"; + animTexName = "art/particles/smoke"; times[3] = "1"; }; @@ -943,7 +943,7 @@ datablock DebrisData(RocketlauncherShellCasing) datablock ParticleData(RocketLauncherfiring1Particle) { - textureName = "art/shapes/particles/Fireball"; + textureName = "art/particles/Fireball"; dragCoefficient = 100.0; gravityCoefficient = -0.25;//-0.5;//0.0; inheritedVelFactor = 0.25;//1.0; @@ -980,7 +980,7 @@ datablock ParticleEmitterData(RocketLauncherfiring1Emitter) datablock ParticleData(RocketLauncherfiring2Particle) { - textureName = "art/shapes/particles/impact"; + textureName = "art/particles/impact"; dragCoefficient = 100.0; gravityCoefficient = -0.5;//0.0; inheritedVelFactor = 0.25;//1.0; diff --git a/Templates/Full/game/art/shapes/particles/Dust.png b/Templates/Full/game/art/particles/Dust.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/Dust.png rename to Templates/Full/game/art/particles/Dust.png diff --git a/Templates/Full/game/art/shapes/particles/Sparkparticle.png b/Templates/Full/game/art/particles/Sparkparticle.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/Sparkparticle.png rename to Templates/Full/game/art/particles/Sparkparticle.png diff --git a/Templates/Full/game/art/shapes/particles/Streak.png b/Templates/Full/game/art/particles/Streak.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/Streak.png rename to Templates/Full/game/art/particles/Streak.png diff --git a/Templates/Full/game/art/shapes/particles/bubble.png b/Templates/Full/game/art/particles/bubble.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/bubble.png rename to Templates/Full/game/art/particles/bubble.png diff --git a/Templates/Full/game/art/shapes/particles/droplet.png b/Templates/Full/game/art/particles/droplet.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/droplet.png rename to Templates/Full/game/art/particles/droplet.png diff --git a/Templates/Full/game/art/shapes/particles/dustParticle.png b/Templates/Full/game/art/particles/dustParticle.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/dustParticle.png rename to Templates/Full/game/art/particles/dustParticle.png diff --git a/Templates/Full/game/art/shapes/particles/ember.png b/Templates/Full/game/art/particles/ember.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/ember.png rename to Templates/Full/game/art/particles/ember.png diff --git a/Templates/Full/game/art/shapes/particles/fire.png b/Templates/Full/game/art/particles/fire.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/fire.png rename to Templates/Full/game/art/particles/fire.png diff --git a/Templates/Full/game/art/shapes/particles/fireball.png b/Templates/Full/game/art/particles/fireball.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/fireball.png rename to Templates/Full/game/art/particles/fireball.png diff --git a/Templates/Full/game/art/shapes/particles/firefly.png b/Templates/Full/game/art/particles/firefly.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/firefly.png rename to Templates/Full/game/art/particles/firefly.png diff --git a/Templates/Full/game/art/shapes/particles/flame.png b/Templates/Full/game/art/particles/flame.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/flame.png rename to Templates/Full/game/art/particles/flame.png diff --git a/Templates/Full/game/art/shapes/particles/flare.png b/Templates/Full/game/art/particles/flare.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/flare.png rename to Templates/Full/game/art/particles/flare.png diff --git a/Templates/Full/game/art/shapes/particles/impact.png b/Templates/Full/game/art/particles/impact.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/impact.png rename to Templates/Full/game/art/particles/impact.png diff --git a/Templates/Full/game/art/shapes/particles/managedParticleData.cs b/Templates/Full/game/art/particles/managedParticleData.cs similarity index 100% rename from Templates/Full/game/art/shapes/particles/managedParticleData.cs rename to Templates/Full/game/art/particles/managedParticleData.cs diff --git a/Templates/Full/game/art/shapes/particles/managedParticleEmitterData.cs b/Templates/Full/game/art/particles/managedParticleEmitterData.cs similarity index 100% rename from Templates/Full/game/art/shapes/particles/managedParticleEmitterData.cs rename to Templates/Full/game/art/particles/managedParticleEmitterData.cs diff --git a/Templates/Full/game/art/shapes/particles/millsplash01.png b/Templates/Full/game/art/particles/millsplash01.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/millsplash01.png rename to Templates/Full/game/art/particles/millsplash01.png diff --git a/Templates/Full/game/art/shapes/particles/ricochet.png b/Templates/Full/game/art/particles/ricochet.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/ricochet.png rename to Templates/Full/game/art/particles/ricochet.png diff --git a/Templates/Full/game/art/shapes/particles/smoke.png b/Templates/Full/game/art/particles/smoke.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/smoke.png rename to Templates/Full/game/art/particles/smoke.png diff --git a/Templates/Full/game/art/shapes/particles/spark.png b/Templates/Full/game/art/particles/spark.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/spark.png rename to Templates/Full/game/art/particles/spark.png diff --git a/Templates/Full/game/art/shapes/particles/spark_wet.png b/Templates/Full/game/art/particles/spark_wet.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/spark_wet.png rename to Templates/Full/game/art/particles/spark_wet.png diff --git a/Templates/Full/game/art/shapes/particles/splash.png b/Templates/Full/game/art/particles/splash.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/splash.png rename to Templates/Full/game/art/particles/splash.png diff --git a/Templates/Full/game/art/shapes/particles/steam.png b/Templates/Full/game/art/particles/steam.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/steam.png rename to Templates/Full/game/art/particles/steam.png diff --git a/Templates/Full/game/art/shapes/particles/wake.png b/Templates/Full/game/art/particles/wake.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/wake.png rename to Templates/Full/game/art/particles/wake.png diff --git a/Templates/Full/game/art/shapes/particles/waterDrip.png b/Templates/Full/game/art/particles/waterDrip.png similarity index 100% rename from Templates/Full/game/art/shapes/particles/waterDrip.png rename to Templates/Full/game/art/particles/waterDrip.png diff --git a/Templates/Full/game/core/scripts/server/game.cs b/Templates/Full/game/core/scripts/server/game.cs index a7198cafb..d80dd4468 100644 --- a/Templates/Full/game/core/scripts/server/game.cs +++ b/Templates/Full/game/core/scripts/server/game.cs @@ -34,8 +34,8 @@ function onServerCreated() // Load up any objects or datablocks saved to the editor managed scripts %datablockFiles = new ArrayObject(); - %datablockFiles.add( "art/shapes/particles/managedParticleData.cs" ); - %datablockFiles.add( "art/shapes/particles/managedParticleEmitterData.cs" ); + %datablockFiles.add( "art/particles/managedParticleData.cs" ); + %datablockFiles.add( "art/particles/managedParticleEmitterData.cs" ); %datablockFiles.add( "art/decals/managedDecalData.cs" ); %datablockFiles.add( "art/datablocks/managedDatablocks.cs" ); %datablockFiles.add( "art/forest/managedItemData.cs" ); diff --git a/Templates/Full/game/scripts/client/default.bind.cs b/Templates/Full/game/scripts/client/default.bind.cs index ad6a3aee9..68de1a7d3 100644 --- a/Templates/Full/game/scripts/client/default.bind.cs +++ b/Templates/Full/game/scripts/client/default.bind.cs @@ -795,7 +795,6 @@ vehicleMap.bindCmd(keyboard, "ctrl f","getout();",""); vehicleMap.bind(keyboard, space, brake); vehicleMap.bindCmd(keyboard, "l", "brakeLights();", ""); vehicleMap.bindCmd(keyboard, "escape", "", "handleEscape();"); -vehicleMap.bind(keyboard, h, showControlsHelp); vehicleMap.bind( keyboard, v, toggleFreeLook ); // v for vanity //vehicleMap.bind(keyboard, tab, toggleFirstPerson ); vehicleMap.bind(keyboard, "alt c", toggleCamera); diff --git a/Templates/Full/game/scripts/server/game.cs b/Templates/Full/game/scripts/server/game.cs index 5a427d7bd..ace3ac2f8 100644 --- a/Templates/Full/game/scripts/server/game.cs +++ b/Templates/Full/game/scripts/server/game.cs @@ -50,8 +50,8 @@ function onServerCreated() // Load up any objects or datablocks saved to the editor managed scripts %datablockFiles = new ArrayObject(); - %datablockFiles.add( "art/shapes/particles/managedParticleData.cs" ); - %datablockFiles.add( "art/shapes/particles/managedParticleEmitterData.cs" ); + %datablockFiles.add( "art/particles/managedParticleData.cs" ); + %datablockFiles.add( "art/particles/managedParticleEmitterData.cs" ); %datablockFiles.add( "art/decals/managedDecalData.cs" ); %datablockFiles.add( "art/datablocks/managedDatablocks.cs" ); %datablockFiles.add( "art/forest/managedItemData.cs" ); diff --git a/Templates/Full/game/tools/particleEditor/particleEditor.ed.cs b/Templates/Full/game/tools/particleEditor/particleEditor.ed.cs index a11f992f8..4156e38d6 100644 --- a/Templates/Full/game/tools/particleEditor/particleEditor.ed.cs +++ b/Templates/Full/game/tools/particleEditor/particleEditor.ed.cs @@ -47,7 +47,7 @@ function ParticleEditor::initEditor( %this ) }; datablock ParticleData(PE_ParticleEditor_NotDirtyParticle) { - textureName = "art/shapes/particles/defaultParticle"; + textureName = "art/particles/defaultParticle"; }; PE_UnlistedEmitters.add( PE_EmitterEditor_NotDirtyEmitter ); diff --git a/Templates/Full/game/tools/particleEditor/particleEmitterEditor.ed.cs b/Templates/Full/game/tools/particleEditor/particleEmitterEditor.ed.cs index 710549842..11678a053 100644 --- a/Templates/Full/game/tools/particleEditor/particleEmitterEditor.ed.cs +++ b/Templates/Full/game/tools/particleEditor/particleEmitterEditor.ed.cs @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/shapes/particles/managedParticleEmitterData.cs"; +$PE_EMITTEREDITOR_DEFAULT_FILENAME = "art/particles/managedParticleEmitterData.cs"; //============================================================================================= diff --git a/Templates/Full/game/tools/particleEditor/particleParticleEditor.ed.cs b/Templates/Full/game/tools/particleEditor/particleParticleEditor.ed.cs index cafd80bf6..373e69de3 100644 --- a/Templates/Full/game/tools/particleEditor/particleParticleEditor.ed.cs +++ b/Templates/Full/game/tools/particleEditor/particleParticleEditor.ed.cs @@ -21,7 +21,7 @@ //----------------------------------------------------------------------------- -$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/shapes/particles/managedParticleData.cs"; +$PE_PARTICLEEDITOR_DEFAULT_FILENAME = "art/particles/managedParticleData.cs"; //=============================================================================================