X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=b44e6ec478c2af571a4c0e630f8bcc3d211c5483;hp=30dcec81c016b58f58073a376c16800b4b3ead21;hb=a84e64941a7e765f09aee5604bd7d50f0064545a;hpb=6223550131de198e4a77c27f1ebb97b80e33b75a diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index 30dcec81..b44e6ec4 100644 --- a/data/qcsrc/server/vore.qc +++ b/data/qcsrc/server/vore.qc @@ -1,5 +1,5 @@ .float regurgitate_prepare; -.float system_delay, swallow_delay, digest_button_delay_time, regurgitate_button_delay_time; +.float stomachkick_delay, system_delay, action_delay, digest_button_delay_time, regurgitate_button_delay_time; .float complain_vore; .float vore_oldmovetype, vore_oldsolid, vore_oldstomachload; @@ -12,11 +12,16 @@ entity Swallow_player_check() { // check if we can swallow a player instead of firing our weapon - vector w_shotorg, w_shotdir; - w_shotorg = self.origin + self.view_ofs; - w_shotdir = v_forward; + float swallow_range; + vector vore_w_shotorg, vore_w_shotdir; - WarpZone_traceline_antilag(self, w_shotorg, w_shotorg + w_shotdir * cvar("g_balance_vore_swallow_range"), FALSE, self, ANTILAG_LATENCY(self)); + swallow_range = cvar("g_balance_vore_swallow_range"); + if(self.scale) // we can swallow from further or closer based on our size + swallow_range *= self.scale; + vore_w_shotorg = self.origin; + vore_w_shotdir = v_forward; + + WarpZone_traceline_antilag(self, vore_w_shotorg, vore_w_shotorg + vore_w_shotdir * swallow_range, FALSE, self, ANTILAG_LATENCY(self)); if(trace_fraction < 1) if(trace_ent.classname == "player") return trace_ent; @@ -28,45 +33,33 @@ float Swallow_condition_check(entity prey) // checks the necessary conditions for swallowing a player if(prey != self) - if(prey.classname == "player" && prey.predator.classname != "player" && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach - if(self.classname == "player" && self.predator.classname != "player" && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves - if(!self.BUTTON_REGURGITATE && self.swallow_delay < time) + if(prey.classname == "player" && !prey.stat_eaten && prey.deadflag == DEAD_NO) // we can't swallow someone who's already in someone else's stomach + if(self.classname == "player" && !self.stat_eaten && self.deadflag == DEAD_NO) // we can't swallow players while inside someone's stomach ourselves + if(!self.BUTTON_REGURGITATE && time > self.action_delay) if not(vlen(self.velocity) > cvar("g_balance_vore_regurgitate_speedcap")) { + string swallow_complain; if(teams_matter && prey.team == self.team && !cvar("g_vore_teamvore")) + swallow_complain = "You cannot swallow your team mates\n"; + else if(!cvar("g_vore_spawnshield") && prey.spawnshieldtime > time) + swallow_complain = "You cannot swallow someone protected by the spawn shield\n"; + else if(self.stomach_load >= cvar("g_balance_vore_swallow_limit")) + swallow_complain = strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n"); + else if(cvar("g_vore_biggergut") && prey.stomach_load > self.stomach_load) + swallow_complain = "You cannot swallow someone with a bigger stomach than yours\n"; + else if(cvar("g_vore_biggersize") && prey.scale > self.scale) + swallow_complain = "You cannot swallow someone larger than you\n"; + + if(swallow_complain != "") { - if(time > self.complain_vore) - { - play2(self, "misc/unavailable.wav"); - sprint(self, "You cannot swallow your team mates\n"); - self.complain_vore = time + complain_delay_time; - } - return FALSE; - } - - if(self.stomach_load >= cvar("g_balance_vore_swallow_limit")) - { - if(time > self.complain_vore) - { - play2(self, "misc/unavailable.wav"); - sprint(self, strcat("You cannot swallow more than ^2", cvar_string("g_balance_vore_swallow_limit"), "^7 players at a time\n")); - self.complain_vore = time + complain_delay_time; - } - return FALSE; - } - - if(cvar("g_vore_biggergut")) - if(prey.stomach_load > self.stomach_load) - { - if(time > self.complain_vore) + if(time > self.complain_vore && self.BUTTON_ATCK) { - play2(self, "misc/unavailable.wav"); - sprint(self, "You cannot swallow someone with a bigger stomach than yours\n"); + play2(self, "misc/forbidden.wav"); + sprint(self, swallow_complain); self.complain_vore = time + complain_delay_time; } return FALSE; } - return TRUE; } return FALSE; @@ -90,7 +83,7 @@ float Stomach_TeamMates_check(entity pred) float Vore_CanLeave() { - if(self.predator.classname == "player") + if(self.stat_eaten) { if(!cvar("g_vore_kick")) // you are defenseless in the stomach if you can't kick, so allow leaving return TRUE; @@ -102,34 +95,76 @@ float Vore_CanLeave() return FALSE; } -// make the camera smoothly lower itself when we get swallowed -// our aim is going from the normal view offset to half of the view offset (because half is the best positioning for the stomach model) -.float cameraeffect_current, cameraeffect_target; -void Vore_CameraEffect_Set(entity e) -{ - e.cameraeffect_current = 1; - e.cameraeffect_target = 2; -} -void Vore_CameraEffect_Apply() +// position the camera properly for prey +void Vore_SetCamera() { - if(self.predator.classname != "player") - return; + local entity head; + local vector oldforward, oldright, oldup; + local float position_counter; + local vector origin_apply; + oldforward = v_forward; + oldright = v_right; + oldup = v_up; - if(self.cvar_cl_vore_cameraspeed) + makevectors(self.v_angle); + v_forward_z = 0; + + // In order to allow prey to see each other in the stomach, we must position each occupant differently, + // else all players would overlap in the center. To do this, we run a loop on all players in the same stomach. + // For each player, the origin is updated, then a new origin is used for the next player. + // This requires that no more than 9 players can be in a stomach at a time! + FOR_EACH_PLAYER(head) { - local float step; - step = self.cvar_cl_vore_cameraspeed * frametime; - - // not sure if these maths are good, as the effect should be smoother - if(self.cameraeffect_current >= self.cameraeffect_target + step) - self.cameraeffect_current -= step; - else if(self.cameraeffect_current <= self.cameraeffect_target - step) - self.cameraeffect_current += step; + if(head.predator == self) + { + switch(position_counter) + { + case 0: + origin_apply = '0 0 0'; // first occupant sits in the middle + break; + case 1: + origin_apply = '1 0 0'; // second occupant sits in the front + break; + case 2: + origin_apply = '-1 0 0'; // third occupant sits in the back + break; + case 3: + origin_apply = '0 1 0'; // fourth occupant sits in the right + break; + case 4: + origin_apply = '0 -1 0'; // fifth occupant sits in the left + break; + case 5: + origin_apply = '1 1 0'; // sixth occupant sits in the front-right + break; + case 6: + origin_apply = '-1 1 0'; // seventh occupant sits in the back-right + break; + case 7: + origin_apply = '1 -1 0'; // eigth occupant sits in the front-left + break; + case 8: + origin_apply = '-1 -1 0'; // ninth occupant sits in the back-left + break; + default: + break; + } + // since prey have their predators set as an aiment, view_ofs will specify the real origin of prey, not just the view offset + head.view_ofs = PL_PREY_VIEW_OFS + (v_forward + origin_apply * cvar("g_vore_preydistance")); + position_counter += 1; + } } - else - self.cameraeffect_current = self.cameraeffect_target; - self.view_ofs_z = PL_VIEW_OFS_z / self.cameraeffect_current; + v_forward = oldforward; + v_right = oldright; + v_up = oldup; + + /*float prey_height; + if(self.fakeprey) + prey_height = (self.scale - self.fakepredator.scale) * cvar("g_healthsize_vore_pos"); + else + prey_height = (self.scale - self.predator.scale) * cvar("g_healthsize_vore_pos"); + self.view_ofs_z += prey_height;*/ } .float gurgle_oldstomachload; @@ -186,7 +221,6 @@ void Vore_Swallow(entity e) e.velocity = '0 0 0'; e.movetype = MOVETYPE_FOLLOW; e.solid = SOLID_NOT; - e.alpha = -1; // best way of hiding the eaten player e.aiment = e.predator; // follow the predator, automatically unset when regurgitated // drop keys (KH) and flags (CTF) when we get swallowed @@ -194,20 +228,20 @@ void Vore_Swallow(entity e) if(e.flagcarried) DropFlag(e.flagcarried, world, e.predator); - Vore_CameraEffect_Set(e); - if(stov(cvar_string("g_vore_regurgitatecolor_release"))) e.colormod = stov(cvar_string("g_vore_regurgitatecolor_release")); if(teams_matter && e.team == e.predator.team) { - centerprint(e, "^3You have been swallowed by a team mate, don't kick!"); - centerprint(e.predator, "^3You have swallowed a team mate, use caution!"); + if(cvar("g_vore_kick")) + centerprint(e, "^3You have been swallowed by a team mate, don't kick!"); + if(cvar("g_vore_digestion")) + centerprint(e.predator, "^3You have swallowed a team mate, don't digest!"); } PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND); setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating - e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle; + e.predator.punchangle_x -= cvar("g_balance_vore_swallow_punchangle"); e.predator.stomach_load += 1; e.predator.regurgitate_prepare = 0; e.predator.spawnshieldtime = 0; // lose spawn shield when we vore @@ -216,8 +250,9 @@ void Vore_Swallow(entity e) // block firing for a small amount of time, or we'll be firing the next frame after we swallow e.predator.weapon_delay = time + button_delay_time; - e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay"); + e.predator.action_delay = time + cvar("g_balance_vore_action_delay"); e.system_delay = e.predator.system_delay = time + system_delay_time; + e.stomachkick_delay = time + cvar("g_balance_vore_kick_delay"); // don't kick immediately after being swallowed } void Vore_Regurgitate(entity e) @@ -228,7 +263,6 @@ void Vore_Regurgitate(entity e) if(e.health > 0) // leave SOLID_NOT for dead bodies e.solid = e.vore_oldsolid; e.view_ofs_z = PL_VIEW_OFS_z; - e.alpha = default_player_alpha; // apply velocities local vector oldforward, oldright, oldup; @@ -248,10 +282,10 @@ void Vore_Regurgitate(entity e) PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND); setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1); - e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle; + e.predator.punchangle_x += cvar("g_balance_vore_regurgitate_punchangle"); e.predator.stomach_load -= 1; e.predator.regurgitate_prepare = 0; - e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay"); + e.predator.action_delay = time + cvar("g_balance_vore_action_delay"); Vore_WeightApply(e.predator); // block firing for a small amount of time, or we'll be firing the next frame @@ -264,7 +298,7 @@ void Vore_DeadPrey_Configure(entity e) { // ran when the keepdeadprey feature is enabled and prey stays inside the stomach after dying - if(e.fakeprey || e.predator.classname != "player") // already configured + if(e.fakeprey || !e.stat_eaten) // we already configured everything return; // this entity is like e.predator but for dead prey, to avoid conflicts @@ -282,9 +316,6 @@ void Vore_DeadPrey_Configure(entity e) e.takedamage = DAMAGE_NO; e.solid = SOLID_NOT; e.aiment = e.fakepredator; - - // completely remove the dead body - e.alpha = -1; } void Vore_DeadPrey_Detach(entity e) @@ -296,25 +327,29 @@ void Vore_DeadPrey_Detach(entity e) return; e.fakepredator = world; + e.fakeprey = TRUE; // keep fakeprey status + e.stat_eaten = 0; e.aiment = world; - - if(!e.deadflag) - e.fakeprey = FALSE; + e.movetype = MOVETYPE_TOSS; } -void Vore_PreyRelease(entity e) +void Vore_PreyRelease(entity e, float pred_disconnect) { - // if the keepdeadprey feature is on, don't spit a dead prey's carcass out - if(e.health <= 0 && cvar("g_vore_keepdeadprey")) + if(pred_disconnect) { - Vore_DeadPrey_Configure(e); - - // if keepdeadprey is enabled and the predator disconnected, detach the dead prey - if(e.fakepredator.classname != "player") + if(e.fakeprey) Vore_DeadPrey_Detach(e); + else + Vore_Regurgitate(e); + } + else if(self.stat_eaten && !self.fakeprey) + { + // if the keepdeadprey feature is on, don't spit a dead prey's carcass out + if(e.deadflag != DEAD_NO && random() < cvar("g_vore_keepdeadprey")) + Vore_DeadPrey_Configure(e); + else + Vore_Regurgitate(e); } - else - Vore_Regurgitate(e); } void Vore_Disconnect() @@ -322,20 +357,17 @@ void Vore_Disconnect() // frees prey from their predators when someone disconnects or goes spectating, or in other circumstances // prey disconnects or goes spectating while inside someone's belly - if(self.predator.classname == "player") - Vore_PreyRelease(self); + if(self.stat_eaten) + Vore_PreyRelease(self, TRUE); // pred disconnects or goes spectating with players in their belly - else if(self.stomach_load > 0) + entity head; + FOR_EACH_PLAYER(head) { - entity head; - FOR_EACH_PLAYER(head) - { - if(head.predator == self) - Vore_PreyRelease(head); - } - Vore_GurgleSound(); // stop the gurgling sound + if(head.predator == self || head.fakepredator == self) + Vore_PreyRelease(head, TRUE); } + Vore_GurgleSound(); // stop the gurgling sound self.stomach_load = self.gravity = 0; // prevents a bug } @@ -359,7 +391,7 @@ void Vore_Digest() self.predator.digestion_step = time + steptime; } - if(self.health <= 0) + if(self.deadflag != DEAD_NO) if(stov(cvar_string("g_vore_regurgitatecolor_digest"))) self.colormod = stov(cvar_string("g_vore_regurgitatecolor_digest")); } @@ -374,10 +406,16 @@ void Vore_Teamheal() { self.health += cvar("g_balance_vore_teamheal"); self.teamheal_step = time + steptime; + + // play beep sound when a team mate was healed to the maximum amount, to both the prey and the predator + if(self.health >= cvar("g_balance_vore_teamheal_stable")) + { + play2(self, "misc/beep.wav"); + play2(self.predator, "misc/beep.wav"); + } } } -.float stomachkick_delay; void Vore_StomachKick() { // allows prey to kick the predator's stomach and do some damage or attempt to escape @@ -386,8 +424,11 @@ void Vore_StomachKick() { float damage; damage = ceil(random() * (cvar("g_balance_vore_kick_damage_max") - cvar("g_balance_vore_kick_damage_min")) + cvar("g_balance_vore_kick_damage_min")); + Damage(self.predator, self, self, damage, DEATH_STOMACHKICK, self.predator.origin, v_forward * cvar("g_balance_vore_kick_force")); - sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.ogg", VOL_BASE, ATTN_NORM); + sound(self.predator, CHAN_PROJECTILE, "weapons/stomachkick.wav", VOL_BASE, ATTN_NORM); + self.predator.punchangle_x -= cvar("g_balance_vore_kick_predator_punchangle"); + self.punchangle_x += cvar("g_balance_vore_kick_prey_punchangle"); if(random() < cvar("g_balance_vore_kick_escapeprobability")) Vore_Regurgitate(self); @@ -404,7 +445,7 @@ void Vore_StomachLeave() Vore_Regurgitate(self); else if(time > self.complain_vore) { - play2(self, "misc/unavailable.wav"); + play2(self, "misc/forbidden.wav"); sprint(self, strcat("You cannot get out of ", self.predator.netname, "\n")); self.complain_vore = time + complain_delay_time; } @@ -414,19 +455,65 @@ void Vore_AutoTaunt() { // triggers ambient vore taunts, for both pred and prey + float taunt_time; + // predator taunts if(self.stomach_load && !Stomach_TeamMates_check(self)) { - // taunt_soundtime is set to 0 after the taunt has played, so this indicates a new start - if(!self.taunt_soundtime) + if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played { - SetAutoTaunt(self, time, TRUE, TAUNTTYPE_VOREPRED); + taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min"); + SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPRED); } } else if(self.taunt_soundtype == TAUNTTYPE_VOREPRED) { - // we have a predator taunt scheduled, but we're no longer a predator, so remove it - SetAutoTaunt(self, 0, FALSE, 0); + // we have a predator taunt scheduled, but are no longer a (suitable) predator, so remove it + SetAutoTaunt(self, 0, 0); + } + + // prey taunts + if(self.stat_eaten && !(teams_matter && self.team == self.predator.team)) + { + if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played + { + taunt_time = random() * (cvar("sv_vore_autotaunt_repeat_max") - cvar("sv_vore_autotaunt_repeat_min")) + cvar("sv_vore_autotaunt_repeat_min"); + SetAutoTaunt(self, time + taunt_time, TAUNTTYPE_VOREPREY); + } + } + else if(self.taunt_soundtype == TAUNTTYPE_VOREPREY) + { + // we have a prey taunt scheduled, but are no longer a (suitable) prey, so remove it + SetAutoTaunt(self, 0, 0); + } +} + +void Vore_SetSbarRings() +{ + // first clear the ring stats, then configure them if needed + self.stat_sbring1_type = self.stat_sbring1_clip = 0; + self.stat_sbring2_type = self.stat_sbring2_clip = 0; + + if(self.stat_eaten) + { + if(time <= self.stomachkick_delay) + { + self.stat_sbring1_type = 2; // ring shows stomach kick delay, empties with progress + self.stat_sbring1_clip = bound(0, (time / self.stomachkick_delay - 1) / ((self.stomachkick_delay - cvar("g_balance_vore_kick_delay")) / self.stomachkick_delay - 1), 1); + } + } + else + { + if(time <= self.action_delay) + { + self.stat_sbring1_type = 1; // ring shows vore action delay, empties with progress + self.stat_sbring1_clip = bound(0, (time / self.action_delay - 1) / ((self.action_delay - cvar("g_balance_vore_action_delay")) / self.action_delay - 1), 1); + } + if(time <= self.regurgitate_prepare) + { + self.stat_sbring2_type = 1; // ring shows regurgitation preparing, fills with progress + self.stat_sbring2_clip = 1 - bound(0, (time / self.regurgitate_prepare - 1) / ((self.regurgitate_prepare - cvar("g_balance_vore_regurgitate_delay")) / self.regurgitate_prepare - 1), 1); + } } } @@ -443,7 +530,7 @@ void Vore() Vore_AutoTaunt(); // wash the goo away from players once they leave the stomach - if(self.predator.classname != "player") + if(!self.stat_eaten) if(stov(cvar_string("g_vore_regurgitatecolor_release"))) if(self.colormod) if(cvar("g_vore_regurgitatecolor_release_fade")) @@ -459,8 +546,11 @@ void Vore() self.colormod_z = 1; } - // set all vore related stats - if(self.predator.classname == "player") + // set all vore stats + Vore_SetSbarRings(); + if(self.fakepredator.classname == "player") + self.stat_eaten = num_for_edict(self.fakepredator); + else if(self.predator.classname == "player") { self.stat_stomachload = self.predator.stomach_load; // necessary for the stomach board self.stat_digesting = self.predator.digesting; // necessary for the stomach board @@ -477,7 +567,7 @@ void Vore() // don't allow a player inside a player inside another player :) // prevent this by checking if such has happened, and taking the proper measures // this code has a high priority and must not be stopped by any delay, so run it here - if(self.predator.predator.classname == "player") + if(self.predator.stat_eaten) { entity target_predator, target_predator_predator, oldself; target_predator = self.predator; @@ -517,9 +607,20 @@ void Vore() prey = Swallow_player_check(); // attempt to swallow our new prey if we pressed the attack button, and there's any in range - if(self.BUTTON_ATCK) + self.stat_canswallow = 0; if(Swallow_condition_check(prey)) - Vore_Swallow(prey); + { + // canswallow stat, used by the HUD + if(teams_matter && prey.team == self.team) + self.stat_canswallow = 2; + else + self.stat_canswallow = 1; + + if(self.BUTTON_ATCK) + Vore_Swallow(prey); + } + else if(prey != world) + self.stat_canswallow = -1; // toggle digestion, if the player has someone in their stomach if(self.BUTTON_DIGEST && cvar("g_vore_digestion")) @@ -534,7 +635,7 @@ void Vore() } else if(time > self.complain_vore) { - play2(self, "misc/unavailable.wav"); + play2(self, "misc/forbidden.wav"); sprint(self, "There is nothing to digest\n"); self.complain_vore = time + complain_delay_time; } @@ -543,7 +644,7 @@ void Vore() self.digesting = FALSE; // predator wishes to regurgitate his prey - if(self.BUTTON_REGURGITATE) + if(self.BUTTON_REGURGITATE && time > self.action_delay) { if(self.stomach_load) { @@ -556,7 +657,7 @@ void Vore() } else if(time > self.complain_vore) { - play2(self, "misc/unavailable.wav"); + play2(self, "misc/forbidden.wav"); sprint(self, "There is nothing to regurgitate\n"); self.complain_vore = time + complain_delay_time; } @@ -569,21 +670,23 @@ void Vore() // Code that addresses the prey: // -------------------------------- + Vore_SetCamera(); + // keepdeadprey - detach dead prey if their predator died or got swallowed - if(self.fakepredator.classname == "player") - if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.predator.classname == "player") + if(self.fakeprey) + if(self.fakepredator.deadflag != DEAD_NO || self.fakepredator.stat_eaten) Vore_DeadPrey_Detach(self); - if(self.predator.classname != "player") + if(!self.stat_eaten) return; - if(self.deadflag) + if(self.deadflag != DEAD_NO) { - Vore_PreyRelease(self); + Vore_PreyRelease(self, FALSE); return; } - if(self.predator.deadflag) + if(self.predator.deadflag != DEAD_NO) Vore_Regurgitate(self); else if(vlen(self.predator.velocity) > cvar("g_balance_vore_regurgitate_speedcap")) Vore_Regurgitate(self); @@ -609,5 +712,7 @@ void Vore() if(self.BUTTON_JUMP) Vore_StomachLeave(); - Vore_CameraEffect_Apply(); + // Ugly workaround for a Keyhunt issue. Your team's key can still be given to you while in the stomach + // (at round start), which is pretty ugly and wrong. So attempt to drop keys each frame for prey + kh_Key_DropAll(self, FALSE); } \ No newline at end of file