浏览代码

Merge pull request #329 from thecelloman/cleansounds

Remove unused and duplicate sounds.
SilentMike 12 年之前
父节点
当前提交
00513230b3
共有 36 个文件被更改,包括 6 次插入13 次删除
  1. 0 0
      Templates/Empty/game/art/sound/ui/volumeTest.wav
  2. 2 2
      Templates/Empty/game/scripts/gui/optionsDlg.cs
  3. 0 7
      Templates/Full/game/art/datablocks/audioProfiles.cs
  4. 1 1
      Templates/Full/game/art/datablocks/weapons/Lurker.cs
  5. 1 1
      Templates/Full/game/art/datablocks/weapons/grenadefx.cs
  6. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav
  7. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav
  8. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3
  9. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav
  10. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav
  11. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav
  12. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav
  13. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav
  14. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3
  15. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3
  16. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav
  17. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav
  18. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3
  19. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav
  20. 二进制
      Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav
  21. 0 0
      Templates/Full/game/art/sound/ui/volumeTest.wav
  22. 二进制
      Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg
  23. 二进制
      Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg
  24. 二进制
      Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg
  25. 0 0
      Templates/Full/game/art/sound/weapons/GRENADELAND.wav
  26. 0 0
      Templates/Full/game/art/sound/weapons/SCARFIRE.wav
  27. 二进制
      Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg
  28. 二进制
      Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg
  29. 二进制
      Templates/Full/game/art/sound/weapons/shot.ogg
  30. 二进制
      Templates/Full/game/art/sound/weapons/wpn_fire.wav
  31. 二进制
      Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav
  32. 二进制
      Templates/Full/game/art/sound/weapons/wpn_idle.wav
  33. 二进制
      Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav
  34. 二进制
      Templates/Full/game/art/sound/weapons/wpn_reload.wav
  35. 二进制
      Templates/Full/game/art/sound/weapons/wpn_switchin.wav
  36. 2 2
      Templates/Full/game/scripts/gui/optionsDlg.cs

+ 0 - 0
Templates/Empty/game/core/art/sound/volumeTest.wav → Templates/Empty/game/art/sound/ui/volumeTest.wav


+ 2 - 2
Templates/Empty/game/scripts/gui/optionsDlg.cs

@@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
    $pref::SFX::masterVolume = %volume;
    $pref::SFX::masterVolume = %volume;
    
    
    if( !isObject( $AudioTestHandle ) )
    if( !isObject( $AudioTestHandle ) )
-      $AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
 }
 }
 
 
 function OptAudioUpdateChannelVolume( %description, %volume )
 function OptAudioUpdateChannelVolume( %description, %volume )
@@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
    if( !isObject( $AudioTestHandle ) )
    if( !isObject( $AudioTestHandle ) )
    {
    {
       $AudioTestDescription.volume = %volume;
       $AudioTestDescription.volume = %volume;
-      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
    }
    }
 }
 }
 
 

+ 0 - 7
Templates/Full/game/art/datablocks/audioProfiles.cs

@@ -33,10 +33,3 @@ datablock SFXProfile(ThrowSnd)
    description = AudioClose3d;
    description = AudioClose3d;
    preload = false;
    preload = false;
 };
 };
-
-datablock SFXProfile(OOBWarningSnd)
-{
-   filename = "art/sound/orc_pain";
-   description = "AudioLoop2D";
-   preload = false;
-};

+ 1 - 1
Templates/Full/game/art/datablocks/weapons/Lurker.cs

@@ -68,7 +68,7 @@ datablock SFXPlayList(LurkerFireSoundList)
 
 
 /*datablock SFXProfile(BulletImpactSound)
 /*datablock SFXProfile(BulletImpactSound)
 {
 {
-   filename = "art/sound/CT_fx/weapons/SCARFIRE";
+   filename = "art/sound/weapons/SCARFIRE";
    description = AudioClose3D;
    description = AudioClose3D;
    preload = true;
    preload = true;
 };*/
 };*/

+ 1 - 1
Templates/Full/game/art/datablocks/weapons/grenadefx.cs

