From e00f217090fa950635fd4bb23fcd45da81944f2b Mon Sep 17 00:00:00 2001 From: EgorDinamit Date: Thu, 12 Oct 2023 17:48:03 +0300 Subject: [PATCH] Tweaks & Fixes --- code/game/objects/effects/magic_orb.dm | 8 ++++---- code/game/objects/effects/particles/particles.dm | 6 +++--- code/modules/spells/targeted/healing.dm | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/game/objects/effects/magic_orb.dm b/code/game/objects/effects/magic_orb.dm index cf8dd212260..06b9c3ef0ad 100644 --- a/code/game/objects/effects/magic_orb.dm +++ b/code/game/objects/effects/magic_orb.dm @@ -13,7 +13,7 @@ if(!ambient_sound) return sound_id = "[type]_[sequential_id(/obj/effect/magic_orb)]" - sound_token = GLOB.sound_player.PlayLoopingSound(src, sound_id, ambient_sound, volume = 35) + sound_token = GLOB.sound_player.PlayLoopingSound(src, sound_id, ambient_sound, 50, 14, 4) particles = new /particles/magic_orb() /obj/effect/magic_orb/Destroy() @@ -27,9 +27,9 @@ if(!CanUseOrb(user)) return SEND_GLOBAL_SIGNAL(COMSIG_GLOB_ORB_PICKUP, src, user) - playsound(src, 'sound/magic/orb_pickup.ogg', 50, FALSE, 3) - var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, dir, src, 20) - animate(D, alpha = 0, color = "#aaaaff", transform = matrix()*3, time = 20) + playsound(src, 'sound/magic/orb_pickup.ogg', 75, FALSE, 3) + var/obj/effect/temp_visual/decoy/D = new /obj/effect/temp_visual/decoy(loc, dir, src, 10) + animate(D, alpha = 0, color = "#aaaaff", transform = matrix()*2, time = 10) OrbEffect(user) qdel(src) return diff --git a/code/game/objects/effects/particles/particles.dm b/code/game/objects/effects/particles/particles.dm index 7f50a4911d4..b5cf592fd36 100644 --- a/code/game/objects/effects/particles/particles.dm +++ b/code/game/objects/effects/particles/particles.dm @@ -143,12 +143,12 @@ width = 500 height = 500 count = 2000 - spawning = 260 + spawning = 20 lifespan = 1 SECONDS fade = 1 SECONDS - position = generator("circle", 28, 36, NORMAL_RAND) + position = generator("circle", 16, 20, NORMAL_RAND) velocity = generator("circle", 0, 3, NORMAL_RAND) - friction = 0.1 + friction = 0.3 gradient = list(0, COLOR_DIAMOND, 0.75, COLOR_BLUE_LIGHT) color_change = 0.1 color = 0 diff --git a/code/modules/spells/targeted/healing.dm b/code/modules/spells/targeted/healing.dm index 9faf8d21686..15cf3708640 100644 --- a/code/modules/spells/targeted/healing.dm +++ b/code/modules/spells/targeted/healing.dm @@ -4,9 +4,10 @@ charge_max = 1 MINUTE spell_flags = INCLUDEUSER invocation = "Nal Di'Nath!" + invocation_type = INVOKE_SHOUT range = 2 max_targets = 0 - level_max = list(UPGRADE_TOTAL = 1, UPGRADE_SPEED = 1, UPGRADE_POWER = 1) + level_max = list(UPGRADE_TOTAL = 3, UPGRADE_SPEED = 2, UPGRADE_POWER = 2) cooldown_reduc = 300 hud_state = "heal_area" amt_dam_robo = -6