From 19555c7cfbd7bf309289213fdf0efb091f533b30 Mon Sep 17 00:00:00 2001
From: "VivianFoxfoot@gmail.com"
 <VivianFoxfoot@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 6 Mar 2012 02:11:22 +0000
Subject: [PATCH] Fixes wizard projectile spells.  (Issue 387) Adds a var to
 the spellbook that determines if it can be used for buying veil renders and
 arsenals.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3259 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/datums/spells/projectile.dm        | 4 +++-
 code/defines/obj/weapon.dm              | 1 +
 code/game/gamemodes/wizard/spellbook.dm | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/code/datums/spells/projectile.dm b/code/datums/spells/projectile.dm
index 31530d33808..b255e84523a 100644
--- a/code/datums/spells/projectile.dm
+++ b/code/datums/spells/projectile.dm
@@ -16,7 +16,7 @@
 	var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle
 	var/proj_homing = 1 //if it follows the target
 	var/proj_insubstantial = 0 //if it can pass through dense objects or not
-	var/proj_trigger_range = 1 //the range from target at which the projectile triggers cast(target)
+	var/proj_trigger_range = 0 //the range from target at which the projectile triggers cast(target)
 
 	var/proj_lifespan = 15 //in deciseconds * proj_step_delay
 	var/proj_step_delay = 1 //lower = faster
@@ -39,6 +39,8 @@
 
 			var/current_loc = usr.loc
 
+			projectile.loc = current_loc
+
 			for(var/i = 0,i < proj_lifespan,i++)
 				if(!projectile)
 					break
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 6f368ae3d60..42dbaa3cdcb 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -922,6 +922,7 @@
 	var/temp = null
 	var/spell_type = "verb"
 	var/max_uses = 5
+	var/op = 1
 
 /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 90263fe24eb..29867b5dd97 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -25,7 +25,8 @@
 		dat += "<A href='byond://?src=\ref[src];spell_choice=11'>Mutate</A> (60)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=12'>Ethereal Jaunt</A> (60)<BR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=13'>Knock</A> (10)<BR>"
-		dat += "<A href='byond://?src=\ref[src];spell_choice=14'>Summon Guns</A> (One time use, global spell)<BR>"
+		if(op)
+			dat += "<A href='byond://?src=\ref[src];spell_choice=14'>Summon Guns</A> (One time use, global spell)<BR>"
 		dat += "<HR>"
 		dat += "<B>Artefacts:</B><BR>"
 		dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.<BR>"
@@ -35,7 +36,8 @@
 		dat += "<HR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=16'>Six Soul Stone Shards and the spell Artificer</A><BR>"
 		dat += "<HR>"
-		dat += "<A href='byond://?src=\ref[src];spell_choice=17'>Veil Render</A><BR>"
+		if(op)
+			dat += "<A href='byond://?src=\ref[src];spell_choice=17'>Veil Render</A><BR>"
 		dat += "<HR>"
 		dat += "<A href='byond://?src=\ref[src];spell_choice=18'>Re-memorize Spells</A><BR>"
 	user << browse(dat, "window=radio")