grungussuss
2024-09-04 15:40:34 +03:00
committed by GitHub
parent c4fe24a03e
commit de68bb7a2b
9 changed files with 28 additions and 1 deletions
+3
View File
@@ -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"
+9
View File
@@ -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
+9 -1
View File
@@ -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
+7
View File
@@ -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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.