cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 10:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some overly broad bad helpers and limit them to spell code (#47789)

Browse Source
This commit is contained in:
oranges
2019-11-17 06:27:15 +13:00
committed by Tad Hardesty
parent 423f8ef3c4
commit 1d6bb45d74
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/__HELPERS/unsorted.dm
View File

@@ -663,22 +663,6 @@ Turf and target are separate in case you want to teleport some distance from a t
/proc/anyprob(value)
return (rand(1,value)==value)
/proc/view_or_range(distance = world.view , center = usr , type)
switch(type)
if("view")
. = view(distance,center)
if("range")
. = range(distance,center)
return
/proc/oview_or_orange(distance = world.view , center = usr , type)
switch(type)
if("view")
. = oview(distance,center)
if("range")
. = orange(distance,center)
return
/proc/parse_zone(zone)
if(zone == BODY_ZONE_PRECISE_R_HAND)
return "right hand"

8
code/modules/spells/spell.dm
View File

@@ -355,6 +355,13 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell/proc/cast(list/targets,mob/user = usr)
return
/obj/effect/proc_holder/spell/proc/view_or_range(distance = world.view, center=usr, type="view")
switch(type)
if("view")
. = view(distance,center)
if("range")
. = range(distance,center)
/obj/effect/proc_holder/spell/proc/revert_cast(mob/user = usr) //resets recharge or readds a charge
switch(charge_type)
if("recharge")
@@ -469,7 +476,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
return
perform(targets,user=user)
/obj/effect/proc_holder/spell/aoe_turf/choose_targets(mob/user = usr)
var/list/targets = list()

2
code/modules/spells/spell_types/lightning.dm
View File

@@ -75,7 +75,7 @@
current.electrocute_act(bolt_energy,"Lightning Bolt",flags = SHOCK_NOGLOVES)
playsound(get_turf(current), 'sound/magic/lightningshock.ogg', 50, TRUE, -1)
var/list/possible_targets = new
for(var/mob/living/M in view_or_range(range,target,"view"))
for(var/mob/living/M in view(range,target))
if(user == M || target == M && los_check(current,M)) // || origin == M ? Not sure double shockings is good or not
continue
possible_targets += M