@@ -22,7 +22,7 @@ $GrenadeUpVectorOffset = "0 0 1";
 
 
 datablock SFXProfile(GrenadeExplosionSound)
 datablock SFXProfile(GrenadeExplosionSound)
 {
 {
-   filename = "art/sound/CT_fx/weapons/GRENADELAND.wav";
+   filename = "art/sound/weapons/GRENADELAND.wav";
    description = AudioDefault3d;
    description = AudioDefault3d;
    preload = true;
    preload = true;
 };
 };

二进制
Templates/Full/game/art/sound/CT_fx/weapons/BULLETBODY.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/GRENADEPINTHROW.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/KINIFE OUT.mp3


二进制
Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTAB.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/KNIFESTRIKE.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLEMPTY.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLFIRE.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLRELOAD.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/PISTOLS SHELLS 2.mp3


二进制
Templates/Full/game/art/sound/CT_fx/weapons/PSTOL SHELLS.mp3


二进制
Templates/Full/game/art/sound/CT_fx/weapons/SCAREMPTY.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/SCARRELOAD.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/SPENT SHELLS.mp3


二进制
Templates/Full/game/art/sound/CT_fx/weapons/WEAPONPICKUP.wav


二进制
Templates/Full/game/art/sound/CT_fx/weapons/WEAPONSWITCH.wav


+ 0 - 0
Templates/Full/game/core/art/sound/volumeTest.wav → Templates/Full/game/art/sound/ui/volumeTest.wav


二进制
Templates/Full/game/art/sound/weapons/Crossbow_firing.ogg


二进制
Templates/Full/game/art/sound/weapons/Crossbow_firing_empty.ogg


二进制
Templates/Full/game/art/sound/weapons/Crossbow_reload.ogg


+ 0 - 0
Templates/Full/game/art/sound/CT_fx/weapons/GRENADELAND.wav → Templates/Full/game/art/sound/weapons/GRENADELAND.wav


+ 0 - 0
Templates/Full/game/art/sound/CT_fx/weapons/SCARFIRE.wav → Templates/Full/game/art/sound/weapons/SCARFIRE.wav


二进制
Templates/Full/game/art/sound/weapons/ammo_mono_01.ogg


二进制
Templates/Full/game/art/sound/weapons/explosion_mono_01.ogg


二进制
Templates/Full/game/art/sound/weapons/shot.ogg


二进制
Templates/Full/game/art/sound/weapons/wpn_fire.wav


二进制
Templates/Full/game/art/sound/weapons/wpn_grenadelaunch.wav


二进制
Templates/Full/game/art/sound/weapons/wpn_idle.wav


二进制
Templates/Full/game/art/sound/weapons/wpn_mine_switchin.wav


二进制
Templates/Full/game/art/sound/weapons/wpn_reload.wav


二进制
Templates/Full/game/art/sound/weapons/wpn_switchin.wav


+ 2 - 2
Templates/Full/game/scripts/gui/optionsDlg.cs

@@ -761,7 +761,7 @@ function OptAudioUpdateMasterVolume( %volume )
    $pref::SFX::masterVolume = %volume;
    $pref::SFX::masterVolume = %volume;
    
    
    if( !isObject( $AudioTestHandle ) )
    if( !isObject( $AudioTestHandle ) )
-      $AudioTestHandle = sfxPlayOnce( AudioChannel, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( AudioChannel, "art/sound/ui/volumeTest.wav" );
 }
 }
 
 
 function OptAudioUpdateChannelVolume( %description, %volume )
 function OptAudioUpdateChannelVolume( %description, %volume )
@@ -777,7 +777,7 @@ function OptAudioUpdateChannelVolume( %description, %volume )
    if( !isObject( $AudioTestHandle ) )
    if( !isObject( $AudioTestHandle ) )
    {
    {
       $AudioTestDescription.volume = %volume;
       $AudioTestDescription.volume = %volume;
-      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "core/art/sound/volumeTest.wav" );
+      $AudioTestHandle = sfxPlayOnce( $AudioTestDescription, "art/sound/ui/volumeTest.wav" );
    }
    }
 }
 }