Consumable item effects for swallowing and regurgitating, some identical to those...

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index ddce1aca1316b9f3daf94e5b9544aa7ff4085d41..d92909c2bbb7d72414d349a9ed5e924cd9d60b6d 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -207,6 +207,7 @@ set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player"
 set g_balance_vore_swallow_stealprey 0.7 "probability of stealing someone's prey when eating them (when true their prey joins your stomach rather than popping out). 0 = never, 1 = always"\r
 set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
 set g_balance_vore_swallow_predator_punchangle 12 "your view gets tilted by this amount when swallowing someone"\r
+set g_balance_vore_swallow_predator_punchangle_item 6 "your view gets tilted by this amount when swallowing an item"\r
 set g_balance_vore_swallow_prey_punchvector 25 "your view gets lifted by this amount when getting swallowed"\r
 set g_balance_vore_regurgitate_damage 10 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given this amount of swallow progress, to simulate being more vulnerable (if slow swallowing is enabled)"\r
@@ -214,6 +215,7 @@ set g_balance_vore_regurgitate_force 600 "regurgitated players rocket out at thi
 set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by this amount when regurgitating someone, opposite of the direction they are facing"\r
 set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay"\r
 set g_balance_vore_regurgitate_predator_punchangle 12 "your view gets tilted by this amount when regurgitating someone"\r
+set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item"\r
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r
 set g_balance_vore_digestion_damage 4 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_damage_death 2 "amplify digestion damage by this amount when the prey is dead"\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 5bf6a540911e96b75ff16807424c91ad2b0aad88..2ea388a3c9cae172d03664bdd8bf6503bbb9aa9e 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -248,6 +248,14 @@ float Item_Consumable_Customizeentityforclient()
 \r
 void Item_Consumable_Remove()\r
 {\r
+       // predator effects, some common to those in Vore_Regurgitate\r
+       PlayerSound(self.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
+       setanim(self.predator, self.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
+       pointparticles(particleeffectnum("vore_regurgitate"), self.predator.origin, '0 0 0', 1);\r
+       self.predator.punchangle_x += cvar("g_balance_vore_regurgitate_predator_punchangle_item");\r
+       self.predator.regurgitate_prepare = 0;\r
+       self.predator.action_delay = time + cvar("g_balance_vore_action_delay");\r
+\r
        self.nextthink = 0;\r
        remove(self);\r
        self = world;\r
@@ -275,6 +283,13 @@ void Item_Consumable_Spawn(entity e, entity pl)
        item.customizeentityforclient = Item_Consumable_Customizeentityforclient;\r
        item.think = Item_Consumable_Think;\r
        item.nextthink = time;\r
+\r
+       // predator effects, some common to those in Vore_Swallow\r
+       PlayerSound(e.predator, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
+       setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
+       e.predator.punchangle_x -= cvar("g_balance_vore_swallow_predator_punchangle_item");\r
+       e.predator.regurgitate_prepare = 0;\r
+       Vore_AutoDigest(e.predator);\r
 }\r
 \r
 float Item_GiveTo(entity item, entity player)\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 379385e879b8c94de7c44b9075b93e942d735b47..aac9eda24ddff885d53a0d5becc9b8a197ec2987 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -195,7 +195,7 @@ void Vore_AutoDigest(entity e)
                return;\r
        if(!e.cvar_cl_vore_autodigest || clienttype(e) != CLIENTTYPE_REAL)\r
                return; // this feature is only for players, not bots\r
-       if(e.stomach_load > 1)\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