Returns a valid one in doubt.\r
=============\r
*/\r
-string FallbackPlayerModel = "models/player/vixen.zym";\r
+string FallbackPlayerModel = "models/player/vixen.iqm";\r
string CheckPlayerModel(string plyermodel) {\r
if(strlen(plyermodel) < 4)\r
return FallbackPlayerModel;\r
if(other.predator == self)\r
{\r
Client_setmodel(stomachmodel);\r
+ self.angles_x = self.angles_z = 0; // don't apply player leaning to stomach models\r
self.effects |= EF_NODEPTHTEST; // don't hide behind walls\r
self.alpha = other.cvar_cl_vore_stomachmodel;\r
return TRUE;\r
}\r
\r
Vore_Disconnect();\r
+ entity e;\r
+ for(e = world; (e = find(e, classname, "consumable")); )\r
+ {\r
+ // remove consumable items when we spectate\r
+ if(e.predator == self)\r
+ Item_Consumable_Remove(e, TRUE);\r
+ }\r
\r
kh_Key_DropAll(self, TRUE);\r
\r
self.health = -666;\r
self.takedamage = DAMAGE_NO;\r
self.solid = SOLID_NOT;\r
- self.movetype = MOVETYPE_NOCLIP;\r
+ self.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink\r
self.flags = FL_CLIENT | FL_NOTARGET;\r
self.armorvalue = 666;\r
self.effects = 0;\r
self.fixangle = TRUE;\r
self.crouch = FALSE;\r
\r
- self.view_ofs = PL_VIEW_OFS;\r
+ self.view_ofs = '0 0 0'; // so that your view doesn't go into the ceiling with MOVETYPE_FLY_WORLDONLY, previously "PL_VIEW_OFS"\r
setorigin (self, spot.origin);\r
- setsize (self, '0 0 0', '0 0 0');\r
+ setsize (self, PL_CROUCH_MIN, PL_CROUCH_MAX); // give the spectator some space between walls for MOVETYPE_FLY_WORLDONLY\r
self.prevorigin = self.origin;\r
self.items = 0;\r
self.weapons = 0;\r
//void() ctf_playerchanged;\r
void PutClientInServer (void)\r
{\r
+ entity e;\r
+\r
if(clienttype(self) == CLIENTTYPE_BOT)\r
{\r
self.classname = "player";\r
\r
Vore_Disconnect();\r
self.swallow_progress_pred = self.swallow_progress_prey = 0;\r
+ for(e = world; (e = find(e, classname, "consumable")); )\r
+ {\r
+ // remove consumable items when we respawn\r
+ if(e.predator == self)\r
+ Item_Consumable_Remove(e, FALSE);\r
+ }\r
\r
self.classname = "player";\r
self.wasplayer = TRUE;\r
weapon_action(j, WR_RESETPLAYER);\r
\r
// all weapons must be fully loaded when we spawn\r
- entity e;\r
e = get_weaponinfo(j);\r
if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars\r
- self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));\r
+ self.(weapon_load[j]) = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));\r
}\r
\r
oldself = self;\r
teamheal_max = cvar("g_balance_vore_teamheal_stable");\r
WriteCoord(MSG_ENTITY, teamheal_max);\r
\r
+ WriteShort(MSG_ENTITY, cvar("g_power"));\r
+ WriteShort(MSG_ENTITY, cvar("g_power_reboot"));\r
+ WriteByte(MSG_ENTITY, cvar("g_power_reboot_spawn"));\r
+\r
return TRUE;\r
}\r
\r
}\r
\r
Vore_Disconnect();\r
+ entity e;\r
+ for(e = world; (e = find(e, classname, "consumable")); )\r
+ {\r
+ // remove consumable items when we disconnect\r
+ if(e.predator == self)\r
+ Item_Consumable_Remove(e, TRUE);\r
+ }\r
\r
CheatShutdownClient();\r
\r
self.fixangle = TRUE;\r
self.stomach_load = spectatee.stomach_load;\r
self.stat_eaten = spectatee.stat_eaten;\r
+ self.swallow_progress_prey = spectatee.swallow_progress_prey;\r
+ self.swallow_progress_pred = spectatee.swallow_progress_pred;\r
self.stat_stomachload = spectatee.stat_stomachload;\r
self.stat_stomachmaxload = spectatee.stomach_maxload;\r
self.stat_digesting = spectatee.stat_digesting;\r
\r
void ObserverThink()\r
{\r
+ float prefered_movetype;\r
if (self.flags & FL_JUMPRELEASED) {\r
if (self.BUTTON_JUMP && !self.version_mismatch) {\r
- self.welcomemessage_time = 0;\r
self.flags &~= FL_JUMPRELEASED;\r
self.flags |= FL_SPAWNING;\r
} else if(self.BUTTON_ATCK && !self.version_mismatch) {\r
- self.welcomemessage_time = 0;\r
self.flags &~= FL_JUMPRELEASED;\r
if(SpectateNext() == 1) {\r
self.classname = "spectator";\r
}\r
+ } else {\r
+ prefered_movetype = ((!self.BUTTON_USE ? self.cvar_cl_clippedspectating : !self.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);\r
+ if (self.movetype != prefered_movetype)\r
+ self.movetype = prefered_movetype;\r
}\r
} else {\r
if (!(self.BUTTON_ATCK || self.BUTTON_JUMP)) {\r
}\r
}\r
}\r
+\r
PrintWelcomeMessage(self);\r
}\r
\r
void() ctf_setstatus;\r
.float items_added;\r
.vector avg_vel;\r
+.float power_sounded;\r
void PlayerPreThink (void)\r
{\r
self.stat_game_starttime = game_starttime;\r
// core code for the vore system\r
Vore();\r
\r
+ // play power fail sound\r
+ if(self.armorvalue < cvar("g_power"))\r
+ {\r
+ if(!self.power_sounded)\r
+ {\r
+ sound(self, CHAN_TRIGGER, "misc/power_fail.ogg", VOL_BASE, ATTN_NORM);\r
+ self.power_sounded = TRUE;\r
+ }\r
+ }\r
+ else\r
+ self.power_sounded = FALSE;\r
+\r
// version nagging\r
if(self.version_nagtime)\r
if(self.cvar_g_voretournamentversion)\r
self.fixangle = TRUE;\r
}\r
\r
- if(!self.stat_eaten)\r
+ if(self.deadflag == DEAD_NO && !self.stat_eaten) // prevents bugs\r
{\r
// lean the player with damage and acceleration\r
// credits go to divVerent for these maths :)\r
accel_y = bound(-cvar("g_leanplayer_acceleration_max"), accel_y, cvar("g_leanplayer_acceleration_max"));\r
accel_z = bound(-cvar("g_leanplayer_acceleration_max"), accel_z, cvar("g_leanplayer_acceleration_max"));\r
\r
- L0_x = vlen(accel);\r
+ L0_x = vlen(accel) * -1;\r
L0_y = L1_y = vectoyaw(accel);\r
\r
L0 = AnglesTransform_FromAngles(L0);\r
\r
LA = AnglesTransform_Multiply(LA, LF);\r
\r
- // fade the player back to normal rotation each frame, based on how much damage they have taken\r
- // this is used to simulate damage, so a wounded player will get back up slower\r
- if(self.leanangle_damage) // prevent division by zero\r
- if(self.leanangle_damage_force) // extra safety\r
- {\r
- float leanangle_damage_fade;\r
- leanangle_damage_fade = 1 / (1 + (self.leanangle_damage * cvar("g_leanplayer_damage_fade")));\r
- self.leanangle_damage_force = self.leanangle_damage_force * leanangle_damage_fade;\r
- }\r
+ // fade the player back to normal rotation each frame\r
+ self.leanangle_damage_force = self.leanangle_damage_force * cvar("g_leanplayer_damage_fade");\r
// end of damage leaning\r
\r
self.angles = AnglesTransform_Normalize(AnglesTransform_ToAngles(LA), TRUE);\r
{\r
// set weapon and player glowmod\r
self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;\r
+ if(self.armorvalue < cvar("g_power"))\r
+ self.glowmod = self.glowmod * random(); // make glow flicker when power is down\r
self.weaponentity_glowmod = self.glowmod;\r
}\r
\r