From e11cc190e726b1f0e9a5fac579c5448422af6f6b Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 3 Jul 2021 03:40:34 -0700 Subject: [PATCH 1/3] Watcher optimization --- .../mob/living/simple_animal/hostile/mining_mobs/basilisk.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index f2ece50af2..3aa0fbcfaf 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -103,7 +103,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/proc/consume_bait() var/list/L = list() - for(var/obj/O in view(src, 9)) + for(var/obj/O in view(1, src)) L += O var/obj/item/stack/ore/diamond/diamonds = locate(/obj/item/stack/ore/diamond) in L if(diamonds) From 15078f0f7129326df5c48f6fb2bd3c4c2fb2bdd8 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 3 Jul 2021 03:50:43 -0700 Subject: [PATCH 2/3] Properly optimizes watchers --- .../hostile/mining_mobs/basilisk.dm | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 3aa0fbcfaf..9210d8a965 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -102,23 +102,13 @@ consume_bait() /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/proc/consume_bait() - var/list/L = list() for(var/obj/O in view(1, src)) - L += O - var/obj/item/stack/ore/diamond/diamonds = locate(/obj/item/stack/ore/diamond) in L - if(diamonds) - var/distanced = 0 - distanced = get_dist(loc,diamonds.loc) - if(distanced <= 1 && diamonds) - qdel(diamonds) - src.visible_message("[src] consumes [diamonds], and it disappears! ...At least, you think.") - var/obj/item/pen/survival/bait = locate(/obj/item/pen/survival) in L - if(bait) - var/distanceb = 0 - distanceb = get_dist(loc,bait.loc) - if(distanceb <= 1 && bait) - qdel(bait) - visible_message("[src] examines [bait] closer, and telekinetically shatters the pen.") + if(istype(O, /obj/item/stack/ore/diamond/diamonds)) + qdel(O) + src.visible_message("[src] consumes [O], and it disappears! ...At least, you think.") + else if(istype(O, /obj/item/pen/survival)) + qdel(O) + src.visible_message("[src] examines [O] closer, and telekinetically shatters the pen.") /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/random/Initialize() . = ..() From 970e089fb03acf7abbc788d6beb9e54ac8215f44 Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sat, 3 Jul 2021 03:52:07 -0700 Subject: [PATCH 3/3] glass houses --- .../mob/living/simple_animal/hostile/mining_mobs/basilisk.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 9210d8a965..24e595ef7e 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -103,7 +103,7 @@ /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/proc/consume_bait() for(var/obj/O in view(1, src)) - if(istype(O, /obj/item/stack/ore/diamond/diamonds)) + if(istype(O, /obj/item/stack/ore/diamond)) qdel(O) src.visible_message("[src] consumes [O], and it disappears! ...At least, you think.") else if(istype(O, /obj/item/pen/survival))