X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=ec685f36ecdebff6b1b45794e283b04cf50fc88f;hb=259b0fce287e962b712b9b405a44c13dbb07667f;hp=8ef9663f96942d8ca42ecfcd0964655745a95829;hpb=9a1132e1db2c5e45f1addf93f72f3afc7f38e3f6;p=voretournament%2Fvoretournament.git diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc index 8ef9663f..ec685f36 100644 --- a/data/qcsrc/server/cl_client.qc +++ b/data/qcsrc/server/cl_client.qc @@ -528,8 +528,12 @@ float Client_customizeentityforclient() } Client_setmodel(setmodel_state()); - if not(self.predator.classname == "player" || self.fakeprey) + if not(self.stat_eaten || self.fakeprey) self.alpha = default_player_alpha; + else if(cvar("g_vore_neighborprey_distance") && !self.fakeprey && (self.predator == other.predator || self.predator == other.fakepredator) && !(other.cvar_chase_active || other.classname == "observer")) + self.alpha = default_player_alpha; // allow seeing neighboring prey + else + self.alpha = -1; // hide prey return TRUE; } @@ -827,6 +831,7 @@ void PutClientInServer (void) RemoveGrabber(self); // Wazat's Grabber Vore_DeadPrey_Detach(self); + self.fakeprey = FALSE; // clear the fakeprey status self.classname = "player"; self.wasplayer = TRUE; @@ -1609,7 +1614,7 @@ void ChatBubbleThink() remove(self); return; } - if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player") + if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && !self.owner.stat_eaten && self.owner.fakepredator.classname != "player") #ifdef TETRIS || self.owner.tetris_on #endif @@ -1652,7 +1657,7 @@ void TeamBubbleThink() return; } // setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1'); // bandwidth hog. setattachment does this now - if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player") + if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.stat_eaten) self.model = ""; else { @@ -1708,10 +1713,31 @@ void UpdateTeamBubble() else self.colormod = '1 1 1'; };*/ +.float oldcolormap; void respawn(void) { + if(self.alpha >= 0 && self.modelindex != 0 && cvar("g_respawn_ghosts")) + { + self.solid = SOLID_NOT; + self.takedamage = DAMAGE_NO; + self.movetype = MOVETYPE_FLY; + self.velocity = '0 0 1' * cvar("g_respawn_ghosts_speed"); + self.avelocity = randomvec() * cvar("g_respawn_ghosts_speed") * 3 - randomvec() * cvar("g_respawn_ghosts_speed") * 3; + self.effects |= EF_ADDITIVE; + self.oldcolormap = self.colormap; + self.colormap = 512; + pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1); + if(cvar("g_respawn_ghosts_maxtime")) + SUB_SetFade (self, time + cvar("g_respawn_ghosts_maxtime") / 2 + random () * (cvar("g_respawn_ghosts_maxtime") - cvar("g_respawn_ghosts_maxtime") / 2), 1.5); + } + CopyBody(1); self.effects |= EF_NODRAW; // prevent another CopyBody + if(self.oldcolormap) + { + self.colormap = self.oldcolormap; + self.oldcolormap = 0; + } PutClientInServer(); } @@ -2048,6 +2074,7 @@ void SpectateCopy(entity spectatee) { self.dmg_save = spectatee.dmg_save; self.dmg_inflictor = spectatee.dmg_inflictor; self.angles = spectatee.v_angle; + self.scale = spectatee.scale; self.fixangle = TRUE; self.stomach_load = spectatee.stomach_load; self.stat_eaten = spectatee.stat_eaten; @@ -2055,6 +2082,10 @@ void SpectateCopy(entity spectatee) { self.stat_digesting = spectatee.stat_digesting; self.stat_canleave = spectatee.stat_canleave; self.stat_canswallow = spectatee.stat_canswallow; + self.stat_sbring1_type = spectatee.stat_sbring1_type; + self.stat_sbring1_clip = spectatee.stat_sbring1_clip; + self.stat_sbring2_type = spectatee.stat_sbring2_type; + self.stat_sbring2_clip = spectatee.stat_sbring2_clip; setorigin(self, spectatee.origin); setsize(self, spectatee.mins, spectatee.maxs); SetZoomState(spectatee.zoomstate); @@ -2246,21 +2277,37 @@ float vercmp(string v1, string v2) return vercmp_recursive(v1, v2); } -.float current_scale; -void ApplyHealthSize() +void SetPlayerSize() { - if not(cvar("g_healthsize")) - return; + if(cvar("g_healthsize")) + { + // change player scale based on the amount of health we have - self.current_scale = self.health / 100; // range between 0 and 100 - self.current_scale = bound(0, self.current_scale, 100); + self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize"); - if(self.scale < self.current_scale - self.scale) - self.scale += cvar("g_healthsize_speed") * sys_frametime; - else if(self.scale > self.current_scale + self.scale) - self.scale -= cvar("g_healthsize_speed") * sys_frametime; - else - self.scale = self.current_scale; + // The following code sets the bounding box to match the player's size. + // It is currently disabled because of issues with engine movement prediction (cl_movement). + // The engine expects the bounding box to be default size, and changing it will cause glitches. + // This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction. + if(self.crouch) + { + //setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale); + if(!self.stat_eaten) + self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale; + } + else + { + //setsize (self, PL_MIN * self.scale, PL_MAX * self.scale); + if(!self.stat_eaten) + self.view_ofs = PL_VIEW_OFS * self.scale; + } + } + + if(self.stat_eaten && cvar("g_vore_neighborprey_distance")) + { + // resize prey if neighborprey is enabled + self.scale *= cvar("g_vore_neighborprey_scale"); + } } void ObserverThink() @@ -2375,9 +2422,6 @@ void PlayerPreThink (void) // core code for the vore system Vore(); - // health based player size - ApplyHealthSize(); - // version nagging if(self.version_nagtime) if(self.cvar_g_voretournamentversion) @@ -2454,6 +2498,29 @@ void PlayerPreThink (void) if(frametime) { + + if(self.health <= 0 && cvar("g_deathglow")) + { + if(self.glowmod_x > 0) + self.glowmod_x -= cvar("g_deathglow") * frametime; + else + self.glowmod_x = -1; + if(self.glowmod_y > 0) + self.glowmod_y -= cvar("g_deathglow") * frametime; + else + self.glowmod_y = -1; + if(self.glowmod_z > 0) + self.glowmod_z -= cvar("g_deathglow") * frametime; + else + self.glowmod_z = -1; + } + else + { + // set weapon and player glowmod + self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2; + self.weaponentity_glowmod = self.glowmod; + } + player_powerups(); } @@ -2588,6 +2655,8 @@ void PlayerPreThink (void) } } + SetPlayerSize(); + FixPlayermodel(); GrabberFrame();