Merge pull request #10632 from Commandersand/nerd

buffs some wiz spell cooldonws and changes some incantation phrases
This commit is contained in:
kevinz000
2020-01-24 00:18:41 -07:00
committed by GitHub
4 changed files with 9 additions and 7 deletions
+4 -4
View File
@@ -94,9 +94,9 @@
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 = "UN'LTD P'WAH"
invocation = "ZAP MUTHA'FUCKA"
invocation_type = "shout"
cooldown_min = 30
active_icon_state = "lightning"
@@ -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"
@@ -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
+2 -2
View File
@@ -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)
+1 -1
View File
@@ -2,7 +2,7 @@
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_type = "shout"