self.model = oldself.model;
self.modelindex = oldself.modelindex;
self.modelindex_lod0 = oldself.modelindex_lod0;
- self.modelindex_lod0_from_nexuiz = oldself.modelindex_lod0_from_nexuiz;
+ self.modelindex_lod0_from_xonotic = oldself.modelindex_lod0_from_xonotic;
self.modelindex_lod1 = oldself.modelindex_lod1;
self.modelindex_lod2 = oldself.modelindex_lod2;
self.skinindex = oldself.skinindex;
self.movetype = oldself.movetype;
self.nextthink = oldself.nextthink;
self.solid = oldself.solid;
+ self.ballistics_density = oldself.ballistics_density;
self.takedamage = oldself.takedamage;
self.think = oldself.think;
self.customizeentityforclient = oldself.customizeentityforclient;
float player_getspecies()
{
- local float glob, i, j, fh, len, s, sk;
- local string fn, l;
-
- s = -1;
-
- glob = search_begin("models/player/*.txt", TRUE, TRUE);
- if(glob < 0)
- return s;
- for(j = 0; j <= 1; ++j)
- {
- for(i = 0; i < search_getsize(glob); ++i)
- {
- fn = search_getfilename(glob, i);
- fh = fopen(fn, FILE_READ);
- if(fh < 0)
- continue;
- fgets(fh); fgets(fh);
- sk = stof(fgets(fh));
- if(sk == (j ? 0 : self.skinindex)) // 2nd pass skips the skin test
- if(fgets(fh) == self.model)
- {
- l = fgets(fh);
- len = tokenize_console(l);
- if (len != 2)
- goto nospecies;
- if (argv(0) != "species")
- goto nospecies;
- switch(argv(1))
- {
- case "human": s = SPECIES_HUMAN; break;
- case "alien": s = SPECIES_ALIEN; break;
- case "robot_shiny": s = SPECIES_ROBOT_SHINY; break;
- case "robot_rusty": s = SPECIES_ROBOT_RUSTY; break;
- case "robot_solid": s = SPECIES_ROBOT_SOLID; break;
- case "animal": s = SPECIES_ANIMAL; break;
- case "reserved": s = SPECIES_RESERVED; break;
- }
- }
-:nospecies
- fclose(fh);
- }
- if (s >= 0)
- break;
- }
- search_end(glob);
-
- if (s < 0)
- s = SPECIES_HUMAN;
-
+ float s;
+ get_model_parameters(self.playermodel, self.skinindex);
+ s = get_model_parameters_species;
+ get_model_parameters(string_null, 0);
+ if(s < 0)
+ return SPECIES_HUMAN;
return s;
}
self.dmg_take = self.dmg_take + take;//max(take - 10, 0);
self.dmg_inflictor = inflictor;
- if (self.health <= -75 && self.modelindex != 0)
+ if (self.health <= -100 && self.modelindex != 0)
{
// don't use any animations as a gib
self.frame = 0;
else
Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
- if((g_arena && numspawned < 2) || (g_ca && player_cnt < 2) && !inWarmupStage)
+ if((g_arena && numspawned < 2) || (g_ca && player_cnt < required_ca_players) && !inWarmupStage)
return;
if (!g_minstagib)
Obituary (attacker, inflictor, self, deathtype);
race_PreDie();
DropAllRunes(self);
- if(self == attacker)
- kh_Key_DropAll(self, TRUE);
- else if(attacker.classname == "player" || attacker.classname == "gib")
- kh_Key_DropAll(self, FALSE);
- else
- kh_Key_DropAll(self, TRUE);
+
+ frag_attacker = attacker;
+ frag_inflictor = inflictor;
+ frag_target = self;
+ MUTATOR_CALLHOOK(PlayerDies);
+
if(self.flagcarried)
{
if(attacker.classname != "player" && attacker.classname != "gib")
self.movetype = MOVETYPE_TOSS;
// shootable corpse
self.solid = SOLID_CORPSE;
+ self.ballistics_density = cvar("g_ballistics_density_corpse");
// don't stick to the floor
self.flags &~= FL_ONGROUND;
// dying animation
}
.float muted; // to be used by prvm_edictset server playernumber muted 1
-void Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol)
+float Say(entity source, float teamsay, entity privatesay, string msgin, float floodcontrol)
+// message "": do not say, just test flood control
+// return value:
+// 1 = accept
+// 0 = reject
+// -1 = fake accept
{
string msgstr, colorstr, cmsgstr, namestr, fullmsgstr, sourcemsgstr, fullcmsgstr, sourcecmsgstr, privatemsgprefix;
float flood, privatemsgprefixlen;
entity head;
+ float ret;
if(Ban_MaybeEnforceBan(source))
- return;
+ return 0;
if(!teamsay && !privatesay)
if(substring(msgin, 0, 1) == " ")
msgin = formatmessage(msgin);
- if(msgin == "")
- return;
-
if(source.classname != "player")
colorstr = "^0"; // black for spectators
else if(teams_matter)
if(intermission_running)
teamsay = FALSE;
- msgin = trigger_magicear_processmessage_forallears(source, teamsay, privatesay, msgin);
- if(msgin == "")
- return;
+ if(msgin != "")
+ msgin = trigger_magicear_processmessage_forallears(source, teamsay, privatesay, msgin);
/*
* using bprint solves this... me stupid
else
namestr = source.netname;
- if(privatesay)
+ if(msgin != "")
{
- msgstr = strcat("\{1}\{13}* ^3", namestr, "^3 tells you: ^7");
- privatemsgprefixlen = strlen(msgstr);
- msgstr = strcat(msgstr, msgin);
- cmsgstr = strcat(colorstr, "^3", namestr, "^3 tells you:\n^7", msgin);
- if(cvar("g_chat_teamcolors"))
- privatemsgprefix = strcat("\{1}\{13}* ^3You tell ", playername(privatesay), ": ^7");
+ if(privatesay)
+ {
+ msgstr = strcat("\{1}\{13}* ^3", namestr, "^3 tells you: ^7");
+ privatemsgprefixlen = strlen(msgstr);
+ msgstr = strcat(msgstr, msgin);
+ cmsgstr = strcat(colorstr, "^3", namestr, "^3 tells you:\n^7", msgin);
+ if(cvar("g_chat_teamcolors"))
+ privatemsgprefix = strcat("\{1}\{13}* ^3You tell ", playername(privatesay), ": ^7");
+ else
+ privatemsgprefix = strcat("\{1}\{13}* ^3You tell ", privatesay.netname, ": ^7");
+ }
+ else if(teamsay)
+ {
+ msgstr = strcat("\{1}\{13}", colorstr, "(^3", namestr, colorstr, ") ^7", msgin);
+ cmsgstr = strcat(colorstr, "(^3", namestr, colorstr, ")\n^7", msgin);
+ }
else
- privatemsgprefix = strcat("\{1}\{13}* ^3You tell ", privatesay.netname, ": ^7");
- }
- else if(teamsay)
- {
- msgstr = strcat("\{1}\{13}", colorstr, "(^3", namestr, colorstr, ") ^7", msgin);
- cmsgstr = strcat(colorstr, "(^3", namestr, colorstr, ")\n^7", msgin);
+ {
+ msgstr = strcat("\{1}", namestr, "^7: ", msgin);
+ cmsgstr = "";
+ }
+ msgstr = strcat(strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint
}
else
{
- msgstr = strcat("\{1}", namestr, "^7: ", msgin);
- cmsgstr = "";
+ msgstr = cmsgstr = "";
}
- msgstr = strcat(strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint
fullmsgstr = msgstr;
fullcmsgstr = cmsgstr;
// to match explanation in default.cfg, a value of 3 must allow three-line bursts and not four!
// do flood control for the default line size
- getWrappedLine_remaining = msgstr;
- msgstr = "";
- lines = 0;
- while(getWrappedLine_remaining && (!flood_lmax || lines <= flood_lmax))
+ if(msgstr != "")
{
- msgstr = strcat(msgstr, " ", getWrappedLineLen(82.4289758859709, strlennocol)); // perl averagewidth.pl < gfx/vera-sans.width
- ++lines;
- }
- msgstr = substring(msgstr, 1, strlen(msgstr) - 1);
+ getWrappedLine_remaining = msgstr;
+ msgstr = "";
+ lines = 0;
+ while(getWrappedLine_remaining && (!flood_lmax || lines <= flood_lmax))
+ {
+ msgstr = strcat(msgstr, " ", getWrappedLineLen(82.4289758859709, strlennocol)); // perl averagewidth.pl < gfx/vera-sans.width
+ ++lines;
+ }
+ msgstr = substring(msgstr, 1, strlen(msgstr) - 1);
- if(getWrappedLine_remaining != "")
- {
- msgstr = strcat(msgstr, "\n");
- flood = 2;
- }
+ if(getWrappedLine_remaining != "")
+ {
+ msgstr = strcat(msgstr, "\n");
+ flood = 2;
+ }
- if(time >= source.flood_field)
- {
- source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + lines * flood_spl;
+ if(time >= source.flood_field)
+ {
+ source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + lines * flood_spl;
+ }
+ else
+ {
+ flood = 1;
+ msgstr = fullmsgstr;
+ }
}
else
{
- flood = 1;
- msgstr = fullmsgstr;
+ if(time >= source.flood_field)
+ source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + flood_spl;
+ else
+ flood = 1;
}
}
if (timeoutStatus == 2) //when game is paused, no flood protection
source.flood_field = flood = 0;
- if(flood == 2)
+ if(flood == 2) // cannot happen for empty msgstr
{
if(cvar("g_chat_flood_notify_flooder"))
{
if(source.muted)
{
// always fake the message
- sprint(source, sourcemsgstr);
- if(cmsgstr != "" && !privatesay)
- centerprint(source, sourcecmsgstr);
+ ret = -1;
}
else if(flood == 1)
{
if(cvar("g_chat_flood_notify_flooder"))
- sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
- else
{
- sprint(source, sourcemsgstr);
- if(cmsgstr != "" && !privatesay)
- centerprint(source, sourcecmsgstr);
+ sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
+ ret = 0;
}
+ else
+ ret = -1;
}
- else if(privatesay)
- {
- sprint(source, sourcemsgstr);
- sprint(privatesay, msgstr);
- if(cmsgstr != "")
- centerprint(privatesay, cmsgstr);
- }
- else if(teamsay > 0)
- {
- sprint(source, sourcemsgstr);
- if(sourcecmsgstr != "")
- centerprint(source, sourcecmsgstr);
- FOR_EACH_REALPLAYER(head) if(head.team == source.team)
- if(head != source)
- {
- sprint(head, msgstr);
- if(cmsgstr != "")
- centerprint(head, cmsgstr);
- }
- }
- else if(teamsay < 0)
+ else
{
- sprint(source, sourcemsgstr);
- FOR_EACH_REALCLIENT(head) if(head.classname != "player")
- if(head != source)
- sprint(head, msgstr);
+ ret = 1;
}
- else if(sourcemsgstr != msgstr)
+
+ if(sourcemsgstr != "" && ret != 0)
{
- sprint(source, sourcemsgstr);
- FOR_EACH_REALCLIENT(head)
- if(head != source)
- sprint(head, msgstr);
+ if(ret < 0) // fake
+ {
+ sprint(source, sourcemsgstr);
+ if(sourcecmsgstr != "" && !privatesay)
+ centerprint(source, sourcecmsgstr);
+ }
+ else if(privatesay)
+ {
+ sprint(source, sourcemsgstr);
+ sprint(privatesay, msgstr);
+ if(cmsgstr != "")
+ centerprint(privatesay, cmsgstr);
+ }
+ else if(teamsay > 0)
+ {
+ sprint(source, sourcemsgstr);
+ if(sourcecmsgstr != "")
+ centerprint(source, sourcecmsgstr);
+ FOR_EACH_REALPLAYER(head) if(head.team == source.team)
+ if(head != source)
+ {
+ sprint(head, msgstr);
+ if(cmsgstr != "")
+ centerprint(head, cmsgstr);
+ }
+ }
+ else if(teamsay < 0)
+ {
+ sprint(source, sourcemsgstr);
+ FOR_EACH_REALCLIENT(head) if(head.classname != "player")
+ if(head != source)
+ sprint(head, msgstr);
+ }
+ else if(sourcemsgstr != msgstr)
+ {
+ sprint(source, sourcemsgstr);
+ FOR_EACH_REALCLIENT(head)
+ if(head != source)
+ sprint(head, msgstr);
+ }
+ else
+ bprint(msgstr);
}
- else
- bprint(msgstr);
+
+ return ret;
}
float GetVoiceMessageVoiceType(string type)
var .string field;
fh = fopen(f, FILE_READ);
if(fh < 0)
+ {
+ dprint("Player sound file not found: ", f, "\n");
return;
+ }
while((s = fgets(fh)))
{
if(tokenize_console(s) != 3)
}
.float modelindex_for_playersound;
+.float skinindex_for_playersound;
void UpdatePlayerSounds()
{
if(self.modelindex == self.modelindex_for_playersound)
+ if(self.skinindex == self.skinindex_for_playersound)
return;
self.modelindex_for_playersound = self.modelindex;
+ self.skinindex_for_playersound = self.skinindex;
ClearPlayerSounds();
LoadPlayerSounds("sound/player/default.sounds", 1);
- LoadPlayerSounds(strcat(self.model, ".sounds"), 0);
+ LoadPlayerSounds(get_model_datafilename(self.playermodel, self.skinindex, "sounds"), 0);
+}
+
+void FakeGlobalSound(string sample, float chan, float voicetype)
+{
+ float n;
+ float tauntrand;
+
+ if(sample == "")
+ return;
+
+ tokenize_console(sample);
+ n = stof(argv(1));
+ if(n > 0)
+ sample = strcat(argv(0), ftos(floor(random() * n + 1)), ".wav"); // randomization
+ else
+ sample = strcat(argv(0), ".wav"); // randomization
+
+ switch(voicetype)
+ {
+ case VOICETYPE_LASTATTACKER_ONLY:
+ break;
+ case VOICETYPE_LASTATTACKER:
+ if(self.pusher)
+ {
+ msg_entity = self;
+ if(clienttype(msg_entity) == CLIENTTYPE_REAL)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
+ }
+ break;
+ case VOICETYPE_TEAMRADIO:
+ msg_entity = self;
+ if(msg_entity.cvar_cl_voice_directional == 1)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_MIN);
+ else
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
+ break;
+ case VOICETYPE_AUTOTAUNT:
+ if(!sv_autotaunt)
+ break;
+ if(!sv_taunt)
+ break;
+ if(sv_gentle)
+ break;
+ tauntrand = random();
+ msg_entity = self;
+ if (tauntrand < msg_entity.cvar_cl_autotaunt)
+ {
+ if (msg_entity.cvar_cl_voice_directional >= 1)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));
+ else
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
+ }
+ break;
+ case VOICETYPE_TAUNT:
+ if(self.classname == "player")
+ if(self.deadflag == DEAD_NO)
+ setanim(self, self.anim_taunt, FALSE, TRUE, TRUE);
+ if(!sv_taunt)
+ break;
+ if(sv_gentle)
+ break;
+ msg_entity = self;
+ if (msg_entity.cvar_cl_voice_directional >= 1)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, bound(ATTN_MIN, msg_entity.cvar_cl_voice_directional_taunt_attenuation, ATTN_MAX));
+ else
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
+ break;
+ case VOICETYPE_PLAYERSOUND:
+ msg_entity = self;
+ soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NORM);
+ break;
+ default:
+ backtrace("Invalid voice type!");
+ break;
+ }
}
void GlobalSound(string sample, float chan, float voicetype)
{
case VOICETYPE_LASTATTACKER_ONLY:
if(self.pusher)
- if(self.pusher.team == self.team)
+ {
+ msg_entity = self.pusher;
+ if(clienttype(msg_entity) == CLIENTTYPE_REAL)
{
- msg_entity = self.pusher;
- if(clienttype(msg_entity) == CLIENTTYPE_REAL)
- {
- if(msg_entity.cvar_cl_voice_directional == 1)
- soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_MIN);
- else
- soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
- }
+ if(msg_entity.cvar_cl_voice_directional == 1)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_MIN);
+ else
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
}
+ }
break;
case VOICETYPE_LASTATTACKER:
if(self.pusher)
- if(self.pusher.team == self.team)
+ {
+ msg_entity = self.pusher;
+ if(clienttype(msg_entity) == CLIENTTYPE_REAL)
{
- msg_entity = self.pusher;
- if(clienttype(msg_entity) == CLIENTTYPE_REAL)
- {
- if(msg_entity.cvar_cl_voice_directional == 1)
- soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_MIN);
- else
- soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
- }
- msg_entity = self;
- if(clienttype(msg_entity) == CLIENTTYPE_REAL)
- soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
+ if(msg_entity.cvar_cl_voice_directional == 1)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_MIN);
+ else
+ soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
}
+ msg_entity = self;
+ if(clienttype(msg_entity) == CLIENTTYPE_REAL)
+ soundto(MSG_ONE, self, chan, sample, VOL_BASE, ATTN_NONE);
+ }
break;
case VOICETYPE_TEAMRADIO:
FOR_EACH_REALCLIENT(msg_entity)
else
soundto(MSG_ONE, self, chan, sample, VOL_BASEVOICE, ATTN_NONE);
}
+ break;
case VOICETYPE_PLAYERSOUND:
sound(self, chan, sample, VOL_BASE, ATTN_NORM);
break;
void PlayerSound(.string samplefield, float chan, float voicetype)
{
- string sample;
- sample = self.samplefield;
- GlobalSound(sample, chan, voicetype);
+ GlobalSound(self.samplefield, chan, voicetype);
}
void VoiceMessage(string type, string msg)
{
var .string sample;
- var float voicetype, ownteam;
+ float voicetype, ownteam;
+ float flood;
sample = GetVoiceMessageSampleField(type);
if(GetPlayerSoundSampleField_notFound)
voicetype = GetVoiceMessageVoiceType(type);
ownteam = (voicetype == VOICETYPE_TEAMRADIO);
- float flood;
- float flood_spv;
- var .float flood_field;
-
- flood = 0;
- if(ownteam)
- {
- flood_spv = cvar("g_voice_flood_spv_team");
- flood_field = floodcontrol_voiceteam;
- }
- else
- {
- flood_spv = cvar("g_voice_flood_spv");
- flood_field = floodcontrol_voice;
- }
-
- if(time >= self.flood_field)
- self.flood_field = max(time, self.flood_field) + flood_spv;
- else
- flood = 1;
-
- if (timeoutStatus == 2) //when game is paused, no flood protection
- self.flood_field = flood = 0;
-
- if (msg != "")
- Say(self, ownteam, world, msg, 0);
+ flood = Say(self, ownteam, world, msg, 1);
- if (!flood)
- PlayerSound(sample, CHAN_VOICE, voicetype);
+ if (flood > 0)
+ GlobalSound(self.sample, CHAN_VOICE, voicetype);
+ else if (flood < 0)
+ FakeGlobalSound(self.sample, CHAN_VOICE, voicetype);
}
void MoveToTeam(entity client, float team_colour, float type, float show_message)
projects / xonotic / xonotic-data.pk3dir.git / blobdiff