From 69c02f70f274c282c67ca6a3c814d144309847e8 Mon Sep 17 00:00:00 2001 From: Kaedwuff Date: Sat, 20 Oct 2018 17:01:39 -0500 Subject: [PATCH] More Wizard Fixes (#5436) -Changed the name of Subjugate to Mind Blast, and rewrote its description to actually explain what it does. -Removed the annoying and unfun stuttering effect from Mind Blast, but upped the dizziness a little to compensate. -Mind Bend now properly explains to the user that it is an actual mind control spell, and that they need to have a restrained target for it to work. -Mind Bend is also now in the Necromancer, Battlemage, and Standard spellbooks. -Mind Blast is now also in the Spacial spellbook. -That awful spell that turns you into an easily killable parrot for a few seconds has been cut from the spellbooks entirely. --- code/modules/spells/spellbook/battlemage.dm | 1 + code/modules/spells/spellbook/cleric.dm | 3 +- code/modules/spells/spellbook/druid.dm | 1 - code/modules/spells/spellbook/necromancer.dm | 30 +++++++-------- code/modules/spells/spellbook/spatial.dm | 2 +- code/modules/spells/spellbook/standard.dm | 1 + code/modules/spells/targeted/mindcontrol.dm | 2 +- code/modules/spells/targeted/subjugate.dm | 9 ++--- html/changelogs/Kaedwuff - Spell Tweaks.yml | 39 ++++++++++++++++++++ 9 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 html/changelogs/Kaedwuff - Spell Tweaks.yml diff --git a/code/modules/spells/spellbook/battlemage.dm b/code/modules/spells/spellbook/battlemage.dm index f53e1c5843b..61d1bec4768 100644 --- a/code/modules/spells/spellbook/battlemage.dm +++ b/code/modules/spells/spellbook/battlemage.dm @@ -22,6 +22,7 @@ /spell/targeted/projectile/dumbfire/stuncuff = 2, /spell/aoe_turf/conjure/mirage = 1, /spell/targeted/shapeshift/corrupt_form = 1, + /spell/targeted/mindcontrol = 2, /spell/targeted/flesh_to_stone = 1, /spell/aoe_turf/conjure/golem = 1, /spell/aoe_turf/blink = 1, diff --git a/code/modules/spells/spellbook/cleric.dm b/code/modules/spells/spellbook/cleric.dm index 57465c3aac4..d6d64e749b1 100644 --- a/code/modules/spells/spellbook/cleric.dm +++ b/code/modules/spells/spellbook/cleric.dm @@ -5,7 +5,7 @@ name = "\improper cleric's tome" feedback = "CR" desc = "For those who do not harm, or at least feel sorry about it." - book_desc = "All about healing. Mobility and offense comes at a higher price but not impossible." + book_desc = "All about healing and control. Mobility and offense comes at a higher price but not impossible." title = "Cleric's Tome of Healing" title_desc = "Buy spells using your available spell slots. Artefacts may also be bought however their cost is permanent." book_flags = CAN_MAKE_CONTRACTS @@ -27,6 +27,7 @@ /spell/aoe_turf/conjure/grove/sanctuary = 1, /spell/targeted/projectile/dumbfire/fireball = 2, /spell/aoe_turf/conjure/forcewall = 1, + /spell/targeted/subjugation = 1, /spell/targeted/mindcontrol = 2, /obj/item/weapon/gun/energy/staff/focus = 2, /obj/item/weapon/storage/belt/wands/full = 2, diff --git a/code/modules/spells/spellbook/druid.dm b/code/modules/spells/spellbook/druid.dm index 5f4e41ae850..19151372bcf 100644 --- a/code/modules/spells/spellbook/druid.dm +++ b/code/modules/spells/spellbook/druid.dm @@ -24,7 +24,6 @@ /spell/targeted/flesh_to_stone = 1, /spell/aoe_turf/conjure/grove/sanctuary = 1, /spell/aoe_turf/knock = 1, - /spell/targeted/shapeshift/avian = 1, /spell/targeted/shapeshift/baleful_polymorph = 1, /spell/targeted/flesh_to_stone = 1, /spell/aoe_turf/conjure/golem = 1, diff --git a/code/modules/spells/spellbook/necromancer.dm b/code/modules/spells/spellbook/necromancer.dm index 84b88e748b4..02c8b94b126 100644 --- a/code/modules/spells/spellbook/necromancer.dm +++ b/code/modules/spells/spellbook/necromancer.dm @@ -12,20 +12,20 @@ book_flags = CAN_MAKE_CONTRACTS max_uses = 5 - spells = list(/spell/targeted/projectile/dumbfire/fireball = 1, - /spell/targeted/torment = 1, - /spell/mark_recall = 1, - /spell/targeted/subjugation = 1, - /spell/targeted/lichdom = 2, - /spell/aoe_turf/conjure/mirage = 1, - /spell/aoe_turf/conjure/summon/bats = 1, + spells = list(/spell/targeted/projectile/dumbfire/fireball = 1, + /spell/targeted/torment = 1, + /spell/mark_recall = 1, + /spell/targeted/subjugation = 1, + /spell/targeted/lichdom = 2, + /spell/aoe_turf/conjure/mirage = 1, + /spell/aoe_turf/conjure/summon/bats = 1, /spell/targeted/shapeshift/corrupt_form = 1, - /spell/targeted/life_steal = 1, - /spell/targeted/raise_dead = 2, - /spell/shadow_shroud = 1, - /spell/noclothes = 1, - /obj/structure/closet/wizard/armor = 1, - /obj/structure/closet/wizard/scrying = 2, - /obj/structure/closet/wizard/souls = 1, - /obj/item/weapon/contract/apprentice = 1 + /spell/targeted/life_steal = 1, + /spell/targeted/raise_dead = 2, + /spell/shadow_shroud = 1, + /spell/noclothes = 1, + /obj/structure/closet/wizard/armor = 1, + /obj/structure/closet/wizard/scrying = 2, + /obj/structure/closet/wizard/souls = 1, + /obj/item/weapon/contract/apprentice = 1 ) diff --git a/code/modules/spells/spellbook/spatial.dm b/code/modules/spells/spellbook/spatial.dm index 7418818757e..7cb916176b6 100644 --- a/code/modules/spells/spellbook/spatial.dm +++ b/code/modules/spells/spellbook/spatial.dm @@ -17,9 +17,9 @@ /spell/targeted/projectile/dumbfire/passage = 1, /spell/mark_recall = 1, /spell/targeted/swap = 1, - /spell/targeted/shapeshift/avian = 1, /spell/targeted/projectile/magic_missile = 2, /spell/aoe_turf/conjure/forcewall = 1, + /spell/targeted/subjugation = 1, /spell/aoe_turf/smoke = 1, /spell/aoe_turf/conjure/summon/bats = 3, /obj/item/weapon/contract/wizard/tk = 5, diff --git a/code/modules/spells/spellbook/standard.dm b/code/modules/spells/spellbook/standard.dm index b232957850f..a752f142670 100644 --- a/code/modules/spells/spellbook/standard.dm +++ b/code/modules/spells/spellbook/standard.dm @@ -16,6 +16,7 @@ /spell/aoe_turf/smoke = 1, /spell/targeted/genetic/blind = 1, /spell/targeted/subjugation = 1, + /spell/targeted/mindcontrol = 2, /spell/aoe_turf/conjure/forcewall = 1, /spell/aoe_turf/blink = 1, /spell/area_teleport = 1, diff --git a/code/modules/spells/targeted/mindcontrol.dm b/code/modules/spells/targeted/mindcontrol.dm index 68b2c2780db..21c57226b8a 100644 --- a/code/modules/spells/targeted/mindcontrol.dm +++ b/code/modules/spells/targeted/mindcontrol.dm @@ -1,6 +1,6 @@ /spell/targeted/mindcontrol name = "Mind Bend" - desc = "Bend the mind and soul of a mortal to serve your purposes." + desc = "Bend the mind and soul of a mortal to serve your purposes, making them your slave. You will need some way to hold them still during the process, however." feedback = "MB" school = "cleric" charge_max = 10000 diff --git a/code/modules/spells/targeted/subjugate.dm b/code/modules/spells/targeted/subjugate.dm index 2abd66fffad..01a9470310d 100644 --- a/code/modules/spells/targeted/subjugate.dm +++ b/code/modules/spells/targeted/subjugate.dm @@ -1,19 +1,18 @@ /spell/targeted/subjugation - name = "Subjugation" - desc = "This spell temporarily subjugates a target's mind and does not require wizard garb." + name = "Mind Blast" + desc = "This spell blasts a target's mind with distruptive forces, severely disorienting them. It does not require wizard garb." school = "transmutation" charge_max = 250 spell_flags = 0 invocation = "DII ODA BAJI" invocation_type = SpI_WHISPER - message = "You suddenly feel completely overwhelmed!" + message = "You feel your mind burn, and your limbs feel unsteady as your vision wobbles severely." max_targets = 1 - amt_dizziness = 100 + amt_dizziness = 150 amt_confused = 100 - amt_stuttering = 100 compatible_mobs = list(/mob/living/carbon/human) diff --git a/html/changelogs/Kaedwuff - Spell Tweaks.yml b/html/changelogs/Kaedwuff - Spell Tweaks.yml new file mode 100644 index 00000000000..ba3a01080ed --- /dev/null +++ b/html/changelogs/Kaedwuff - Spell Tweaks.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Adjusted a couple of wizard spell's properties and descriptions to be more descriptive of what they actually do." + - rscadd: "Made several spells a little more generally available to other spellbooks, reducing exclusivity." + - rscdel: "The awful, jokey parrot transformation spell has been cut from wizard's spellbooks after an inquisition on quality control." \ No newline at end of file