From: MirceaKitsune Date: Fri, 16 Mar 2012 13:38:08 +0000 (+0200) Subject: Make particles depend on player scale even more X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=6b10c719f579c06812b794c182e46ecf24b2e7a2;p=voretournament%2Fvoretournament.git Make particles depend on player scale even more --- diff --git a/data/effectinfo.txt b/data/effectinfo.txt index f1f7fbe0..c4ca3d1f 100644 --- a/data/effectinfo.txt +++ b/data/effectinfo.txt @@ -4973,7 +4973,7 @@ airfriction 1 // regurgitate effect // used in: vore.qc: pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1) effect vore_regurgitate -count 30 +count 5 type blood tex 24 32 size 12 24 @@ -4994,12 +4994,12 @@ tex 0 8 size 25 30 alpha 100 256 400 color 0x000000 0x408000 -originjitter 110 110 110 +originjitter 90 90 90 // constant regurgitate effect // used in: vore.qc: pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1); effect vore_regurgitate_constant -count 3 +count 2 type blood tex 24 32 size 4 10 @@ -5020,7 +5020,7 @@ tex 0 8 size 15 20 alpha 75 192 400 color 0x000000 0x408000 -originjitter 25 25 25 +originjitter 20 20 20 // dirt ground effect // used in: cl_physics.qc: pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', 1); @@ -5037,7 +5037,7 @@ originjitter 20 20 5 // debris effect ground_dirt notunderwater -count 5 +count 2 type alphastatic tex 66 68 color 0x000000 0x886644 @@ -5063,7 +5063,7 @@ color 0x000000 0x886666 originjitter 20 20 5 // sparks effect ground_metal -count 10 +count 4 type spark tex 41 41 color 0xFFCC22 0xFF4422 diff --git a/data/qcsrc/common/constants.qh b/data/qcsrc/common/constants.qh index 28e85846..8a3ae4d6 100644 --- a/data/qcsrc/common/constants.qh +++ b/data/qcsrc/common/constants.qh @@ -485,3 +485,5 @@ float WATERLEVEL_SWIMMING = 2; float WATERLEVEL_SUBMERGED = 3; float MAX_SHOT_DISTANCE = 32768; + +float PARTICLE_MULTIPLIER = 10; diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc index 541994f2..9e000474 100644 --- 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) { GlobalSound(globalsound_metalfall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1)); - pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', self.scale); + pointparticles(particleeffectnum("ground_metal"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER)); } else { GlobalSound(globalsound_fall, CHAN_PLAYER, VOICETYPE_PLAYERSOUND, bound(0, VOL_BASE * (1 - playersize_micro(self)), 1)); - pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', self.scale); + pointparticles(particleeffectnum("ground_dirt"), self.origin, '0 0 0', floor(self.scale * PARTICLE_MULTIPLIER)); } sound(self, CHAN_AUTO, "misc/macro_hitground.wav", bound(0, VOL_BASE * playersize_macro(self), 1), ATTN_NORM); diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index fde51ba8..b363e337 100644 --- 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 PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND); setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating - pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1); + pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER)); e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff; e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff; e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff; diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 3ba0134a..79fcc210 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -436,7 +436,7 @@ void Vore_Regurgitate(entity e) PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND); setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating - pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1); + pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER)); e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff; e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff; e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle") * scalediff; @@ -724,7 +724,7 @@ void Vore() if(cvar("g_vore_regurgitatecolor_particles")) if(self.regurgitatecolor_particles_tick < time) { - pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', 1); + pointparticles(particleeffectnum("vore_regurgitate_constant"), self.origin, '0 0 0', floor((cvar("g_healthsize") ? self.scale : 1) * PARTICLE_MULTIPLIER)); self.regurgitatecolor_particles_tick = time + cvar("g_vore_regurgitatecolor_particles") * vlen(self.colormod); // particle time depends on how dirty the player is } } diff --git a/docs/TODO.txt b/docs/TODO.txt index c004e288..00b40759 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -152,4 +152,4 @@ - 0.7 | 0.8 BUG: Display digits still appear on the 3rd person weapon when a player dies and becomes gibbed -- 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