wep = self.switchweapon;
if (!wep)
wep = self.cnt;
- replacement = WEP_NAME(wep);
+ replacement = W_Name(wep);
} else if (escape == "W") {
if (self.items & IT_SHELLS) replacement = "shells";
else if (self.items & IT_NAILS) replacement = "bullets";
else if (self.items & IT_ROCKETS) replacement = "rockets";
else if (self.items & IT_CELLS) replacement = "cells";
- else if (self.items & IT_PLASMA) replacement = "plasma";
else replacement = "batteries"; // ;)
} else if (escape == "x") {
replacement = cursor_ent.netname;
stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n"));
}
}
+float w_getbestweapon(entity e);
string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo)
{
string o;
float g_pickup_rockets_max;
float g_pickup_cells;
float g_pickup_cells_max;
-float g_pickup_plasma;
-float g_pickup_plasma_max;
float g_pickup_fuel;
float g_pickup_fuel_jetpack;
float g_pickup_fuel_max;
float start_ammo_nails;
float start_ammo_rockets;
float start_ammo_cells;
-float start_ammo_plasma;
float start_ammo_fuel;
float start_health;
float start_armorvalue;
float warmup_start_ammo_nails;
float warmup_start_ammo_rockets;
float warmup_start_ammo_cells;
-float warmup_start_ammo_plasma;
float warmup_start_ammo_fuel;
float warmup_start_health;
float warmup_start_armorvalue;
float g_weapon_stay;
-float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still needs done?
+entity get_weaponinfo(float w);
+
+float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
{
var float i = weaponinfo.weapon;
var float d = 0;
else if (g_nexball)
d = 0; // weapon is set a few lines later
else
- d = !(!weaponinfo.weaponstart);
+ d = (i == WEP_LASER || i == WEP_SHOTGUN);
if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook
d |= (i == WEP_HOOK);
- if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns
+ if(weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED) // never default mutator blocked guns
d = 0;
- var float t = weaponinfo.weaponstartoverride;
+ var float t = cvar(strcat(cvarprefix, weaponinfo.netname));
//print(strcat("want_weapon: ", weaponinfo.netname, " - d: ", ftos(d), ", t: ", ftos(t), ". \n"));
start_ammo_nails = 0;
start_ammo_rockets = 0;
start_ammo_cells = 0;
- start_ammo_plasma = 0;
start_health = cvar("g_balance_health_start");
start_armorvalue = cvar("g_balance_armor_start");
for (i = WEP_FIRST; i <= WEP_LAST; ++i)
{
e = get_weaponinfo(i);
- float w = want_weapon(e, FALSE);
+ float w = want_weapon("g_start_weapon_", e, FALSE);
if(w & 1)
start_weapons |= WepSet_FromWeapon(i);
if(w & 2)
start_ammo_rockets = 999;
start_ammo_shells = 999;
start_ammo_cells = 999;
- start_ammo_plasma = 999;
start_ammo_nails = 999;
start_ammo_fuel = 999;
}
start_ammo_nails = cvar("g_start_ammo_nails");
start_ammo_rockets = cvar("g_start_ammo_rockets");
start_ammo_cells = cvar("g_start_ammo_cells");
- start_ammo_plasma = cvar("g_start_ammo_plasma");
start_ammo_fuel = cvar("g_start_ammo_fuel");
}
for (i = WEP_FIRST; i <= WEP_LAST; ++i)
{
e = get_weaponinfo(i);
- float w = want_weapon(e, g_warmup_allguns);
+ float w = want_weapon("g_start_weapon_", e, g_warmup_allguns);
if(w & 1)
warmup_start_weapons |= WepSet_FromWeapon(i);
if(w & 2)
{
e = get_weaponinfo(i);
if(precache_weapons & WepSet_FromWeapon(i))
- WEP_ACTION(i, WR_INIT);
+ weapon_action(i, WR_PRECACHE);
}
start_ammo_shells = max(0, start_ammo_shells);
start_ammo_nails = max(0, start_ammo_nails);
start_ammo_cells = max(0, start_ammo_cells);
- start_ammo_plasma = max(0, start_ammo_plasma);
start_ammo_rockets = max(0, start_ammo_rockets);
start_ammo_fuel = max(0, start_ammo_fuel);
warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
warmup_start_ammo_cells = max(0, warmup_start_ammo_cells);
- warmup_start_ammo_plasma = max(0, warmup_start_ammo_plasma);
warmup_start_ammo_rockets = max(0, warmup_start_ammo_rockets);
warmup_start_ammo_fuel = max(0, warmup_start_ammo_fuel);
}
g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow");
g_bugrigs_steer = cvar("g_bugrigs_steer");
- g_minstagib = cvar("g_minstagib");
+ g_instagib = cvar("g_instagib");
sv_clones = cvar("sv_clones");
sv_foginterval = cvar("sv_foginterval");
g_pickup_rockets_max = cvar("g_pickup_rockets_max");
g_pickup_cells = cvar("g_pickup_cells");
g_pickup_cells_max = cvar("g_pickup_cells_max");
- g_pickup_plasma = cvar("g_pickup_plasma");
- g_pickup_plasma_max = cvar("g_pickup_plasma_max");
g_pickup_fuel = cvar("g_pickup_fuel");
g_pickup_fuel_jetpack = cvar("g_pickup_fuel_jetpack");
g_pickup_fuel_max = cvar("g_pickup_fuel_max");
precache_sound ("weapons/hook_impact.wav"); // hook
}
+ if(autocvar_sv_precacheweapons)
+ {
+ //precache weapon models/sounds
+ float wep;
+ wep = WEP_FIRST;
+ while (wep <= WEP_LAST)
+ {
+ weapon_action(wep, WR_PRECACHE);
+ wep = wep + 1;
+ }
+ }
+
precache_model("models/elaser.mdl");
precache_model("models/laser.mdl");
precache_model("models/ebomb.mdl");
}
}
+
+entity eliminatedPlayers;
+.float(entity) isEliminated;
+float EliminatedPlayers_SendEntity(entity to, float sendflags)
+{
+ float i, f, b;
+ entity e;
+ WriteByte(MSG_ENTITY, ENT_CLIENT_ELIMINATEDPLAYERS);
+ WriteByte(MSG_ENTITY, sendflags);
+
+ if(sendflags & 1)
+ {
+ for(i = 1; i <= maxclients; i += 8)
+ {
+ for(f = 0, e = edict_num(i), b = 1; b < 256; b *= 2, e = nextent(e))
+ {
+ if(eliminatedPlayers.isEliminated(e))
+ f |= b;
+ }
+ WriteByte(MSG_ENTITY, f);
+ }
+ }
+
+ return TRUE;
+}
+
+void EliminatedPlayers_Init(float(entity) isEliminated_func)
+{
+ if(eliminatedPlayers)
+ {
+ backtrace("Can't spawn eliminatedPlayers again!");
+ return;
+ }
+ Net_LinkEntity(eliminatedPlayers = spawn(), FALSE, 0, EliminatedPlayers_SendEntity);
+ eliminatedPlayers.isEliminated = isEliminated_func;
+}
+
+
void adaptor_think2touch()
{
entity o;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff