From 0b571b26250a009f987baf4f2eef0fee08e6326a Mon Sep 17 00:00:00 2001 From: Richard Kettering Date: Tue, 2 Feb 2016 23:08:33 -0600 Subject: [PATCH] Renamed the sounds for dying in fire to reflect what they're actually used for. --- data/object_prototypes/base/hittable.cfg | 4 ++-- sounds/{death-acid1.wav => death-fire1.wav} | Bin sounds/{death-acid2.wav => death-fire2.wav} | Bin sounds/{death-acid3.wav => death-fire3.wav} | Bin sounds/{death-acid4.wav => death-fire4.wav} | Bin sounds/{death-acid5.wav => death-fire5.wav} | Bin 6 files changed, 2 insertions(+), 2 deletions(-) rename sounds/{death-acid1.wav => death-fire1.wav} (100%) rename sounds/{death-acid2.wav => death-fire2.wav} (100%) rename sounds/{death-acid3.wav => death-fire3.wav} (100%) rename sounds/{death-acid4.wav => death-fire4.wav} (100%) rename sounds/{death-acid5.wav => death-fire5.wav} (100%) diff --git a/data/object_prototypes/base/hittable.cfg b/data/object_prototypes/base/hittable.cfg index f70214a8be..d3efd30ae6 100644 --- a/data/object_prototypes/base/hittable.cfg +++ b/data/object_prototypes/base/hittable.cfg @@ -643,10 +643,10 @@ properties: { /*a set of effects based on the damage source; elsewhere in hittable these actually overrule the creature-type*/ 'fire', if(victim_is_big, [sound('death-fire-large.wav'), repeat_fx('die_cloud_fire',5,4,30,30, null)], - [vfx('die_cloud_fire'), sound('death-acid'+1d5+'.wav')]), + [vfx('die_cloud_fire'), sound('death-fire'+1d5+'.wav')]), 'acid', if(victim_is_big, [repeat_fx('die_cloud_acid_small',40,1,50,50,null), sound('death-acid-bubbly.wav')], [repeat_fx('die_cloud_acid_small',10,6,30,30,null), sound('death-acid-bubbly.wav')]), - 'energy', [repeat_fx('die_cloud_electric_medium',1d2+5,4,20,30, null),repeat_fx('electric_spark1',3+1d3,1,60,60,null), sound('death-acid'+1d5+'.wav')], + 'energy', [repeat_fx('die_cloud_electric_medium',1d2+5,4,20,30, null),repeat_fx('electric_spark1',3+1d3,1,60,60,null), sound('death-fire'+1d5+'.wav')], diff --git a/sounds/death-acid1.wav b/sounds/death-fire1.wav similarity index 100% rename from sounds/death-acid1.wav rename to sounds/death-fire1.wav diff --git a/sounds/death-acid2.wav b/sounds/death-fire2.wav similarity index 100% rename from sounds/death-acid2.wav rename to sounds/death-fire2.wav diff --git a/sounds/death-acid3.wav b/sounds/death-fire3.wav similarity index 100% rename from sounds/death-acid3.wav rename to sounds/death-fire3.wav diff --git a/sounds/death-acid4.wav b/sounds/death-fire4.wav similarity index 100% rename from sounds/death-acid4.wav rename to sounds/death-fire4.wav diff --git a/sounds/death-acid5.wav b/sounds/death-fire5.wav similarity index 100% rename from sounds/death-acid5.wav rename to sounds/death-fire5.wav