Make particles depend on player scale even more

diff --git a/data/effectinfo.txt b/data/effectinfo.txt
index f1f7fbe0ba95c6c9f2503c6148c21c79ee05c79e..c4ca3d1fdf52e2df54ff931f3adfbc0a5efff82a 100644 (file)
--- a/data/effectinfo.txt
+++ b/data/effectinfo.txt
@@ -4973,7 +4973,7 @@ airfriction 1
 // regurgitate effect\r
 // used in: vore.qc:   pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1)\r
 effect vore_regurgitate\r
-count 30\r
+count 5\r
 type blood\r
 tex 24 32\r
 size 12 24\r
@@ -4994,12 +4994,12 @@ tex 0 8
 size 25 30\r
 alpha 100 256 400\r
 color 0x000000 0x408000\r
-originjitter 110 110 110\r
+originjitter 90 90 90\r
 \r
 // constant regurgitate effect\r
 // used in: vore.qc:   pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1);\r
 effect vore_regurgitate_constant\r
-count 3\r
+count 2\r
 type blood\r
 tex 24 32\r
 size 4 10\r
@@ -5020,7 +5020,7 @@ tex 0 8
 size 15 20\r
 alpha 75 192 400\r
 color 0x000000 0x408000\r
-originjitter 25 25 25\r
+originjitter 20 20 20\r
 \r
 // dirt ground effect\r
 // used in: cl_physics.qc:     pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', 1);\r
@@ -5037,7 +5037,7 @@ originjitter 20 20 5
 // debris\r
 effect ground_dirt\r
 notunderwater\r
-count 5\r
+count 2\r
 type alphastatic\r
 tex 66 68\r
 color 0x000000 0x886644\r
@@ -5063,7 +5063,7 @@ color 0x000000 0x886666
 originjitter 20 20 5\r
 // sparks\r
 effect ground_metal\r
-count 10\r
+count 4\r
 type spark\r
 tex 41 41\r
 color 0xFFCC22 0xFF4422\r

diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh
index 28e8584685caddf21fe1bac3273ce23f9f5d8968..8a3ae4d62648276cb5c6dd385f4193adc0a192f1 100644 (file)
--- a/data/qcsrc/common/constants.qh
+++ b/data/qcsrc/common/constants.qh
@@ -485,3 +485,5 @@ float WATERLEVEL_SWIMMING = 2;
 float WATERLEVEL_SUBMERGED = 3;\r
 \r
 float MAX_SHOT_DISTANCE = 32768;\r
+\r
+float PARTICLE_MULTIPLIER = 10;\r

diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 541994f21135d7a0fdb2a1fa9ca4ea2657d0f782..9e000474b19d2c722196a1782ec299f26cb34b32 100644 (file)
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -871,12 +871,12 @@ void SV_PlayerPhysics()
                                        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)\r
                                        {\r
                                                GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1));\r
-                                               pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', self.scale);\r
+                                               pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER));\r
                                        }\r
                                        else\r
                                        {\r
                                                GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1));\r
-                                               pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', self.scale);\r
+                                               pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER));\r
                                        }\r
                                        sound(self, CHAN_AUTO, "misc/macro_hitground.wav", bound(0, VOL_BASE * playersize_macro(self), 1), ATTN_NORM);\r
 \r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index fde51ba8bfe40ddee8ca6ebc0611ff143479e538..b363e337db46d4dde6badfb0c9b66e3b5b04b126 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -299,7 +299,7 @@ void Item_Consumable_Remove(entity e, float regurgitate)
                // predator effects, some common to those in Vore_Regurgitate\r
                PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
                setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
-               pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r
+               pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER));\r
                e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r
                e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r
                e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 3ba0134a645684ffbee796815d5e8eaa6b814ac4..79fcc21027812af88dee898196445e74001c3c45 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -436,7 +436,7 @@ void Vore_Regurgitate(entity e)
 \r
        PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
-       pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r
+       pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER));\r
        e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;\r
        e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;\r
        e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff;\r
@@ -724,7 +724,7 @@ void Vore()
                if(cvar("g_vore_regurgitatecolor_particles"))\r
                if(self.regurgitatecolor_particles_tick < time)\r
                {\r
-                       pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1);\r
+                       pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', floor((cvar("g_healthsize") ? self.scale : 1) * PARTICLE_MULTIPLIER));\r
                        self.regurgitatecolor_particles_tick = time + cvar("g_vore_regurgitatecolor_particles") * vlen(self.colormod); // particle time depends on how dirty the player is\r
                }\r
        }\r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index c004e2881e3672f6e5d01cb3910190c0f11362aa..00b40759bf357c59ad5ee74f9b9ebe91c8fa303b 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -152,4 +152,4 @@
 \r
 - 0.7 | 0.8 BUG: Display digits still appear on the 3rd person weapon when a player dies and becomes gibbed\r
 \r
-- 0.7: Regurgitate particle count obased on player size
\ No newline at end of file
+- 0.7: Bots should digest items even at 0 skill
\ No newline at end of file