Permalink
Browse files

Merge pull request #24041 from eckff/wazardsounds

Adds sounds to spells
  • Loading branch information...
sabiram committed Dec 23, 2018
2 parents 57f2da6 + 831e342 commit b784cebeb54b4a10fd91b487f9044d3554db6647
Showing with 36 additions and 11 deletions.
  1. +1 −0 code/modules/spells/aoe_turf/blink.dm
  2. +1 −0 code/modules/spells/aoe_turf/charge.dm
  3. +1 −1 code/modules/spells/aoe_turf/conjure/conjure.dm
  4. +1 −1 code/modules/spells/aoe_turf/conjure/forcewall.dm
  5. +1 −0 code/modules/spells/aoe_turf/conjure/grove.dm
  6. +1 −0 code/modules/spells/aoe_turf/disable_tech.dm
  7. +1 −0 code/modules/spells/aoe_turf/knock.dm
  8. +1 −0 code/modules/spells/aoe_turf/smoke.dm
  9. +2 −0 code/modules/spells/aoe_turf/summons.dm
  10. +1 −1 code/modules/spells/artifacts.dm
  11. +1 −1 code/modules/spells/contracts.dm
  12. +1 −0 code/modules/spells/general/acid_spray.dm
  13. +1 −0 code/modules/spells/hand/blood_shards.dm
  14. +1 −0 code/modules/spells/hand/burning_grip.dm
  15. +1 −0 code/modules/spells/hand/entangle.dm
  16. +1 −0 code/modules/spells/hand/slippery_surface.dm
  17. +2 −0 code/modules/spells/targeted/cleric_spells.dm
  18. +1 −0 code/modules/spells/targeted/equip/equip.dm
  19. +1 −0 code/modules/spells/targeted/equip/horsemask.dm
  20. +2 −0 code/modules/spells/targeted/ethereal_jaunt.dm
  21. +2 −0 code/modules/spells/targeted/genetic.dm
  22. +1 −0 code/modules/spells/targeted/projectile/fireball.dm
  23. +2 −1 code/modules/spells/targeted/projectile/magic_missile.dm
  24. +2 −2 code/modules/spells/targeted/projectile/passage.dm
  25. +1 −0 code/modules/spells/targeted/projectile/stuncuff.dm
  26. +3 −2 code/modules/spells/targeted/shapeshift.dm
  27. +1 −1 code/modules/spells/targeted/swap.dm
  28. +1 −1 code/modules/spells/targeted/torment.dm
  29. BIN sound/magic/blind.ogg
  30. BIN sound/magic/blink.ogg
  31. BIN sound/magic/castsummon.ogg
  32. BIN sound/magic/charge.ogg
  33. BIN sound/magic/cowhead_curse.ogg
  34. BIN sound/magic/demon_attack1.ogg
  35. BIN sound/magic/disable_tech.ogg
  36. BIN sound/magic/disintegrate.ogg
  37. BIN sound/magic/ethereal_enter.ogg
  38. BIN sound/magic/ethereal_exit.ogg
  39. BIN sound/magic/fireball.ogg
  40. BIN sound/magic/forcewall.ogg
  41. BIN sound/magic/horsehead_curse.ogg
  42. BIN sound/magic/knock.ogg
  43. BIN sound/magic/lightning_bolt.ogg
  44. BIN sound/magic/lightningshock.ogg
  45. BIN sound/magic/magic_missile.ogg
  46. BIN sound/magic/mandswap.ogg
  47. BIN sound/magic/mm_hit.ogg
  48. BIN sound/magic/mutate.ogg
  49. BIN sound/magic/repulse.ogg
  50. BIN sound/magic/smoke.ogg
  51. BIN sound/magic/staff_door.ogg
  52. BIN sound/magic/staff_healing.ogg
  53. BIN sound/magic/summon_carp.ogg
  54. BIN sound/magic/summonitems_generic.ogg
  55. BIN sound/magic/wandodeath.ogg
@@ -13,6 +13,7 @@
level_max = list(Sp_TOTAL = 4, Sp_SPEED = 4, Sp_POWER = 4)
cooldown_min = 5 //4 deciseconds reduction per rank
hud_state = "wiz_blink"
cast_sound = 'sound/magic/blink.ogg'

/spell/aoe_turf/blink/cast(var/list/targets, mob/user)
if(!targets.len)
@@ -11,6 +11,7 @@
cooldown_min = 400 //50 deciseconds reduction per rank

hud_state = "wiz_charge"
cast_sound = 'sound/magic/charge.ogg'

/spell/aoe_turf/charge/cast(var/list/targets, mob/user)
for(var/turf/T in targets)
@@ -22,7 +22,7 @@ How they spawn stuff is decided by behaviour vars, which are explained below
var/list/newVars = list() //vars of the summoned objects will be replaced with those where they meet
//should have format of list("emagged" = 1,"name" = "Wizard's Justicebot"), for example

cast_sound = 'sound/items/welder.ogg'
cast_sound = 'sound/magic/castsummon.ogg'

/spell/aoe_turf/conjure/cast(list/targets, mob/user)

