Skip to content

Commit

Permalink
Tweaks & Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
EgorDinamit committed Oct 12, 2023
1 parent 98578af commit e00f217
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions code/game/objects/effects/magic_orb.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/effects/particles/particles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion code/modules/spells/targeted/healing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e00f217

Please sign in to comment.