void spawnfunc_ammo_shells() { spawnfunc_item_shells(); }
// MG -> MG
-void spawnfunc_weapon_machinegun() { spawnfunc_weapon_uzi(); }
void spawnfunc_ammo_bullets() { spawnfunc_item_bullets(); }
// GL -> Mortar
void spawnfunc_ammo_grenades() { spawnfunc_item_rockets(); }
-// LG -> Electro
-void spawnfunc_weapon_lightning() { spawnfunc_weapon_electro(); }
+// LG -> Lightning
+//void spawnfunc_weapon_lightning() { spawnfunc_weapon_electro(); }
void spawnfunc_ammo_lightning() { spawnfunc_item_cells(); }
// Plasma -> Hagar
void spawnfunc_weapon_plasmagun() { spawnfunc_weapon_hagar(); }
void spawnfunc_ammo_cells() { spawnfunc_item_rockets(); }
-// Rail -> Rifle
-void spawnfunc_weapon_railgun() { spawnfunc_weapon_rifle(); }
-void spawnfunc_ammo_slugs() { spawnfunc_item_bullets(); }
+// Rail -> Vortex
+void spawnfunc_weapon_railgun() { spawnfunc_weapon_vortex(); }
+void spawnfunc_ammo_slugs() { spawnfunc_item_cells(); }
// BFG -> Crylink
void spawnfunc_weapon_bfg() { spawnfunc_weapon_crylink(); }
entity targ;
for (targ = world; (targ = find(targ, targetname, self.target)); ) {
if (targ.classname == "weapon_rocketlauncher") {
- self.ammo_rockets += targ.count * autocvar_g_balance_rocketlauncher_ammo;
+ self.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
self.netname = "rocketlauncher";
}
else if (targ.classname == "weapon_plasmagun") {
- self.ammo_rockets += targ.count * autocvar_g_balance_hagar_primary_ammo;
+ self.ammo_rockets += targ.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
if(self.netname == "")
self.netname = "hagar";
else
self.netname = strcat(self.netname, " crylink");
}
else if (targ.classname == "weapon_grenadelauncher") {
- self.ammo_rockets += targ.count * autocvar_g_balance_grenadelauncher_primary_ammo;
+ self.ammo_rockets += targ.count * autocvar_g_balance_mortar_primary_ammo; // WEAPONTODO
if(self.netname == "")
self.netname = "grenadelauncher";
else
//void spawnfunc_item_health_mega() /* handled in t_items.qc */
//void spawnfunc_item_invis() /* not supported */
//void spawnfunc_item_regen() /* not supported */
-void spawnfunc_team_CTF_redflag() { spawnfunc_item_flag_team1(); }
-void spawnfunc_team_CTF_blueflag() { spawnfunc_item_flag_team2(); }
-void spawnfunc_team_CTF_redplayer() { spawnfunc_info_player_team1(); }
-void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2(); }
-void spawnfunc_team_CTF_redspawn() { spawnfunc_info_player_team1(); }
-void spawnfunc_team_CTF_bluespawn() { spawnfunc_info_player_team2(); }
+
+// CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
void spawnfunc_item_flight() { spawnfunc_item_jetpack(); }
return 1;
if(self.notta)
- if not(!teamplay || g_tdm || g_ctf)
+ if (!(!teamplay || g_tdm || g_ctf))
return 1;
if(self.notsingle)
if(self.gametype)
{
string gametypename;
- // static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"};
+ // static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"}
gametypename = "ffa";
if(teamplay)
gametypename = "team";
- if(g_arena)
- gametypename = "tournament";
if(g_ctf)
gametypename = "ctf";
if(maxclients == 1)