{
oldself = self;
self = cl;
- f = weapon_action(wpn, WR_CHECKAMMO1);
- f = f + weapon_action(wpn, WR_CHECKAMMO2);
+ f = weapon_action(wpn, WR_SWITCHABLE);
// allow switching to reloadable weapons, even if we're out of ammo, since the weapon itself
// might still be loaded. The reload code takes care of complaining and forced switching
entity e;
e = get_weaponinfo(wpn);
if(wpn != WEP_TUBA && wpn != WEP_PORTO && wpn != WEP_HOOK) // skip non-reloadable weapons, or we access undefined cvars
- if(cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
- {
- if(weapon_action(wpn, WR_SWITCHABLE))
- f = 1;
- else
- f = 0; // necessary to avoid switching back and forth
- }
// always allow selecting the Mine Layer if we placed mines, so that we can detonate them
local entity mine;
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
if (!weapon_action(self.weapon, WR_CHECKAMMO1 + secondary))
{
- // allow switching to reloadable weapons, even if we're out of ammo, since the weapon itself
- // might still be loaded. The reload code takes care of complaining and forced switching
- entity e;
- e = get_weaponinfo(self.weapon);
- if(self.weapon != WEP_TUBA && self.weapon != WEP_PORTO && self.weapon != WEP_HOOK) // skip non-reloadable weapons, or we access undefined cvars
- if(cvar(strcat("g_balance_", e.netname, "_reload_ammo")))
- if(weapon_action(self.weapons, WR_SWITCHABLE))
+ // always allow reloadable weapons, even if we're out of ammo, since the weapon itself
+ // could still be loaded. The reload code takes care of the rest
+ if(weapon_action(self.weapon, WR_SWITCHABLE))
return FALSE;
// always keep the Mine Layer if we placed mines, so that we can detonate them
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_crylink_primary_ammo, autocvar_g_balance_crylink_secondary_ammo);
- return self.crylink_load >= ammo_amount || self.ammo_cells >= ammo_amount;
+ return (autocvar_g_balance_crylink_reload_ammo && self.crylink_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_electro_primary_ammo, autocvar_g_balance_electro_secondary_ammo);
- return self.electro_load >= ammo_amount || self.ammo_cells >= ammo_amount;
+ return (autocvar_g_balance_electro_reload_ammo && self.electro_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_fireball_primary_ammo, autocvar_g_balance_fireball_secondary_ammo);
- return self.fireball_load >= ammo_amount || self.ammo_fuel >= ammo_amount;
+ return (autocvar_g_balance_fireball_reload_ammo && self.fireball_load >= ammo_amount) || self.ammo_fuel >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_grenadelauncher_primary_ammo, autocvar_g_balance_grenadelauncher_secondary_ammo);
- return self.grenadelauncher_load >= ammo_amount || self.ammo_rockets >= ammo_amount;
+ return (autocvar_g_balance_grenadelauncher_reload_ammo && self.grenadelauncher_load) >= ammo_amount || self.ammo_rockets >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo);
- return self.hagar_load >= ammo_amount || self.ammo_rockets >= ammo_amount;
+ return (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= ammo_amount) || self.ammo_rockets >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_hlac_primary_ammo, autocvar_g_balance_hlac_secondary_ammo);
- return self.hlac_load >= ammo_amount || self.ammo_cells >= ammo_amount;
+ return (autocvar_g_balance_hlac_reload_ammo && self.hlac_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = autocvar_g_balance_minelayer_ammo;
- return self.minelayer_load >= ammo_amount || self.ammo_rockets >= ammo_amount;
+ return (autocvar_g_balance_minelayer_reload_ammo && self.minelayer_load >= ammo_amount) || self.ammo_rockets >= ammo_amount;
}
return TRUE;
};
if(autocvar_g_balance_minstanex_laser_ammo)
ammo_amount = min(ammo_amount, autocvar_g_balance_minstanex_laser_ammo);
- return self.minstanex_load >= ammo_amount || self.ammo_cells >= ammo_amount;
+ return (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_nex_primary_ammo, autocvar_g_balance_nex_secondary_ammo);
- return self.nex_load >= ammo_amount || self.ammo_cells >= ammo_amount;
+ return (autocvar_g_balance_nex_reload_ammo && self.nex_load >= ammo_amount) || self.ammo_cells >= ammo_amount;
}
return TRUE;
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = autocvar_g_balance_rocketlauncher_ammo;
- return self.rocketlauncher_load >= ammo_amount || self.ammo_rockets >= ammo_amount;
+ return (autocvar_g_balance_rocketlauncher_reload_ammo && self.rocketlauncher_load >= ammo_amount) || self.ammo_rockets >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_seeker_missile_ammo, autocvar_g_balance_seeker_tag_ammo);
- return self.seeker_load >= ammo_amount || self.ammo_rockets >= ammo_amount;
+ return (autocvar_g_balance_seeker_reload_ammo && self.seeker_load >= ammo_amount) || self.ammo_rockets >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = autocvar_g_balance_shotgun_primary_ammo;
- return self.shotgun_load >= ammo_amount || self.ammo_shells >= ammo_amount;
+ return (autocvar_g_balance_shotgun_reload_ammo && self.shotgun_load >= ammo_amount) || self.ammo_shells >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo);
- return self.sniperrifle_load >= ammo_amount || self.ammo_nails >= ammo_amount;
+ return (autocvar_g_balance_sniperrifle_reload_ammo && self.sniperrifle_load >= ammo_amount) || self.ammo_nails >= ammo_amount;
}
return TRUE;
};
// or we have enough ammo to reload the weapon to a usable point
float ammo_amount;
ammo_amount = min(max(autocvar_g_balance_uzi_sustained_ammo, autocvar_g_balance_uzi_first_ammo), autocvar_g_balance_uzi_burst_ammo);
- return self.uzi_load >= ammo_amount || self.ammo_nails >= ammo_amount;
+ return (autocvar_g_balance_uzi_reload_ammo && self.uzi_load >= ammo_amount) || self.ammo_nails >= ammo_amount;
}
return TRUE;
};
projects / xonotic / xonotic-data.pk3dir.git / commitdiff