@@ -8,7 +8,7 @@
charge_max = 100
spell_flags = 0
range = 0
cast_sound = null
cast_sound = 'sound/magic/forcewall.ogg'

hud_state = "wiz_shield"

@@ -16,6 +16,7 @@
var/spread = 0
var/datum/seed/seed
var/seed_type = /datum/seed/merlin_tear
cast_sound = 'sound/magic/repulse.ogg'

/spell/aoe_turf/conjure/grove/New()
..()
@@ -16,6 +16,7 @@
var/emp_light = 5

hud_state = "wiz_tech"
cast_sound = 'sound/magic/disable_tech.ogg'

/spell/aoe_turf/disable_tech/cast(list/targets)

@@ -12,6 +12,7 @@
cooldown_min = 20 //20 deciseconds reduction per rank

hud_state = "wiz_knock"
cast_sound = 'sound/magic/knock.ogg'

/spell/aoe_turf/knock/cast(list/targets)
for(var/turf/T in targets)
@@ -16,6 +16,7 @@
smoke_amt = 5

hud_state = "wiz_smoke"
cast_sound = 'sound/magic/smoke.ogg'

/spell/aoe_turf/smoke/empower_spell()
if(!..())
@@ -19,6 +19,7 @@
invocation = "Nouk Fhumm Sacp Risska!"
invocation_type = SpI_SHOUT
range = 1
cast_sound = 'sound/magic/summon_carp.ogg'

summon_type = list(/mob/living/simple_animal/hostile/carp)

@@ -50,6 +51,7 @@
invocation = "Nouk Fhunhm Sacp Risska!"
invocation_type = SpI_SHOUT
range = 1
cast_sound = 'sound/magic/summon_carp.ogg'

duration = 600
cooldown_min = 600
@@ -10,7 +10,7 @@
throwforce = 10
damtype = BURN
force = 10
hitsound = 'sound/items/welder2.ogg'
hitsound = 'sound/magic/forcewall.ogg'

/obj/item/weapon/scrying/attack_self(mob/user as mob)
if((user.mind && !GLOB.wizards.is_antagonist(user.mind)))
@@ -131,7 +131,7 @@
return 1
else if(ispath(path,/obj))
new path(get_turf(user.loc))
playsound(get_turf(usr),'sound/effects/phasein.ogg',50,1)
playsound(get_turf(usr),'sound/magic/charge.ogg',50,1)
return 1

/obj/item/weapon/contract/boon/wizard
@@ -10,6 +10,7 @@
invocation_type = SpI_SHOUT
var/reagent_type = /datum/reagent/acid/hydrochloric
hud_state = "wiz_acid"
cast_sound = 'sound/magic/disintegrate.ogg'

/spell/acid_spray/choose_targets()
return list(holder)
@@ -11,6 +11,7 @@
max_casts = 2
compatible_targets = list(/atom)
hud_state = "wiz_bshard"
cast_sound = 'sound/magic/demon_attack1.ogg'

/spell/hand/charges/blood_shard/cast_hand(var/atom/A,var/mob/user)
var/obj/item/projectile/blood_shard/B = new(get_turf(user))
@@ -9,6 +9,7 @@
show_message = " throws sparks from their hands"
spell_delay = 120
hud_state = "wiz_burn"
cast_sound = 'sound/magic/fireball.ogg'
compatible_targets = list(/mob/living/carbon/human)

/spell/hand/burning_grip/valid_target(var/mob/living/L, var/mob/user)
@@ -16,6 +16,7 @@
compatible_targets = list(/mob)

hud_state = "wiz_entangle"
cast_sound = 'sound/magic/staff_door.ogg'
show_message = " points towards the ground, causing plants to erupt"
var/datum/seed/seed

@@ -9,6 +9,7 @@
show_message = " snaps their fingers."
spell_delay = 50
hud_state = "gen_ice"
cast_sound = 'sound/magic/summonitems_generic.ogg'

/spell/hand/slippery_surface/cast_hand(var/atom/a, var/mob/user)
for(var/turf/simulated/T in view(1,a))
@@ -13,6 +13,7 @@

cooldown_reduc = 50
hud_state = "heal_minor"
cast_sound = 'sound/magic/staff_healing.ogg'

amt_dam_brute = -15
amt_dam_fire = -5
@@ -131,6 +132,7 @@
effect_color = "#ff0000"

hud_state = "gen_dissolve"
cast_sound = 'sound/magic/disintegrate.ogg'

/spell/targeted/heal_target/sacrifice/empower_spell()
if(!..())
@@ -2,6 +2,7 @@

/spell/targeted/equip_item
name = "equipment spell"
cast_sound = 'sound/magic/summonitems_generic.ogg'

var/list/equipped_summons = list() //assoc list of text ids and paths to spawn

@@ -17,6 +17,7 @@
compatible_mobs = list(/mob/living/carbon/human)

hud_state = "wiz_horse"
cast_sound = 'sound/magic/horsehead_curse.ogg'

