diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index f78e86fa33a..7322340fb1f 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -181,3 +181,6 @@ GLOBAL_LIST_INIT(announcer_keys, list( #define SFX_STONE_DROP "stone_drop" #define SFX_STONE_PICKUP "stone_pickup" #define SFX_MUFFLED_SPEECH "muffspeech" +#define SFX_DEFAULT_FISH_SLAP "default_fish_slap" +#define SFX_ALT_FISH_SLAP "alt_fish_slap" +#define SFX_FISH_PICKUP "fish_pickup" diff --git a/code/game/sound.dm b/code/game/sound.dm index a8fa8b63715..edd5437e3dc 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -507,4 +507,13 @@ 'sound/effects/muffspeech/muffspeech8.ogg', 'sound/effects/muffspeech/muffspeech9.ogg', ) + if(SFX_DEFAULT_FISH_SLAP) + soundin = 'sound/creatures/fish/fish_slap1.ogg' + if(SFX_ALT_FISH_SLAP) + soundin = 'sound/creatures/fish/fish_slap2.ogg' + if(SFX_FISH_PICKUP) + soundin = pick( + 'sound/creatures/fish/fish_pickup1.ogg', + 'sound/creatures/fish/fish_pickup2.ogg', + ) return soundin diff --git a/code/modules/fishing/fish/_fish.dm b/code/modules/fishing/fish/_fish.dm index 5023a2515b5..7b112783457 100644 --- a/code/modules/fishing/fish/_fish.dm +++ b/code/modules/fishing/fish/_fish.dm @@ -11,7 +11,10 @@ throw_range = 8 attack_verb_continuous = list("slaps", "whacks") attack_verb_simple = list("slap", "whack") - hitsound = 'sound/weapons/slap.ogg' + hitsound = SFX_DEFAULT_FISH_SLAP + drop_sound = 'sound/creatures/fish/fish_drop1.ogg' + pickup_sound = SFX_FISH_PICKUP + sound_vary = TRUE ///The grind results of the fish. They scale with the weight of the fish. grind_results = list(/datum/reagent/blood = 5, /datum/reagent/consumable/liquidgibs = 5) obj_flags = UNIQUE_RENAME @@ -282,6 +285,8 @@ ///Reset weapon-related variables of this items and recalculates those values based on the fish weight and size. /obj/item/fish/proc/update_fish_force() + if(force >= 15 && hitsound == SFX_ALT_FISH_SLAP) + hitsound = SFX_DEFAULT_FISH_SLAP force = initial(force) throwforce = initial(throwforce) throw_range = initial(throw_range) @@ -310,6 +315,9 @@ SEND_SIGNAL(src, COMSIG_FISH_FORCE_UPDATED, weight_rank, bonus_malus) + if(force >=15 && hitsound == SFX_DEFAULT_FISH_SLAP) // don't override special attack sounds + hitsound = SFX_ALT_FISH_SLAP // do more damage - do heavier slap sound + ///A proc that makes the fish slightly stronger or weaker if there's a noticeable discrepancy between size and weight. /obj/item/fish/proc/calculate_fish_force_bonus(bonus_malus) demolition_mod += bonus_malus * 0.1 diff --git a/sound/creatures/fish/attritbution.txt b/sound/creatures/fish/attritbution.txt new file mode 100644 index 00000000000..2b3d80f408e --- /dev/null +++ b/sound/creatures/fish/attritbution.txt @@ -0,0 +1,7 @@ +{ +fish_drop1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_pickup1.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_pickup2.ogg - fish slap ground or snow writhing wet.wav by kyles -- https://freesound.org/s/450830/ -- License: Creative Commons 0 +fish_slap1.ogg - Slap - Cartoony by AdminMP -- https://freesound.org/s/383201/ -- License: Creative Commons 0 +fish_slap2.ogg - Major punch by janbezouska -- https://freesound.org/s/399183/ -- License: Creative Commons 0 +} - edited by sadboysuss diff --git a/sound/creatures/fish/fish_drop1.ogg b/sound/creatures/fish/fish_drop1.ogg new file mode 100644 index 00000000000..70d7a7364b1 Binary files /dev/null and b/sound/creatures/fish/fish_drop1.ogg differ diff --git a/sound/creatures/fish/fish_pickup1.ogg b/sound/creatures/fish/fish_pickup1.ogg new file mode 100644 index 00000000000..385b6daab91 Binary files /dev/null and b/sound/creatures/fish/fish_pickup1.ogg differ diff --git a/sound/creatures/fish/fish_pickup2.ogg b/sound/creatures/fish/fish_pickup2.ogg new file mode 100644 index 00000000000..dc9f17461e5 Binary files /dev/null and b/sound/creatures/fish/fish_pickup2.ogg differ diff --git a/sound/creatures/fish/fish_slap1.ogg b/sound/creatures/fish/fish_slap1.ogg new file mode 100644 index 00000000000..fd6ea653871 Binary files /dev/null and b/sound/creatures/fish/fish_slap1.ogg differ diff --git a/sound/creatures/fish/fish_slap2.ogg b/sound/creatures/fish/fish_slap2.ogg new file mode 100644 index 00000000000..06df1797d48 Binary files /dev/null and b/sound/creatures/fish/fish_slap2.ogg differ