fix vore helpers (#18724)

* fix vore helpers

* .

* fix that too
This commit is contained in:
Kashargul
2025-11-03 20:38:11 -05:00
committed by GitHub
parent 850bc7c5ad
commit d9b5e1fdc9
20 changed files with 55 additions and 51 deletions
@@ -156,7 +156,7 @@
/obj/effect/abstract/dark_maw/proc/do_trigger(var/mob/living/L)
var/will_vore = 1
if(!(target in owner) || CanPhaseVore(owner, L))
if(!(target in owner) || can_phase_vore(owner, L))
will_vore = 0
if(!src || src.gc_destroyed)
@@ -169,12 +169,12 @@
var/mob/living/our_prey
if(potentials.len)
var/mob/living/target = pick(potentials)
if(CanPhaseVore(src, target))
if(can_phase_vore(src, target))
target.forceMove(vore_selected)
to_chat(target, span_vwarning("\The [src] phases in around you, [vore_selected.vore_verb]ing you into their [vore_selected.get_belly_name()]!"))
to_chat(src, span_vwarning("You phase around [target], [vore_selected.vore_verb]ing them into your [vore_selected.get_belly_name()]!"))
our_prey = target
else if(CanPhaseVore(target, src))
else if(can_phase_vore(target, src))
our_prey = src
forceMove(target.vore_selected)
to_chat(target, span_vwarning("\The [src] phases into you, [target.vore_selected.vore_verb]ing them into your [target.vore_selected.get_belly_name()]!"))
+1 -1
View File
@@ -167,7 +167,7 @@
continue //Don't do anything to ourselves.
if(living_mob.stat)
continue
if(!CanStumbleVore(living_guy, living_mob) && !CanStumbleVore(living_mob, living_guy)) //Works both ways! Either way, someone's getting eaten!
if(!can_stumble_vore(living_guy, living_mob) && !can_stumble_vore(living_mob, living_guy)) //Works both ways! Either way, someone's getting eaten!
continue
living_mob.stumble_into(living_guy) //logic reversed here because the game is DUMB. This means that living_guy is stumbling into the target!
living_guy.visible_message(span_danger("[living_guy] loses their balance and slips into [living_mob]!"), span_boldwarning("You lose your balance, slipping into [living_mob]!"))
@@ -108,7 +108,7 @@ Bonus
var/place
for(var/mob/living/carbon/human/B in range(A.stage, mob))
if(CanSpontaneousVore(B, mob))
if(can_spontaneous_vore(B, mob))
destination += B.vore_selected
for(var/turf/T in range(A.stage, mob))
@@ -125,9 +125,9 @@ Bonus
var/mob/living/unlucky = locate() in place
if(unlucky)
if(CanSpontaneousVore(unlucky, mob))
if(can_spontaneous_vore(unlucky, mob))
place = unlucky.vore_selected
else if(CanSpontaneousVore(mob, unlucky))
else if(can_spontaneous_vore(mob, unlucky))
unlucky.forceMove(mob.vore_selected)
mob.emote("sneeze")
@@ -26,14 +26,14 @@
return
//We are able to eat the person stumbling into us.
if(CanStumbleVore(prey = target, pred = source)) //This is if the person stumbling into us is able to eat us!
if(can_stumble_vore(prey = target, pred = source)) //This is if the person stumbling into us is able to eat us!
source.visible_message(span_vwarning("[target] flops carelessly into [source]!"))
source.begin_instant_nom(source, prey = target, pred = source, belly = source.vore_selected)
target.stop_flying()
return CANCEL_STUMBLED_INTO
//The person stumbling into us is able to eat us.
if(CanStumbleVore(prey = source, pred = target)) //This is if the person stumbling into us is able to be eaten by us! BROKEN!
if(can_stumble_vore(prey = source, pred = target)) //This is if the person stumbling into us is able to be eaten by us! BROKEN!
source.visible_message(span_vwarning("[target] flops carelessly into [source]!"))
target.forceMove(get_turf(source))
source.begin_instant_nom(target, prey = source, pred = target, belly = target.vore_selected)
@@ -52,7 +52,7 @@
//pred = drop_mob
//prey = source
//result: source is eaten by drop_mob
if(CanDropVore(prey = source, pred = drop_mob))
if(can_drop_vore(prey = source, pred = drop_mob))
drop_mob.feed_grabbed_to_self_falling_nom(drop_mob, prey = source)
drop_mob.visible_message(span_vdanger("\The [drop_mob] falls right onto \the [source]!"))
return COMSIG_CANCEL_FALL
@@ -60,7 +60,7 @@
//pred = source
//prey = drop_mob
//result: drop_mob is eaten by source
if(CanDropVore(prey = drop_mob, pred = source))
if(can_drop_vore(prey = drop_mob, pred = source))
source.feed_grabbed_to_self_falling_nom(source, prey = drop_mob)
source.Weaken(4)
source.visible_message(span_vdanger("\The [drop_mob] falls right into \the [source]!"))
@@ -93,7 +93,7 @@
// PERSON BEING HIT: CAN BE DROP PRED, ALLOWS THROW VORE.
// PERSON BEING THROWN: DEVOURABLE, ALLOWS THROW VORE, CAN BE DROP PREY.
if(CanThrowVore(prey = thrown_mob, pred = source))
if(can_throw_vore(prey = thrown_mob, pred = source))
if(!source.vore_selected)
return
source.vore_selected.nom_mob(thrown_mob) //Eat them!!!
@@ -106,7 +106,7 @@
// PERSON BEING HIT: CAN BE DROP PREY, ALLOWS THROW VORE, AND IS DEVOURABLE.
// PERSON BEING THROWN: CAN BE DROP PRED, ALLOWS THROW VORE.
else if(CanThrowVore(prey = source, pred = thrown_mob))//Pred thrown into prey.
else if(can_throw_vore(prey = source, pred = thrown_mob))//Pred thrown into prey.
if(!thrown_mob.vore_selected)
return
source.visible_message(span_vwarning("[source] suddenly slips inside of [thrown_mob]'s [lowertext(thrown_mob.vore_selected.name)] as [thrown_mob] flies into them!"))
@@ -125,11 +125,11 @@
return
//Person being slipped into eats the person slipping
if(CanSlipVore(pred = source, prey = crossed)) //If we can vore them go for it
if(can_slip_vore(pred = source, prey = crossed)) //If we can vore them go for it
source.begin_instant_nom(source, prey = crossed, pred = source, belly = source.vore_selected)
return COMPONENT_BLOCK_CROSS
//The person slipping eats the person being slipped into
else if(CanSlipVore(pred = crossed, prey = source))
else if(can_slip_vore(pred = crossed, prey = source))
source.begin_instant_nom(crossed, prey = source, pred = crossed, belly = crossed.vore_selected) //Must be
return //We DON'T block it here. Pred can slip onto the prey's tile, no problem.