cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes sound and idle message issues with selective bellymode

Browse Source
This commit is contained in:
Heroman
2022-10-05 14:58:45 +10:00
parent 4215e8f6e1
commit ddf537f763
2 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/eating/bellymodes_datum_vr.dm
+35
View File
@@ -227,6 +227,7 @@ GLOBAL_LIST_INIT(digest_modes, list())
/datum/digest_mode/selective //unselectable, "smart" digestion mode for mobs only
id = DM_SELECT
noise_chance = 50
/datum/digest_mode/selective/process_mob(obj/belly/B, mob/living/L)
var/datum/digest_mode/tempmode = GLOB.digest_modes[DM_HOLD] // Default to Hold in case of big oof fallback
@@ -261,3 +262,37 @@ GLOBAL_LIST_INIT(digest_modes, list())
else
tempmode = GLOB.digest_modes[DM_DRAIN] // Otherwise drain.
return tempmode.process_mob(B, L)
/datum/digest_mode/selective/proc/get_selective_mode(obj/belly/B, mob/living/L)
var/tempmode = DM_HOLD // Default to Hold in case of big oof fallback
//if not absorbed, see if they're food
switch(L.selective_preference) // First, we respect prey prefs
if(DM_DIGEST)
if(L.digestable)
tempmode = DM_DIGEST // They want to be digested and can be, Digest
else
tempmode = DM_DRAIN // They want to be digested but can't be! Drain.
if(DM_ABSORB)
if(L.absorbable)
tempmode = DM_ABSORB // They want to be absorbed and can be. Absorb.
else
tempmode = DM_DRAIN // They want to be absorbed but can't be! Drain.
if(DM_DRAIN)
tempmode = DM_DRAIN // They want to be drained. Drain.
if(DM_DEFAULT)
switch(B.selective_preference) // They don't actually care? Time for our own preference.
if(DM_DIGEST)
if(L.digestable)
tempmode = DM_DIGEST // We prefer digestion and they're digestible? Digest
else if(L.absorbable)
tempmode = DM_ABSORB // If not digestible, are they absorbable? Then absorb.
else
tempmode = DM_DRAIN // Otherwise drain.
if(DM_ABSORB)
if(L.absorbable)
tempmode = DM_ABSORB // We prefer absorption and they're absorbable? Absorb.
else if(L.digestable)
tempmode = DM_DIGEST // If not absorbable, are they digestible? Then digest.
else
tempmode = DM_DRAIN // Otherwise drain.
return tempmode
code/modules/vore/eating/bellymodes_vr.dm
+2 -6
View File
@@ -128,12 +128,8 @@
to_chat(M, "<span class='notice'>[formatted_message]</span>")
else
if (digest_mode == DM_SELECT)
if (M.digestable)
EL = emote_lists[DM_DIGEST]
else if (M.absorbable)
EL = emote_lists[DM_ABSORB]
else
EL = emote_lists[DM_HOLD]
var/datum/digest_mode/selective/DM_S = GLOB.digest_modes[DM_SELECT]
EL = emote_lists[DM_S.get_selective_mode(src, M)]
else if(digest_mode == DM_DIGEST && !M.digestable)
EL = emote_lists[DM_HOLD] // Use Hold's emote list if we're indigestible