From cd48f1a1522f429240ecb632c74e5b54fef648a2 Mon Sep 17 00:00:00 2001 From: Commandersand Date: Mon, 20 Jan 2020 14:22:23 -0600 Subject: [PATCH 1/4] forcewall --- code/modules/spells/spell_types/forcewall.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/forcewall.dm b/code/modules/spells/spell_types/forcewall.dm index ed78e3315a..aa2fa5ab8b 100644 --- a/code/modules/spells/spell_types/forcewall.dm +++ b/code/modules/spells/spell_types/forcewall.dm @@ -2,7 +2,7 @@ name = "Forcewall" desc = "Create a magical barrier that only you can pass through. Does not require wizard garb." school = "transmutation" - charge_max = 100 + charge_max = 80 clothes_req = 0 invocation = "TARCOL MINTI ZHERI" invocation_type = "shout" @@ -10,7 +10,7 @@ action_icon_state = "shield" range = -1 include_user = 1 - cooldown_min = 50 //12 deciseconds reduction per rank + cooldown_min = 15 //15 deciseconds reduction per rank var/wall_type = /obj/effect/forcefield/wizard /obj/effect/proc_holder/spell/targeted/forcewall/cast(list/targets,mob/user = usr) From a3f82331301769c303c3db91983e12dd4da7e8ae Mon Sep 17 00:00:00 2001 From: Commandersand Date: Mon, 20 Jan 2020 15:15:28 -0600 Subject: [PATCH 2/4] MEM --- code/modules/spells/spell_types/aimed.dm | 8 ++++---- code/modules/spells/spell_types/emplosion.dm | 2 ++ code/modules/spells/spell_types/lightning.dm | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index 73a428af71..ac6cdacb65 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -96,9 +96,9 @@ school = "evocation" charge_max = 200 clothes_req = 1 - invocation = "UN'LTD P'WAH" + invocation = "ZAP MUTHA'FUCKA" invocation_type = "shout" - cooldown_min = 30 + cooldown_min = 40 active_icon_state = "lightning" base_icon_state = "lightning" sound = 'sound/magic/lightningbolt.ogg' @@ -112,12 +112,12 @@ name = "Fireball" desc = "This spell fires a fireball at a target and does not require wizard garb." school = "evocation" - charge_max = 60 + charge_max = 100 clothes_req = 0 invocation = "ONI SOMA" invocation_type = "shout" range = 20 - cooldown_min = 20 //10 deciseconds reduction per rank + cooldown_min = 20 //20 deciseconds reduction per rank projectile_type = /obj/item/projectile/magic/aoe/fireball base_icon_state = "fireball" action_icon_state = "fireball0" diff --git a/code/modules/spells/spell_types/emplosion.dm b/code/modules/spells/spell_types/emplosion.dm index a5ba0a3914..98723273ae 100644 --- a/code/modules/spells/spell_types/emplosion.dm +++ b/code/modules/spells/spell_types/emplosion.dm @@ -1,6 +1,8 @@ /obj/effect/proc_holder/spell/targeted/emplosion name = "Emplosion" desc = "This spell emplodes an area." + charge_max = 250 + cooldown_min = 50 var/emp_heavy = 2 var/emp_light = 3 diff --git a/code/modules/spells/spell_types/lightning.dm b/code/modules/spells/spell_types/lightning.dm index 8363e28624..83b9491c7d 100644 --- a/code/modules/spells/spell_types/lightning.dm +++ b/code/modules/spells/spell_types/lightning.dm @@ -2,9 +2,9 @@ name = "Tesla Blast" desc = "Blast lightning at your foes!" charge_type = "recharge" - charge_max = 300 + charge_max = 270 clothes_req = 1 - invocation = "UN'LTD P'WAH!" + invocation = "TSL'A L'OOSE!" invocation_type = "shout" range = 7 cooldown_min = 30 From 62c5fabcacde54a6f02cb2fedff48ffad0c0e09c Mon Sep 17 00:00:00 2001 From: Commandersand Date: Mon, 20 Jan 2020 15:18:08 -0600 Subject: [PATCH 3/4] oops --- code/modules/spells/spell_types/aimed.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index ac6cdacb65..5ba85bef6b 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -94,11 +94,11 @@ name = "Lightning Bolt" desc = "Fire a high powered lightning bolt at your foes!" school = "evocation" - charge_max = 200 + charge_max = 150 clothes_req = 1 invocation = "ZAP MUTHA'FUCKA" invocation_type = "shout" - cooldown_min = 40 + cooldown_min = 30 active_icon_state = "lightning" base_icon_state = "lightning" sound = 'sound/magic/lightningbolt.ogg' From a7a3a3a4171827039a81e048796d1638f56fd272 Mon Sep 17 00:00:00 2001 From: loginsandylogout Date: Thu, 23 Jan 2020 22:52:18 -0600 Subject: [PATCH 4/4] Update code/modules/spells/spell_types/lightning.dm po Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/spells/spell_types/lightning.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/spells/spell_types/lightning.dm b/code/modules/spells/spell_types/lightning.dm index 83b9491c7d..56d7dc771f 100644 --- a/code/modules/spells/spell_types/lightning.dm +++ b/code/modules/spells/spell_types/lightning.dm @@ -4,7 +4,7 @@ charge_type = "recharge" charge_max = 270 clothes_req = 1 - invocation = "TSL'A L'OOSE!" + invocation = "UN'LTD P'WAH!" invocation_type = "shout" range = 7 cooldown_min = 30