cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-21 12:17:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

even better target selection

Browse Source
This commit is contained in:
Seris02
2023-02-03 18:05:24 +08:00
parent 966d1ef9f2
commit f7ad9e0004
2 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/say_ch.dm
+11 -6
View File
@@ -10,26 +10,31 @@
var/mob/ultimate_mob
var/atom/to_check = loc
var/n = 0
while (to_check && !isturf(to_check) && n < 6)
while (to_check && !isturf(to_check) && n++ < 16)
if (ismob(to_check))
ultimate_mob = to_check
to_check = to_check.loc
n = 0
n++
return ultimate_mob
/atom/proc/get_ultimate_belly()
var/obj/belly/ultimate_belly
var/atom/to_check = loc
var/n = 0
while (to_check && !isturf(to_check) && n < 6)
while (to_check && !isturf(to_check) && n++ < 16)
if (isbelly(to_check))
ultimate_belly = to_check
to_check = to_check.loc
n = 0
n++
return ultimate_belly
/atom/proc/is_inside_atom_recursive(var/atom/atom) //is this already a thing??
var/atom/to_check = loc
var/n = 0
while (to_check && !isturf(to_check) && n++ < 16)
if (to_check == atom)
return TRUE
to_check = to_check.loc
return FALSE
/mob/verb/me_verb_subtle_distanced(message as message) //This would normally go in say.dm
set name = "Subtle-Targeted"
set category = "IC"
code/modules/mob/say_vr.dm
+22 -11
View File
@@ -64,10 +64,21 @@
var/all_targets_mobs = list()
var/all_targets_objs = list()
if (distanced)
var/obj/belly/u_belly = get_ultimate_belly()
var/mob/living/u_pred = u_belly?.owner || src
var/mob/u_mob = get_ultimate_mob() || src
var/possessed = list()
var/valid_targets = list("One tile radius" = "otr", "Single tile" = "st", "All in belly and preds" = "aibap")
for (var/obj/item/i in vis_objs)
if (LAZYLEN(i.possessed_voice))
var/x = i.get_ultimate_mob()
if ((!x && (isturf(loc) || i.loc == loc)) || x == u_mob)
var/is_active = FALSE
for (var/mob/M in i.possessed_voice)
if (M.client)
is_active = TRUE
break
if (is_active)
valid_targets["Only [i]"] = "\ref[i]"
possessed += i.possessed_voice
for (var/mob/M as anything in vis_mobs)
if (!M.client || M == src)
continue
@@ -75,16 +86,16 @@
if (isbelly(M.loc) && (M.loc in contents))
valid_targets["Only [M]"] = "\ref[M]"
continue
if ((isturf(M.loc) && !u_belly) || M.loc == loc)
if (isturf(M.loc) || M.loc == loc)
valid_targets["Only [M]"] = "\ref[M]"
continue
if (get_turf(M) == get_turf(src)) //so we aren't going through everything, it's a safe bet the belly is in the mob it's supposed to be in
var/obj/belly/belly = M.get_ultimate_belly()
if (belly?.owner == u_pred || u_pred == M)
if (get_turf(M) == get_turf(src)) //so we aren't going through everything
if (length(possessed))
if (M in possessed)
continue
if (M == u_mob || M.is_inside_atom_recursive(u_mob))
valid_targets["Only [M]"] = "\ref[M]"
for (var/obj/item/i in vis_objs)
if (LAZYLEN(i.possessed_voice) && i.get_ultimate_mob() == src)
valid_targets["Only [i]"] = "\ref[i]"
continue
valid_targets += list("Cancel" = "c")
valid_targets += list("Cancel and print to chat" = "captc")
var/selected = input(src, "Choose the target to send it to.", "Subtle Distance", "One tile radius") as anything in valid_targets //default to one tile radius
@@ -113,7 +124,7 @@
if (get_dist(get_turf(src), get_turf(M)) < 1)
all_targets_objs |= M
if ("aibap")
var/obj/belly/belly = get_ultimate_belly() //in case it's changed
var/obj/belly/belly = get_ultimate_belly()
var/mob/pred = belly?.owner || src
if (pred)
all_targets_mobs |= pred.get_all_in_bellies()