From bfdeb87aede6846d6c22113cabbb4ac7dd333735 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Thu, 24 Nov 2022 21:52:24 +0000 Subject: [PATCH] Merged forcewall and greater forcewall into a single spell (#19739) --- code/datums/spells/mime.dm | 1 - code/datums/spells/wizard.dm | 26 +++++-------------- code/game/gamemodes/wizard/spellbook.dm | 7 ----- code/game/gamemodes/wizard/wizloadouts.dm | 4 +-- .../living/simple_animal/hostile/hellhound.dm | 2 +- 5 files changed, 10 insertions(+), 30 deletions(-) diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 99f05065c9f..881e2bee263 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -76,7 +76,6 @@ action_icon_state = "mime_bigwall" action_background_icon_state = "bg_mime" - large = TRUE /obj/effect/proc_holder/spell/forcewall/mime/Click() if(usr && usr.mind) diff --git a/code/datums/spells/wizard.dm b/code/datums/spells/wizard.dm index 1e68c3dc473..8a63346bd51 100644 --- a/code/datums/spells/wizard.dm +++ b/code/datums/spells/wizard.dm @@ -192,7 +192,7 @@ /obj/effect/proc_holder/spell/forcewall name = "Force Wall" - desc = "This spell creates a small unbreakable wall that only you can pass through, and does not need wizard garb. Lasts 30 seconds." + desc = "This spell creates a 3 tile wide unbreakable wall that only you can pass through, and does not need wizard garb. Lasts 30 seconds." school = "transmutation" base_cooldown = 100 @@ -203,30 +203,18 @@ action_icon_state = "shield" cooldown_min = 50 //12 deciseconds reduction per rank var/wall_type = /obj/effect/forcefield/wizard - var/large = FALSE /obj/effect/proc_holder/spell/forcewall/create_new_targeting() return new /datum/spell_targeting/self /obj/effect/proc_holder/spell/forcewall/cast(list/targets, mob/user = usr) new wall_type(get_turf(user), user) - if(large) //Extra THICK - if(user.dir == SOUTH || user.dir == NORTH) - new wall_type(get_step(user, EAST), user) - new wall_type(get_step(user, WEST), user) - else - new wall_type(get_step(user, NORTH), user) - new wall_type(get_step(user, SOUTH), user) - -/obj/effect/proc_holder/spell/forcewall/greater - name = "Greater Force Wall" - desc = "Create a larger magical barrier that only you can pass through, but requires wizard garb. Lasts 30 seconds." - - clothes_req = TRUE - invocation = "TARCOL GRANDI ZHERI" - invocation_type = "shout" - large = TRUE - action_icon_state = "shield_greater" + if(user.dir == SOUTH || user.dir == NORTH) + new wall_type(get_step(user, EAST), user) + new wall_type(get_step(user, WEST), user) + else + new wall_type(get_step(user, NORTH), user) + new wall_type(get_step(user, SOUTH), user) /obj/effect/proc_holder/spell/aoe/conjure/timestop name = "Stop Time" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 0c76c820cbc..e98d1f8efd1 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -184,13 +184,6 @@ category = "Defensive" cost = 1 -/datum/spellbook_entry/greaterforcewall - name = "Greater Force Wall" - spell_type = /obj/effect/proc_holder/spell/forcewall/greater - log_name = "GFW" - category = "Defensive" - cost = 1 - /datum/spellbook_entry/repulse name = "Repulse" spell_type = /obj/effect/proc_holder/spell/aoe/repulse diff --git a/code/game/gamemodes/wizard/wizloadouts.dm b/code/game/gamemodes/wizard/wizloadouts.dm index f05e969be22..259a7cd4d84 100644 --- a/code/game/gamemodes/wizard/wizloadouts.dm +++ b/code/game/gamemodes/wizard/wizloadouts.dm @@ -14,12 +14,12 @@ /datum/spellbook_entry/loadout/lich name = "Defense Focus : Lich" desc = "This spellset uses the Bind Soul spell to safeguard your life as a lich and allow for more dangerous offensive spells to be used.
\ - Ethereal Jaunt provides escape, Fireball and Rod Form are your offensive spells, and Disable Tech and Greater Forcewall provides utility in disabling sec equipment or blocking their path.
\ + Ethereal Jaunt provides escape, Fireball and Rod Form are your offensive spells, and Disable Tech and Forcewall provides utility in disabling sec equipment or blocking their path.
\ Care should be taken in hiding the item you choose as your phylactery after using Bind Soul, as you cannot revive if it destroyed or too far from your body!

\ Provides Bind Soul, Ethereal Jaunt, Fireball, Rod Form, Disable Tech, and Greater Forcewall." log_name = "DL" spells_path = list(/obj/effect/proc_holder/spell/lichdom, /obj/effect/proc_holder/spell/ethereal_jaunt, /obj/effect/proc_holder/spell/fireball, \ - /obj/effect/proc_holder/spell/rod_form, /obj/effect/proc_holder/spell/emplosion/disable_tech, /obj/effect/proc_holder/spell/forcewall/greater) + /obj/effect/proc_holder/spell/rod_form, /obj/effect/proc_holder/spell/emplosion/disable_tech, /obj/effect/proc_holder/spell/forcewall) is_ragin_restricted = TRUE /datum/spellbook_entry/loadout/wands diff --git a/code/modules/mob/living/simple_animal/hostile/hellhound.dm b/code/modules/mob/living/simple_animal/hostile/hellhound.dm index c15e0fdedf6..c50b4922141 100644 --- a/code/modules/mob/living/simple_animal/hostile/hellhound.dm +++ b/code/modules/mob/living/simple_animal/hostile/hellhound.dm @@ -127,7 +127,7 @@ knockspell.invocation_type = "none" AddSpell(knockspell) // Defense - var/obj/effect/proc_holder/spell/forcewall/greater/wallspell = new + var/obj/effect/proc_holder/spell/forcewall/wallspell = new wallspell.clothes_req = FALSE wallspell.invocation_type = "none" AddSpell(wallspell)