/spell/targeted/equip_item/horsemask/New()
..()
@@ -66,9 +66,11 @@
/spell/targeted/ethereal_jaunt/proc/jaunt_disappear(var/atom/movable/overlay/animation, var/mob/living/target)
animation.icon_state = "liquify"
flick("liquify",animation)
playsound(get_turf(target), 'sound/magic/ethereal_enter.ogg', 30)

/spell/targeted/ethereal_jaunt/proc/jaunt_reappear(var/atom/movable/overlay/animation, var/mob/living/target)
flick("reappear",animation)
playsound(get_turf(target), 'sound/magic/ethereal_exit.ogg', 30)

/spell/targeted/ethereal_jaunt/proc/jaunt_steam(var/mobloc)
var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
@@ -51,6 +51,7 @@ code\game\dna\genes\goon_powers.dm
amt_eye_blurry = 20

hud_state = "wiz_blind"
cast_sound = 'sound/magic/blind.ogg'

/spell/targeted/genetic/blind/empower_spell()
if(!..())
@@ -79,6 +80,7 @@ code\game\dna\genes\goon_powers.dm
cooldown_min = 300

hud_state = "wiz_hulk"
cast_sound = 'sound/magic/mutate.ogg'
effect_state = "electricity_constant"
effect_duration = 5
effect_color = "#ff0000"
@@ -27,6 +27,7 @@
var/ex_flash = 5

hud_state = "wiz_fireball"
cast_sound = 'sound/magic/fireball.ogg'

/spell/targeted/projectile/dumbfire/fireball/prox_cast(var/list/targets, spell_holder)
for(var/mob/living/M in targets)
@@ -18,14 +18,15 @@
proj_step_delay = 5

hud_state = "wiz_mm"

cast_sound = 'sound/magic/magic_missile.ogg'
amt_paralysis = 3
amt_stunned = 3

amt_dam_fire = 10

/spell/targeted/projectile/magic_missile/prox_cast(var/list/targets, atom/spell_holder)
spell_holder.visible_message("<span class='danger'>\The [spell_holder] pops with a flash!</span>")
playsound(src, 'sound/magic/mm_hit.ogg', 40)
for(var/mob/living/M in targets)
apply_spell_damage(M)
return
@@ -20,7 +20,7 @@
proj_step_delay = 1

hud_state = "gen_project"

cast_sound = 'sound/magic/lightning_bolt.ogg'

/spell/targeted/projectile/dumbfire/passage/prox_cast(var/list/targets, atom/spell_holder)
for(var/mob/living/L in targets)
@@ -32,7 +32,7 @@
var/datum/effect/effect/system/smoke_spread/S = new /datum/effect/effect/system/smoke_spread()
S.set_up(3,0,T)
S.start()

playsound(src, 'sound/magic/lightningshock.ogg', 50)

/spell/targeted/projectile/dumbfire/passage/empower_spell()
if(!..())
@@ -20,6 +20,7 @@
amt_stunned = 6

hud_state = "wiz_cuff"
cast_sound = 'sound/magic/wandodeath.ogg'

/spell/targeted/projectile/dumbfire/stuncuff/prox_cast(var/list/targets, spell_holder)
for(var/mob/living/M in targets)
@@ -14,8 +14,8 @@
var/list/possible_transformations = list()
var/list/newVars = list() //what the variables of the new created thing will be.

cast_sound = 'sound/weapons/emitter2.ogg'
var/revert_sound = 'sound/weapons/emitter.ogg' //the sound that plays when something gets turned back.
cast_sound = 'sound/magic/charge.ogg'
var/revert_sound = 'sound/magic/charge.ogg' //the sound that plays when something gets turned back.
var/share_damage = 1 //do we want the damage we take from our new form to move onto our real one? (Only counts for finite duration)
var/drop_items = 1 //do we want to drop all our items when we transform?
var/toggle = 0 //Can we toggle this?
@@ -163,6 +163,7 @@
newVars = list("name" = "corrupted soul")

hud_state = "wiz_corrupt"
cast_sound = 'sound/magic/disintegrate.ogg'

/spell/targeted/shapeshift/corrupt_form/empower_spell()
if(!..())
@@ -20,7 +20,7 @@

hud_state = "wiz_swap"

cast_sound = 'sound/effects/bamf.ogg'
cast_sound = 'sound/magic/mandswap.ogg'

/spell/targeted/swap/cast(var/list/targets, mob/user)
for(var/mob/T in targets)
@@ -18,7 +18,7 @@
var/loss = 30

hud_state = "wiz_horse"

cast_sound = 'sound/magic/cowhead_curse.ogg'

/spell/targeted/torment/cast(var/list/targets, var/mob/user)
gibs(user.loc)
BIN +19.1 KB sound/magic/blind.ogg
Binary file not shown.
BIN +12.9 KB sound/magic/blink.ogg
Binary file not shown.
Binary file not shown.
BIN +25.3 KB sound/magic/charge.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +27.5 KB sound/magic/knock.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +12.1 KB sound/magic/mm_hit.ogg
Binary file not shown.
BIN +67.3 KB sound/magic/mutate.ogg
Binary file not shown.
Binary file not shown.
BIN +27.8 KB sound/magic/smoke.ogg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit b784ceb

Please sign in to comment.