From ef1bdf744257dd32e0d17a3fa43bc7c7c6f72068 Mon Sep 17 00:00:00 2001 From: "kortgstation@gmail.com" Date: Mon, 19 Dec 2011 02:49:16 +0000 Subject: [PATCH] TG UPDATE: The Staff of Change now has its own sprite/in hands. The Wizard Spellbook has a new subsection: Artefacts. Artefacts are items with special properties that the wizard can purchase as an alternative to spells (one artefact costs as much as one spell) Currently the only Artefact is the Staff of Change, more to follow. Updated the changelog. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2739 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 2 +- code/game/gamemodes/wizard/spellbook.dm | 17 +++++++++++++++-- code/modules/projectiles/guns/energy/special.dm | 5 +++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index cd0aaf6b0bf..b6d477382d0 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -942,7 +942,7 @@ var/uses = 4.0 var/temp = null var/spell_type = "verb" - var/max_uses = 5 + var/max_uses = 4 /obj/item/weapon/spellbook/object_type_spells //used for giving out object spells as opposed to verb spells spell_type = "object" diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 9da0da4711b..1710822c709 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -26,7 +26,12 @@ dat += "Ethereal Jaunt (60)
" dat += "Knock (10)
" dat += "
" - dat += "Re-memorize Spells
" + dat += "Artefacts:
" + dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
" + dat += "
" + dat += "Staff of Change
" + dat += "
" + dat += "Re-memorize Spells
" user << browse(dat, "window=radio") onclose(user, "radio") return @@ -97,6 +102,10 @@ usr.verbs += /client/proc/knock usr.mind.special_verbs += /client/proc/knock src.temp = "This spell opens nearby doors and does not require wizard garb." + if ("14") + new /obj/item/weapon/gun/energy/staff(get_turf(usr)) + src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" + src.max_uses-- else if(spell_type == "object") var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock") var/already_knows = 0 @@ -147,7 +156,11 @@ if ("13") usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(usr) src.temp = "This spell opens nearby doors and does not require wizard garb." - if (href_list["spell_choice"] == "14") + if ("14") + new /obj/item/weapon/gun/energy/staff(get_turf(usr)) + src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" + src.max_uses-- + if (href_list["spell_choice"] == "15") var/area/wizard_station/A = locate() if(usr in A.contents) src.uses = src.max_uses diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index c3b345a278c..63e5798a4b6 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -24,9 +24,10 @@ obj/item/weapon/gun/energy/staff name = "staff of change" desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" icon = 'gun.dmi' - icon_state = "staff" - item_state = "staff" + icon_state = "staffofchange" + item_state = "staffofchange" fire_sound = 'emitter.ogg' + w_class = 4.0 charge_cost = 200 projectile_type = "/obj/item/projectile/change" origin_tech = null