mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
616b4b60e4
The wizard den is no longer pitch black. Fixes targeted spells using the wrong caster/source. Adds some missing checks using the caster source above. Re-logging should no longer cause a loss of spell UI icons. Mind transfer should no longer cause unintended spell loss.
74 lines
2.3 KiB
Plaintext
74 lines
2.3 KiB
Plaintext
/mob/Life()
|
|
..()
|
|
if(spell_masters && spell_masters.len)
|
|
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
|
spell_master.update_spells(0, src)
|
|
|
|
/mob/Login()
|
|
..()
|
|
if(spell_masters)
|
|
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
|
spell_master.toggle_open(1)
|
|
client.screen -= spell_master
|
|
|
|
/mob/Stat()
|
|
. = ..()
|
|
if(. && spell_list && spell_list.len)
|
|
for(var/spell/S in spell_list)
|
|
if((!S.connected_button) || !statpanel(S.panel))
|
|
continue //Not showing the noclothes spell
|
|
switch(S.charge_type)
|
|
if(Sp_RECHARGE)
|
|
statpanel(S.panel,"[S.charge_counter/10.0]/[S.charge_max/10]",S.connected_button)
|
|
if(Sp_CHARGES)
|
|
statpanel(S.panel,"[S.charge_counter]/[S.charge_max]",S.connected_button)
|
|
if(Sp_HOLDVAR)
|
|
statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S.connected_button)
|
|
|
|
/mob/proc/add_spell(var/spell/spell_to_add, var/spell_base = "wiz_spell_ready", var/master_type = /obj/screen/movable/spell_master)
|
|
if(!spell_masters)
|
|
spell_masters = list()
|
|
|
|
if(spell_masters.len)
|
|
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
|
if(spell_master.type == master_type)
|
|
spell_list.Add(spell_to_add)
|
|
spell_master.add_spell(spell_to_add)
|
|
return 1
|
|
|
|
var/obj/screen/movable/spell_master/new_spell_master = new master_type //we're here because either we didn't find our type, or we have no spell masters to attach to
|
|
if(client)
|
|
src.client.screen += new_spell_master
|
|
new_spell_master.spell_holder = src
|
|
new_spell_master.add_spell(spell_to_add)
|
|
if(spell_base)
|
|
new_spell_master.icon_state = spell_base
|
|
spell_masters.Add(new_spell_master)
|
|
spell_list.Add(spell_to_add)
|
|
return 1
|
|
|
|
/mob/proc/remove_spell(var/spell/spell_to_remove)
|
|
if(!spell_to_remove || !istype(spell_to_remove))
|
|
return
|
|
|
|
if(!(spell_to_remove in spell_list))
|
|
return
|
|
|
|
if(!spell_masters || !spell_masters.len)
|
|
return
|
|
|
|
spell_list.Remove(spell_to_remove)
|
|
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
|
spell_master.remove_spell(spell_to_remove)
|
|
return 1
|
|
|
|
/mob/proc/silence_spells(var/amount = 0)
|
|
if(!(amount >= 0))
|
|
return
|
|
|
|
if(!spell_masters || !spell_masters.len)
|
|
return
|
|
|
|
for(var/obj/screen/movable/spell_master/spell_master in spell_masters)
|
|
spell_master.silence_spells(amount)
|