cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes wizard projectile spells. (Issue 387)

Browse Source 
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
This commit is contained in:
VivianFoxfoot@gmail.com
2012-03-06 02:11:22 +00:00
parent 439956a809
commit 19555c7cfb
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/datums/spells/projectile.dm
View File

@@ -16,7 +16,7 @@
var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle var/proj_lingering = 0 //if it lingers or disappears upon hitting an obstacle
var/proj_homing = 1 //if it follows the target var/proj_homing = 1 //if it follows the target
var/proj_insubstantial = 0 //if it can pass through dense objects or not 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_lifespan = 15 //in deciseconds * proj_step_delay
var/proj_step_delay = 1 //lower = faster var/proj_step_delay = 1 //lower = faster
@@ -39,6 +39,8 @@
var/current_loc = usr.loc var/current_loc = usr.loc
projectile.loc = current_loc
for(var/i = 0,i < proj_lifespan,i++) for(var/i = 0,i < proj_lifespan,i++)
if(!projectile) if(!projectile)
break break

1
code/defines/obj/weapon.dm
View File

@@ -922,6 +922,7 @@
var/temp = null var/temp = null
var/spell_type = "verb" var/spell_type = "verb"
var/max_uses = 5 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 /obj/item/weapon/spellbook/object_type_spells //used for giving out object spells as opposed to verb spells
spell_type = "object" spell_type = "object"

6
code/game/gamemodes/wizard/spellbook.dm
View File

@@ -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=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=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=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 += "<HR>"
dat += "<B>Artefacts:</B><BR>" dat += "<B>Artefacts:</B><BR>"
dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.<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 += "<HR>"
dat += "<A href='byond://?src=\ref[src];spell_choice=16'>Six Soul Stone Shards and the spell Artificer</A><BR>" dat += "<A href='byond://?src=\ref[src];spell_choice=16'>Six Soul Stone Shards and the spell Artificer</A><BR>"
dat += "<HR>" 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 += "<HR>"
dat += "<A href='byond://?src=\ref[src];spell_choice=18'>Re-memorize Spells</A><BR>" dat += "<A href='byond://?src=\ref[src];spell_choice=18'>Re-memorize Spells</A><BR>"
user << browse(dat, "window=radio") user << browse(dat, "window=radio")