}\r
\r
void AnnounceTo(entity e, string snd) {\r
- msg_entity = e;\r
- WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
- WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
- WriteString(MSG_ONE, snd);\r
+ if (clienttype(e) == CLIENTTYPE_REAL)\r
+ {\r
+ msg_entity = e;\r
+ WriteByte(MSG_ONE, SVC_TEMPENTITY);\r
+ WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);\r
+ WriteString(MSG_ONE, snd);\r
+ }\r
}\r
\r
float ClientData_Send(entity to, float sf)\r
// set the proper belly model depending on how full we are\r
string newmodel_name, newmodel_extension, applymodel;\r
\r
- tokenizebyseparator(self.playermodel, ".");\r
- newmodel_name = argv(0);\r
- newmodel_extension = argv(1);\r
+ // 4 is the extension length\r
+ newmodel_name = substring(self.playermodel, 0, strlen(self.playermodel) - 4);\r
+ newmodel_extension = substring(self.playermodel, strlen(self.playermodel) - 4, 4);\r
\r
if(self.stomach_load)\r
- applymodel = strcat(newmodel_name, "_state", ftos(floor(self.stomach_load)), ".", newmodel_extension);\r
+ applymodel = strcat(newmodel_name, "_state", ftos(floor(self.stomach_load)), newmodel_extension);\r
else\r
applymodel = self.playermodel;\r
\r
float Client_customizeentityforclient()\r
{\r
entity modelsource;\r
+ string applymodel;\r
\r
if(self.modelindex == 0)\r
return TRUE;\r
if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug\r
{\r
Client_setmodel(setmodel_state());\r
- if not(self.predator.classname == "player")\r
+ if not(self.predator.classname == "player" || self.fakeprey)\r
self.alpha = default_player_alpha;\r
return TRUE;\r
}\r
if(other.spectatee_status)\r
other = other.enemy; // also do this for the player we are spectating\r
- if(other.predator == self)\r
+ if(other.predator == self || other.fakepredator == self)\r
{\r
- tokenizebyseparator(self.playermodel, ".");\r
- Client_setmodel(strcat(argv(0), "_stomach.md3"));\r
+ applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length\r
+ Client_setmodel(applymodel);\r
self.alpha = other.cvar_cl_vore_stomachmodel;\r
return TRUE;\r
}\r
Client_setmodel(setmodel_state());\r
- if not(self.predator.classname == "player")\r
+ if not(self.predator.classname == "player" || self.fakeprey)\r
self.alpha = default_player_alpha;\r
return TRUE;\r
}\r
self.armorvalue = cvar("g_balance_armor_start");\r
self.pauserotarmor_finished = 0;\r
self.pauserothealth_finished = 0;\r
- self.pauseregen_finished = 0;\r
+ self.pauseregenhealth_finished = 0;\r
+ self.pauseregenarmor_finished = 0;\r
self.damageforcescale = 0;\r
self.death_time = 0;\r
self.dead_frame = 0;\r
self.wasplayer = TRUE;\r
self.iscreature = TRUE;\r
self.movetype = MOVETYPE_WALK;\r
- self.solid = SOLID_SLIDEBOX;\r
- if(cvar("g_playerclip_collisions"))\r
- self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;\r
+ if(cvar("g_player_colisions"))\r
+ self.solid = SOLID_SLIDEBOX;\r
else\r
- self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;\r
+ self.solid = SOLID_CORPSE;\r
+ self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;\r
+ if(cvar("g_playerclip_collisions"))\r
+ self.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;\r
+ if(clienttype(self) == CLIENTTYPE_BOT && cvar("g_botclip_collisions"))\r
+ self.dphitcontentsmask |= DPCONTENTS_BOTCLIP;\r
self.frags = FRAGS_PLAYER;\r
if(independent_players)\r
MAKE_INDEPENDENT_PLAYER(self);\r
self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");\r
self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");\r
self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");\r
- self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");\r
+ self.pauseregenhealth_finished = time + cvar("g_balance_pause_health_regen_spawn");\r
+ self.pauseregenarmor_finished = time + cvar("g_balance_pause_armor_regen_spawn");\r
//extend the pause of rotting if client was reset at the beginning of the countdown\r
if(!cvar("sv_ready_restart_after_countdown") && time < game_starttime) { // TODO why is this cvar NOTted?\r
self.spawnshieldtime += game_starttime - time;\r
self.pauserotarmor_finished += game_starttime - time;\r
self.pauserothealth_finished += game_starttime - time;\r
- self.pauseregen_finished += game_starttime - time;\r
+ self.pauseregenhealth_finished += game_starttime - time;\r
+ self.pauseregenarmor_finished += game_starttime - time;\r
}\r
self.damageforcescale = 2;\r
self.death_time = 0;\r
\r
SetCustomizer(self, Client_customizeentityforclient, Client_uncustomizeentityforclient);\r
\r
+ Vore_DeadPrey_Detach(self);\r
+\r
self.model = "";\r
FixPlayermodel();\r
\r
WriteString(MSG_ENTITY, world.fog);\r
else\r
WriteString(MSG_ENTITY, "");\r
+ WriteCoord(MSG_ENTITY, cvar("g_campaign"));\r
WriteByte(MSG_ENTITY, cvar("g_balance_armor_blockpercent") * 255.0);\r
WriteByte(MSG_ENTITY, cvar("g_balance_weaponswitchdelay") * 255.0);\r
\r
+ WriteCoord(MSG_ENTITY, cvar("g_vore"));\r
WriteCoord(MSG_ENTITY, cvar("g_balance_vore_swallow_limit"));\r
- WriteCoord(MSG_ENTITY, cvar("g_vore_showpreyhealth"));\r
return TRUE;\r
}\r
\r
remove(self);\r
return;\r
}\r
- if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player")\r
+ if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player")\r
#ifdef TETRIS\r
|| self.owner.tetris_on\r
#endif\r
return;\r
}\r
// setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1'); // bandwidth hog. setattachment does this now\r
- if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player")\r
+ if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player")\r
self.model = "";\r
else\r
{\r
- if(cvar("g_balance_vore_teamheal") && self.owner.health < cvar("g_balance_vore_teamheal_stable"))\r
+ if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore"))\r
+ if(self.owner.health < cvar("g_balance_vore_teamheal_stable"))\r
setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed\r
else\r
setmodel(self, "models/misc/teambubble.spr");\r
return max(stable, current + (stable - current) * rotfactor * rotframetime);\r
}\r
\r
-float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit)\r
+.float regen_soundtime;\r
+float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit, string regensound)\r
{\r
if(current > rotstable)\r
{\r
{\r
current = CalcRegen(current, regenstable, regenfactor, regenframetime);\r
current = min(regenstable, current + regenlinear * regenframetime);\r
+\r
+ if(regensound != "")\r
+ if(regenfactor || regenlinear)\r
+ {\r
+ if(self.regen_soundtime < time)\r
+ {\r
+ msg_entity = self;\r
+ if(clienttype(msg_entity) == CLIENTTYPE_REAL)\r
+ soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE);\r
+ }\r
+ self.regen_soundtime = time + 1; // only replay the sound if regen was paused for one second\r
+ }\r
}\r
}\r
\r
\r
if (!g_ca && (!g_lms || cvar("g_lms_regenerate")))\r
{\r
- self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita);\r
- self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith);\r
+ self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.ogg");\r
+ self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.ogg");\r
\r
// if player rotted to death... die!\r
if(self.health < 1)\r
}\r
\r
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)\r
- self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf);\r
+ self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf, "");\r
}\r
\r
float zoomstate_set;\r
self.health = spectatee.health;\r
self.impulse = 0;\r
self.items = spectatee.items;\r
+ self.last_pickup = spectatee.last_pickup;\r
self.strength_finished = spectatee.strength_finished;\r
self.invincible_finished = spectatee.invincible_finished;\r
self.pressedkeys = spectatee.pressedkeys;\r
if(self.taunt_soundtime)\r
if(time > self.taunt_soundtime)\r
{\r
+ switch(self.taunt_soundtype)\r
+ {\r
+ case TAUNTTYPE_DEATH:\r
+ PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);\r
+ break;\r
+ case TAUNTTYPE_VOREPRED:\r
+ PlayerSound(self, playersound_pred, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly\r
+ break;\r
+ case TAUNTTYPE_VOREPREY:\r
+ PlayerSound(self, playersound_prey, CHAN_VOICE, VOICETYPE_AUTOTAUNT); // change this properly\r
+ break;\r
+ default:\r
+ dprint("Incorrect autotaunt type\n");\r
+ break;\r
+ }\r
+\r
self.taunt_soundtime = 0;\r
- PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);\r
+ self.taunt_soundtype = 0;\r
}\r
\r
target_voicescript_next(self);\r
projects / voretournament / voretournament.git / blobdiff