Converted all old events to lazy_events, removed old events, renamed lazy_event to event (#30503)

* wip refactor old events

* refactored events

* We're not lazy anymore! I mean we're still are. We just don't call ourselves that. Lazy is the new default option. It's also the only option. God, this took so long.
This commit is contained in:
DamianX
2021-09-05 06:21:03 +02:00
committed by GitHub
parent 8a146b7f4c
commit fe77ef6e20
113 changed files with 753 additions and 835 deletions

View File

@@ -8,7 +8,7 @@
/datum/control/New(var/mob/new_controller, var/atom/new_controlled)
..()
controller = new_controller
controller.lazy_register_event(/lazy_event/on_damaged, src, .proc/user_damaged)
controller.register_event(/event/damaged, src, .proc/user_damaged)
controlled = new_controlled
/datum/control/Destroy()

View File

@@ -54,7 +54,7 @@ var/runechat_icon = null
if (owned_by)
owned_by.seen_messages.Remove(src)
owned_by.images.Remove(message)
owned_by.mob.lazy_unregister_event(/lazy_event/on_destroyed, src, .proc/qdel_self)
owned_by.mob.unregister_event(/event/destroyed, src, .proc/qdel_self)
owned_by = null
message_loc = null
message = null
@@ -74,7 +74,7 @@ var/runechat_icon = null
set waitfor = FALSE
// Register client who owns this message
owned_by = owner.client
owner.lazy_register_event(/lazy_event/on_destroyed, src, .proc/qdel_self)
owner.register_event(/event/destroyed, src, .proc/qdel_self)
// Clip message
var/maxlen = owned_by.prefs.max_chat_length

View File

@@ -400,7 +400,7 @@
if(M.client)
spawn(5)//we give it time to fade out
M.client.images -= watcher_maps["\ref[M]"]
M.lazy_unregister_event(/lazy_event/on_face, src, /obj/structure/cult/altar/proc/checkPosition)
M.unregister_event(/event/face, src, /obj/structure/cult/altar/proc/checkPosition)
animate(watcher_maps["\ref[M]"], alpha = 0, time = 5, easing = LINEAR_EASING)
watching_mobs = list()
@@ -410,7 +410,7 @@
if(!(user in watching_mobs))
user.client.images -= watcher_maps["\ref[user]"]
watcher_maps -= "\ref[user]"
user.lazy_unregister_event(/lazy_event/on_face, src, /obj/structure/cult/altar/proc/checkPosition)
user.unregister_event(/event/face, src, /obj/structure/cult/altar/proc/checkPosition)
animate(watcher_maps["\ref[user]"], alpha = 0, time = 5, easing = LINEAR_EASING)
watching_mobs -= user
@@ -596,7 +596,7 @@
animate(watcher_maps["\ref[user]"], alpha = 255, time = 5, easing = LINEAR_EASING)
watching_mobs |= user
user.client.images |= watcher_maps["\ref[user]"]
user.lazy_register_event(/lazy_event/on_face, src, /obj/structure/cult/altar/proc/checkPosition)
user.register_event(/event/face, src, /obj/structure/cult/altar/proc/checkPosition)
if ("Commune with Nar-Sie")
switch(veil_thickness)
if (CULT_MENDED)
@@ -1483,7 +1483,7 @@ var/list/bloodstone_list = list()
animate(watcher_maps["\ref[user]"], alpha = 255, time = 5, easing = LINEAR_EASING)
watching_mobs |= user
user.client.images |= watcher_maps["\ref[user]"]
user.lazy_register_event(/lazy_event/on_face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
user.register_event(/event/face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
/obj/structure/cult/bloodstone/proc/checkPosition()
for(var/mob/M in watching_mobs)
@@ -1496,7 +1496,7 @@ var/list/bloodstone_list = list()
if(M.client)
spawn(5)//we give it time to fade out
M.client.images -= watcher_maps["\ref[M]"]
M.lazy_unregister_event(/lazy_event/on_face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
M.unregister_event(/event/face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
animate(watcher_maps["\ref[M]"], alpha = 0, time = 5, easing = LINEAR_EASING)
watching_mobs = list()
@@ -1506,7 +1506,7 @@ var/list/bloodstone_list = list()
if(!(user in watching_mobs))
user.client.images -= watcher_maps["\ref[user]"]
watcher_maps -= "\ref[user]"
user.lazy_unregister_event(/lazy_event/on_face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
user.unregister_event(/event/face, src, /obj/structure/cult/bloodstone/proc/checkPosition)
animate(watcher_maps["\ref[user]"], alpha = 0, time = 5, easing = LINEAR_EASING)
watching_mobs -= user
@@ -1680,7 +1680,7 @@ var/list/bloodstone_list = list()
switch(dance_move)
if ("clock")
for (var/mob/M in contributors)
M.lazy_invoke_event(/lazy_event/on_before_move)
M.invoke_event(/event/before_move)
switch (get_dir(src,M))
if (NORTHWEST,NORTH)
M.forceMove(get_step(M,EAST))
@@ -1694,11 +1694,11 @@ var/list/bloodstone_list = list()
if (SOUTHWEST,WEST)
M.forceMove(get_step(M,NORTH))
M.dir = NORTH
M.lazy_invoke_event(/lazy_event/on_after_move)
M.lazy_invoke_event(/lazy_event/on_moved, list("mover" = M))
M.invoke_event(/event/after_move)
M.invoke_event(/event/moved, list("mover" = M))
if ("counter")
for (var/mob/M in contributors)
M.lazy_invoke_event(/lazy_event/on_before_move)
M.invoke_event(/event/before_move)
switch (get_dir(src,M))
if (NORTHEAST,NORTH)
M.forceMove(get_step(M,WEST))
@@ -1712,22 +1712,22 @@ var/list/bloodstone_list = list()
if (NORTHWEST,WEST)
M.forceMove(get_step(M,SOUTH))
M.dir = SOUTH
M.lazy_invoke_event(/lazy_event/on_after_move)
M.lazy_invoke_event(/lazy_event/on_moved, list("mover" = M))
M.invoke_event(/event/after_move)
M.invoke_event(/event/moved, list("mover" = M))
if ("spin")
for (var/mob/M in contributors)
spawn()
M.dir = SOUTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = EAST
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = NORTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = WEST
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = SOUTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)

View File

@@ -652,7 +652,7 @@ var/bloodstone_backup = 0
switch(dance_move)
if ("clock")
for (var/mob/M in dancers)
M.lazy_invoke_event(/lazy_event/on_before_move)
M.invoke_event(/event/before_move)
switch (get_dir(src,M))
if (NORTHWEST,NORTH)
step_to(M, get_step(M,EAST))
@@ -662,11 +662,11 @@ var/bloodstone_backup = 0
step_to(M, get_step(M,WEST))
if (SOUTHWEST,WEST)
step_to(M, get_step(M,NORTH))
M.lazy_invoke_event(/lazy_event/on_after_move)
M.lazy_invoke_event(/lazy_event/on_moved, list("mover" = M))
M.invoke_event(/event/after_move)
M.invoke_event(/event/moved, list("mover" = M))
if ("counter")
for (var/mob/M in dancers)
M.lazy_invoke_event(/lazy_event/on_before_move)
M.invoke_event(/event/before_move)
switch (get_dir(src,M))
if (NORTHEAST,NORTH)
step_to(M, get_step(M,WEST))
@@ -676,22 +676,22 @@ var/bloodstone_backup = 0
step_to(M, get_step(M,EAST))
if (NORTHWEST,WEST)
step_to(M, get_step(M,SOUTH))
M.lazy_invoke_event(/lazy_event/on_after_move)
M.lazy_invoke_event(/lazy_event/on_moved, list("mover" = M))
M.invoke_event(/event/after_move)
M.invoke_event(/event/moved, list("mover" = M))
if ("spin")
for (var/mob/M in dancers)
spawn()
M.dir = SOUTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = EAST
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = NORTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = WEST
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)
sleep(0.75)
M.dir = SOUTH
M.lazy_invoke_event(/lazy_event/on_face)
M.invoke_event(/event/face)

View File

@@ -130,11 +130,11 @@
eviltwinrecruiter.logging = TRUE
// A player has their role set to Yes or Always
eviltwinrecruiter.player_volunteering.Add(src, "recruiter_recruiting")
eviltwinrecruiter.player_volunteering = new /callback(src, .proc/recruiter_recruiting)
// ", but No or Never
eviltwinrecruiter.player_not_volunteering.Add(src, "recruiter_not_recruiting")
eviltwinrecruiter.player_not_volunteering = new /callback(src, .proc/recruiter_not_recruiting)
eviltwinrecruiter.recruited.Add(src, "recruiter_recruited")
eviltwinrecruiter.recruited = new /callback(src, .proc/recruiter_recruited)
eviltwinrecruiter.request_player()
if(5 to INFINITY)
@@ -142,25 +142,20 @@
// var/datum/organ/internal/teleorgan = pick(H.internal_organs)
return
/datum/role/time_agent/proc/recruiter_recruiting(var/list/args)
var/mob/dead/observer/O = args["player"]
var/controls = args["controls"]
to_chat(O, "<span class=\"recruit\">You are a possible candidate for \a [src]'s evil twin. Get ready. ([controls])</span>")
/datum/role/time_agent/proc/recruiter_recruiting(mob/dead/observer/player, controls)
to_chat(player, "<span class=\"recruit\">You are a possible candidate for \a [src]'s evil twin. Get ready. ([controls])</span>")
/datum/role/time_agent/proc/recruiter_not_recruiting(var/list/args)
var/mob/dead/observer/O = args["player"]
var/controls = args["controls"]
if(O.client && get_role_desire_str(O.client.prefs.roles[TIMEAGENT]) != "Never")
to_chat(O, "<span class=\"recruit\">\a [src] is going to get shot by his evil twin. ([controls])</span>")
/datum/role/time_agent/proc/recruiter_not_recruiting(mob/dead/observer/player, controls)
if(player.client && get_role_desire_str(player.client.prefs.roles[TIMEAGENT]) != "Never")
to_chat(player, "<span class=\"recruit\">\a [src] is going to get shot by his evil twin. ([controls])</span>")
/datum/role/time_agent/proc/recruiter_recruited(var/list/args)
var/mob/dead/observer/O = args["player"]
if(O)
/datum/role/time_agent/proc/recruiter_recruited(mob/dead/observer/player)
if(player)
qdel(eviltwinrecruiter)
eviltwinrecruiter = null
var/mob/living/carbon/human/H = new /mob/living/carbon/human
H.ckey = O.ckey
H.ckey = player.ckey
H.client.changeView()
var/datum/role/time_agent/eviltwin/twin = new /datum/role/time_agent/eviltwin(H.mind, fac = src.faction)
twin.erase_target = src

View File

@@ -140,9 +140,9 @@
P.reflected = TRUE//you can now get hit by the projectile you just fired. Careful with portals!
if(curturf.z != destturf.z)
teleatom.lazy_invoke_event(/lazy_event/on_z_transition, list("user" = teleatom, "from_z" = curturf.z, "to_z" = destturf.z))
teleatom.invoke_event(/event/z_transition, list("user" = teleatom, "from_z" = curturf.z, "to_z" = destturf.z))
for(var/atom/movable/AA in recursive_type_check(teleatom))
AA.lazy_invoke_event(/lazy_event/on_z_transition, list("user" = AA, "from_z" = curturf.z, "to_z" = destturf.z))
AA.invoke_event(/event/z_transition, list("user" = AA, "from_z" = curturf.z, "to_z" = destturf.z))
if(force_teleport)
teleatom.forceMove(destturf,TRUE)

View File

@@ -87,7 +87,7 @@ var/list/datum/map_element/map_elements = list()
if(!istype(A))
return
A.lazy_register_event(/lazy_event/on_destroyed, src, .proc/clear_references)
A.register_event(/event/destroyed, src, .proc/clear_references)
return A

View File

@@ -109,7 +109,7 @@
if (hasFactionsWithHUDIcons())
update_faction_icons()
lazy_invoke_event(/lazy_event/after_mind_transfer, list("mind" = src))
invoke_event(/event/after_mind_transfer, list("mind" = src))
/datum/mind/proc/transfer_to_without_current(var/mob/new_character)
new_character.attack_log += "\[[time_stamp()]\]: mind transfer from a body-less observer to [new_character]"

View File

@@ -16,22 +16,22 @@
// Args:
// player = /mob/dead/observer
// controls = /string
var/event/player_volunteering = new()
var/callback/player_volunteering
// Same, but only called when player has disabled the role.
var/event/player_not_volunteering = new()
var/callback/player_not_volunteering
// Args: player = /mob/dead/observer or null
var/event/recruited = new()
var/callback/recruited
/datum/recruiter/New(var/atom/_subject)
subject=_subject
/datum/recruiter/proc/recruiting_player(var/mob/dead/observer/O)
INVOKE_EVENT(player_volunteering, list("player"=O, "controls"="<a href='?src=\ref[O];jump=\ref[subject]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Retract</a>"))
player_volunteering.invoke_async(O, "<a href='?src=\ref[O];jump=\ref[subject]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Retract</a>")
/datum/recruiter/proc/nonrecruiting_player(var/mob/dead/observer/O)
INVOKE_EVENT(player_not_volunteering, list("player"=O, "controls"="<a href='?src=\ref[O];jump=\ref[subject]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign up</a>"))
player_not_volunteering.invoke_async(O, "<a href='?src=\ref[O];jump=\ref[subject]'>Teleport</a> | <a href='?src=\ref[src];signup=\ref[O]'>Sign up</a>")
/datum/recruiter/proc/request_player()
currently_querying = list()
@@ -56,7 +56,7 @@
spawn(recruitment_timeout)
if(!currently_querying || currently_querying.len==0)
INVOKE_EVENT(recruited, list("player"=null))
recruited.invoke_async(null)
return
var/mob/dead/observer/O
@@ -68,10 +68,10 @@
O = pick(currently_querying)
if(!check_observer(O))
INVOKE_EVENT(recruited, list("player"=null))
recruited.invoke_async(null)
else
paiController.was_recruited(O)
INVOKE_EVENT(recruited, list("player"=O))
recruited.invoke_async(O)
/datum/recruiter/Topic(var/href, var/list/href_list)
if(href_list["signup"])
@@ -121,4 +121,5 @@
currently_querying = null
player_volunteering = null
player_not_volunteering = null
recruited = null
..()

View File

@@ -333,7 +333,7 @@
destination_port = null
return
for(var/atom/movable/AA in linked_area)
AA.lazy_invoke_event(/lazy_event/on_z_transition, list("user" = AA, "to_z" = D.z, "from_z" = linked_port.z))
AA.invoke_event(/event/z_transition, list("user" = AA, "to_z" = D.z, "from_z" = linked_port.z))
if(transit_port && get_transit_delay())
if(broadcast)

View File

@@ -16,8 +16,8 @@
effective_master = master
slave = S
effective_slave = slave
master.lazy_register_event(/lazy_event/on_moved, src, .proc/master_moved)
master.lazy_register_event(/lazy_event/on_moved, src, .proc/slave_moved)
master.register_event(/event/moved, src, .proc/master_moved)
master.register_event(/event/moved, src, .proc/slave_moved)
if(!master.current_tethers)
master.current_tethers = list()
master.current_tethers.Add(src)
@@ -27,17 +27,17 @@
/datum/tether/Destroy()
if(effective_master != master)
effective_master.lazy_unregister_event(/lazy_event/on_moved, src, .proc/master_moved)
effective_master.unregister_event(/event/moved, src, .proc/master_moved)
effective_master.current_tethers.Remove(src)
effective_master = null
master.lazy_unregister_event(/lazy_event/on_moved, src, .proc/master_moved)
master.unregister_event(/event/moved, src, .proc/master_moved)
master.current_tethers.Remove(src)
master = null
if(effective_slave != slave)
effective_slave.lazy_unregister_event(/lazy_event/on_moved, src, .proc/slave_moved)
effective_slave.unregister_event(/event/moved, src, .proc/slave_moved)
effective_slave.current_tethers.Remove(src)
effective_slave = null
slave.lazy_unregister_event(/lazy_event/on_moved, src, .proc/slave_moved)
slave.unregister_event(/event/moved, src, .proc/slave_moved)
slave.current_tethers.Remove(src)
slave = null
..()
@@ -55,12 +55,12 @@
/datum/tether/proc/master_moved()
if(effective_master != master)
if(!isturf(effective_master.loc) || isturf(master.loc))
effective_master.lazy_unregister_event(/lazy_event/on_moved, src, .proc/master_moved)
effective_master.unregister_event(/event/moved, src, .proc/master_moved)
effective_master.current_tethers.Remove(src)
effective_master = master
if(!isturf(master.loc) && effective_master == master)
effective_master = get_holder_at_turf_level(master)
effective_master.lazy_register_event(/lazy_event/on_moved, src, .proc/master_moved)
effective_master.register_event(/event/moved, src, .proc/master_moved)
if(!effective_master.current_tethers)
effective_master.current_tethers = list()
effective_master.current_tethers.Add(src)
@@ -72,12 +72,12 @@
/datum/tether/proc/slave_moved()
if(effective_slave != slave)
if(!isturf(effective_slave.loc) || isturf(slave.loc))
effective_slave.lazy_unregister_event(/lazy_event/on_moved, src, .proc/slave_moved)
effective_slave.unregister_event(/event/moved, src, .proc/slave_moved)
effective_slave.current_tethers.Remove(src)
effective_slave = slave
if(!isturf(slave.loc) && effective_slave == slave)
effective_slave = get_holder_at_turf_level(slave)
effective_slave.lazy_register_event(/lazy_event/on_moved, src, .proc/slave_moved)
effective_slave.register_event(/event/moved, src, .proc/slave_moved)
if(!effective_slave.current_tethers)
effective_slave.current_tethers = list()
effective_slave.current_tethers.Add(src)