X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=data%2Fqcsrc%2Fserver%2Fvore.qc;h=0202e5af6d194751dd974b96efa6bcb93752cd43;hb=41fe018e5301b2fa1886224ef84ec3a9e2062ed7;hp=f389d22d7b0cff77f6a7ba88c1e70f2c2bc6778d;hpb=fd92c0d7cae7d6dbda8d7a3cb91041d9a6c49431;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc index f389d22d..0202e5af 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; @@ -18,7 +18,7 @@ entity Swallow_player_check() 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 + self.view_ofs; + 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)); @@ -33,57 +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 && self.BUTTON_ATCK) { play2(self, "misc/forbidden.wav"); - sprint(self, "You cannot swallow your team mates\n"); + sprint(self, swallow_complain); self.complain_vore = time + complain_delay_time; } return FALSE; } - - if(self.stomach_load >= cvar("g_balance_vore_swallow_limit")) - { - if(time > self.complain_vore && self.BUTTON_ATCK) - { - play2(self, "misc/forbidden.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 && self.BUTTON_ATCK) - { - play2(self, "misc/forbidden.wav"); - sprint(self, "You cannot swallow someone with a bigger stomach than yours\n"); - self.complain_vore = time + complain_delay_time; - } - return FALSE; - } - - if(!cvar("g_vore_spawnshield")) - if(prey.spawnshieldtime > time) - { - if(time > self.complain_vore && self.BUTTON_ATCK) - { - play2(self, "misc/forbidden.wav"); - sprint(self, "You cannot swallow someone protected by the spawn shield\n"); - self.complain_vore = time + complain_delay_time; - } - return FALSE; - } - return TRUE; } return FALSE; @@ -107,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; @@ -119,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; + + makevectors(self.v_angle); + v_forward_z = 0; - if(self.cvar_cl_vore_cameraspeed) + // 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_neighborprey_distance")); + 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; @@ -203,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 @@ -211,8 +228,6 @@ 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")); @@ -235,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) @@ -247,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; @@ -270,7 +285,7 @@ void Vore_Regurgitate(entity e) 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 @@ -283,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 @@ -301,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.modelindex = 0; } void Vore_DeadPrey_Detach(entity e) @@ -315,7 +327,8 @@ void Vore_DeadPrey_Detach(entity e) return; e.fakepredator = world; - e.fakeprey = FALSE; + e.fakeprey = TRUE; // keep fakeprey status + e.stat_eaten = 0; e.aiment = world; e.movetype = MOVETYPE_TOSS; } @@ -329,7 +342,7 @@ void Vore_PreyRelease(entity e, float pred_disconnect) else Vore_Regurgitate(e); } - else + 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")) @@ -344,7 +357,7 @@ 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") + if(self.stat_eaten) Vore_PreyRelease(self, TRUE); // pred disconnects or goes spectating with players in their belly @@ -403,7 +416,6 @@ void Vore_Teamheal() } } -.float stomachkick_delay; void Vore_StomachKick() { // allows prey to kick the predator's stomach and do some damage or attempt to escape @@ -461,7 +473,7 @@ void Vore_AutoTaunt() } // prey taunts - if(self.predator.classname == "player" && !(teams_matter && self.team == self.predator.team)) + if(self.stat_eaten && !(teams_matter && self.team == self.predator.team)) { if(!self.taunt_soundtime) // taunt_soundtime becomes 0 once the taunt has played { @@ -476,6 +488,35 @@ void Vore_AutoTaunt() } } +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); + } + } +} + void Vore() { // main vore code, this is where it all happens @@ -489,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")) @@ -506,7 +547,8 @@ void Vore() } // set all vore stats - if(self.fakeprey) + Vore_SetSbarRings(); + if(self.fakepredator.classname == "player") self.stat_eaten = num_for_edict(self.fakepredator); else if(self.predator.classname == "player") { @@ -525,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; @@ -602,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) { @@ -628,12 +670,14 @@ 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 != DEAD_NO) @@ -668,8 +712,6 @@ 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);