Disable automatic digestion in RPG, and also trigger it if our stomach is already...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d33fe5ad5f0fa6c940a7c91993dc96d1fd460283..c3827e2cf6e320354bf8ff0c335144e25d644bd3 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1647,7 +1647,7 @@ seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us wh
 seta cl_vore_swallowmodel 1 "when enabled, we see the swallow model around us while getting eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
 seta cl_vore_cutvolume_sound 0.90 "sound volume is reduced by this amount when you are in a stomach or being swallowed"\r
 seta cl_vore_cutvolume_music 0.75 "music volume is reduced by this amount when you are in a stomach or being swallowed"\r
-seta cl_vore_autodigest 2 "when enabled, the player will automatically begin digesting stuff as long as no team mates are inside. 0 = disabled, 1 = items, 2 = items & players"\r
+seta cl_vore_autodigest 2 "when enabled, the player will automatically begin digesting stuff as long as no team mates are inside. 0 = disabled, 1 = items, 2 = items & players, does not work in RPG"\r
 seta cl_vore_vieweffects_idlescale_predator 35 "the view will move around by this ammount while swallowing someone (based on progress), reserves the cvar v_idlescale"\r
 seta cl_vore_vieweffects_idlescale_prey 50 "the view will move around by this ammount while being swallowed (based on progress), reserves the cvar v_idlescale"\r
 seta cl_vore_vieweffects_idlescale_stomach 15 "the view will move around by this ammount while in the stomach, reserves the cvar v_idlescale"\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index b88e2802d1d5724ec84fe6e2f1f8a50a4011507b..837a5210d61920c605e7cffdc8f745f1b9209a0e 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -157,10 +157,10 @@ void Vore_AutoDigest(entity e)
 \r
        if(!cvar("g_vore_digestion") || e.digesting)\r
                return;\r
+       if(g_rpg)\r
+               return; // RPG is choice based, so don't do things automatically there\r
        if(clienttype(e) != CLIENTTYPE_REAL)\r
                return; // this feature is only for players, not bots\r
-       if(e.stomach_load)\r
-               return; // don't start digestion if we already ate someone, as that means we manually disabled it after the first prey and want it off\r
        if(Stomach_TeamMates_check(e))\r
                return; // never begin automatic digestion if we've swallowed a team mate\r
 \r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 789c56f7ee3957b6bf2696dd16cdd192148ebc9c..7ddf27439e3550d0c3d85469ba0b3f3b7f9f32c9 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -162,4 +162,8 @@
 \r
 - 0.8: Fonic helper for speed: Account healthsize in danger detection\r
 \r
-- 0.8: Players cry for help when being swallowed by a team mate, not good (and predators might taunt when doing that)
\ No newline at end of file
+- 0.8: Players cry for help when being swallowed by a team mate, not good (and predators might taunt when doing that)\r
+\r
+- +0.8: In Race and RaceCTS, having a big belly should give you some boost or bonus\r
+\r
+- 0.7 | 0.8: Is it right to get screen flashes when team healing?
\ No newline at end of file