From 5e288af3795fa06183ab5237374e637bb1e24291 Mon Sep 17 00:00:00 2001 From: Kaedwuff Date: Mon, 29 Oct 2018 11:50:10 -0500 Subject: [PATCH] Adjustments to Wizard Spells (#5335) --- .../game/gamemodes/vampire/vampire_helpers.dm | 8 ++-- .../crates_lockers/closets/statue.dm | 8 ++-- .../modules/spells/targeted/flesh_to_stone.dm | 6 +-- code/modules/spells/targeted/shapeshift.dm | 4 +- html/changelogs/Kaedwuff - Wizfixes.yml | 37 +++++++++++++++++++ 5 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 html/changelogs/Kaedwuff - Wizfixes.yml diff --git a/code/game/gamemodes/vampire/vampire_helpers.dm b/code/game/gamemodes/vampire/vampire_helpers.dm index 8c427564e39..d61c2264f4d 100644 --- a/code/game/gamemodes/vampire/vampire_helpers.dm +++ b/code/game/gamemodes/vampire/vampire_helpers.dm @@ -14,10 +14,12 @@ verbs += new/datum/game_mode/vampire/verb/vampire_help - for (var/datum/power/vampire/P in vampirepowers) - if (!P.blood_cost) - if (!(P in mind.vampire.purchased_powers)) + for(var/datum/power/vampire/P in vampirepowers) + if(!(P in mind.vampire.purchased_powers)) + if(!P.blood_cost) mind.vampire.add_power(mind, P, 0) + else if(P.isVerb && P.verbpath) + verbs += P.verbpath return 1 diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm index 4906767552b..b7a01b8714b 100644 --- a/code/game/objects/structures/crates_lockers/closets/statue.dm +++ b/code/game/objects/structures/crates_lockers/closets/statue.dm @@ -3,7 +3,7 @@ universal_understand = 1 /mob/statue_mob/send_emote() - src << "You are unable to emote while trapped as a statue." + src << "You are unable to move while trapped as a statue." /mob/statue_mob/say() src << "You are unable to speak while trapped as a statue." @@ -16,7 +16,7 @@ density = 1 anchored = 1 health = 0 //destroying the statue kills the mob within - var/timer = 240 //eventually the person will be freed + var/timer = 90 //eventually the person will be freed var/mob/statue_mob/imprisoned = null //the temporary mob that is created when someone is put inside a statue /obj/structure/closet/statue/eternal @@ -73,9 +73,9 @@ ..() /obj/structure/closet/statue/process() - timer-- + timer -= 2 - if (timer == 50) + if (timer == 10) visible_message("\The [src]'s surface begins cracking and dissolving!") if (timer <= 0) diff --git a/code/modules/spells/targeted/flesh_to_stone.dm b/code/modules/spells/targeted/flesh_to_stone.dm index fd37a347127..0bb96d7ea42 100644 --- a/code/modules/spells/targeted/flesh_to_stone.dm +++ b/code/modules/spells/targeted/flesh_to_stone.dm @@ -3,14 +3,14 @@ desc = "This spell turns a single person into an inert statue for a long period of time." feedback = "FS" school = "transmutation" - charge_max = 600 + charge_max = 200 spell_flags = NEEDSCLOTHES | SELECTABLE - range = 3 + range = 5 max_targets = 1 invocation = "STAUN EI" invocation_type = SpI_SHOUT amt_stunned = 5 - cooldown_min = 200 + cooldown_min = 100 cast_sound = 'sound/magic/FleshToStone.ogg' hud_state = "wiz_statue" diff --git a/code/modules/spells/targeted/shapeshift.dm b/code/modules/spells/targeted/shapeshift.dm index c4a2dcabf4d..8e9a5a2e6e6 100644 --- a/code/modules/spells/targeted/shapeshift.dm +++ b/code/modules/spells/targeted/shapeshift.dm @@ -81,7 +81,7 @@ /spell/targeted/shapeshift/baleful_polymorph name = "Baleful Polymorth" - desc = "This spell transforms its target into a small, furry animal." + desc = "This spell transforms its target into a small, furry animal. Those practiced in the high arcane arts can block this spell with ease, however." feedback = "BP" possible_transformations = list(/mob/living/simple_animal/lizard,/mob/living/simple_animal/mouse,/mob/living/simple_animal/corgi, /mob/living/simple_animal/cat) @@ -97,7 +97,7 @@ newVars = list("health" = 50, "maxHealth" = 50) - protected_roles = list("Wizard","Changeling","Cultist","Vampire") + protected_roles = list("Wizard") hud_state = "wiz_poly" diff --git a/html/changelogs/Kaedwuff - Wizfixes.yml b/html/changelogs/Kaedwuff - Wizfixes.yml new file mode 100644 index 00000000000..31deb0fa521 --- /dev/null +++ b/html/changelogs/Kaedwuff - Wizfixes.yml @@ -0,0 +1,37 @@ +################################ +# 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: "The wizard's Stone to Flesh spell now last less time, but is also slightly longer range. Also, the Veil no longer protects one from Baleful Polymorphs."