void W_SniperRifle_SetAmmoCounter()
{
- // set ammo counter to the weapon we have switched to
+ // set clip_load to the weapon we have switched to, if the gun uses reloading
if(!autocvar_g_balance_sniperrifle_reload_ammo)
- self.ammo_counter = 0; // also keeps the crosshair ammo from displaying
+ self.clip_load = 0; // also keeps crosshair ammo from displaying
else
- self.ammo_counter = self.sniperrifle_load;
+ {
+ self.clip_load = self.sniperrifle_load;
+ self.clip_size = autocvar_g_balance_sniperrifle_reload_ammo; // for the crosshair ammo display
+ }
}
void W_SniperRifle_ReloadedAndReady()
{
float t;
- // now do the ammo maths
- self.ammo_counter = self.old_ammo_counter; // restore ammo counter, in case we still had ammo in the weapon while reloading
- while(self.ammo_counter < autocvar_g_balance_sniperrifle_reload_ammo && self.ammo_nails) // make sure we don't add more than the amount of ammo we have
+ // now do the ammo transfer
+ self.clip_load = self.old_clip_load; // restore the ammo counter, in case we still had ammo in the weapon before reloading
+ while(self.clip_load < autocvar_g_balance_sniperrifle_reload_ammo && self.ammo_nails) // make sure we don't add more ammo than we have
{
- self.ammo_counter += 1;
+ self.clip_load += 1;
self.ammo_nails -= 1;
}
- self.sniperrifle_load = self.ammo_counter;
+ self.sniperrifle_load = self.clip_load;
t = ATTACK_FINISHED(self) - autocvar_g_balance_sniperrifle_reload_time - 1;
ATTACK_FINISHED(self) = t;
void W_SniperRifle_Reload()
{
- // reloading is disabled for this weapon
+ // return if reloading is disabled for this weapon
if(!autocvar_g_balance_sniperrifle_reload_ammo)
return;
- float t;
-
- if(!W_ReloadCheck(self.sniperrifle_load, autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo))
+ if(!W_ReloadCheck(self.ammo_nails))
return;
- sound (self, CHAN_WEAPON2, "weapons/campingrifle_reload.wav", VOL_BASE, ATTN_NORM);
+ float t;
+
+ sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM);
t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_sniperrifle_reload_time + 1;
ATTACK_FINISHED(self) = t;
weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_sniperrifle_reload_time, W_SniperRifle_ReloadedAndReady);
- self.old_ammo_counter = self.ammo_counter;
- self.ammo_counter = -1;
-}
-
-float W_SniperRifle_CheckMaxBullets(float checkammo)
-{
- float maxbulls;
- maxbulls = autocvar_g_balance_sniperrifle_reload_ammo;
- if(!maxbulls)
- maxbulls = 8; // match HUD
- if(checkammo)
- if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
- maxbulls = min(maxbulls, floor(self.ammo_nails / min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)));
- if(self.ammo_counter > maxbulls)
- self.ammo_counter = maxbulls;
- return (self.ammo_counter == maxbulls);
+ self.old_clip_load = self.clip_load;
+ self.clip_load = -1;
}
void W_SniperRifle_FireBullet(float pSpread, float pDamage, float pHeadshotAddedDamage, float pForce, float pSpeed, float pLifetime, float pAmmo, float deathtype, float pBulletConstant)
{
- if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
- {
- if(!autocvar_g_balance_sniperrifle_reload_ammo)
- self.ammo_nails -= pAmmo;
- else
- self.sniperrifle_load -= pAmmo;
- }
-
if(deathtype & HITTYPE_SECONDARY)
W_SetupShot (self, autocvar_g_antilag_bullets && pSpeed >= autocvar_g_antilag_bullets, 2, "weapons/campingrifle_fire2.wav", CHAN_WEAPON, autocvar_g_balance_sniperrifle_secondary_damage + autocvar_g_balance_sniperrifle_secondary_headshotaddeddamage);
else
if (autocvar_g_casings >= 2)
SpawnCasing (((random () * 50 + 50) * v_right) - (v_forward * (random () * 25 + 25)) - ((random () * 5 - 70) * v_up), 2, vectoangles(v_forward),'0 250 0', 100, 3, self);
-
- self.ammo_counter = self.ammo_counter - 1;
+
+ // if this weapon is reloadable, decrease its load. Else decrease the player's ammo
+ if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+ {
+ if(autocvar_g_balance_sniperrifle_reload_ammo)
+ {
+ self.clip_load -= pAmmo;
+ self.sniperrifle_load = self.clip_load;
+ }
+ else
+ self.ammo_nails -= pAmmo;
+ }
}
void W_SniperRifle_Attack()
{
float r, sw, af;
- if(autocvar_g_balance_sniperrifle_reload_ammo && self.ammo_counter <= 0)
- return; // reloading, so we are done
-
sw = self.switchweapon; // make it not detect weapon changes as reason to abort firing
af = ATTACK_FINISHED(self);
self.switchweapon = self.weapon;
.float bot_secondary_sniperriflemooth;
float w_sniperrifle(float req)
{
- float full;
if (req == WR_AIM)
{
self.BUTTON_ATCK=FALSE;
}
else if (req == WR_THINK)
{
- W_SniperRifle_SetAmmoCounter();
- if(autocvar_g_balance_sniperrifle_reload_ammo && self.ammo_counter <= 0) // forced reload
+ if(autocvar_g_balance_sniperrifle_reload_ammo && self.clip_load < min(autocvar_g_balance_sniperrifle_primary_ammo, autocvar_g_balance_sniperrifle_secondary_ammo)) // forced reload
W_SniperRifle_Reload();
else
{
if(self.weaponentity.state == WS_READY)
{
self.wish_reload = 0;
- W_SniperRifle_Reload(self.ammo_nails);
+ W_SniperRifle_Reload();
}
}
}
precache_model ("models/weapons/g_campingrifle.md3");
precache_model ("models/weapons/v_campingrifle.md3");
precache_model ("models/weapons/h_campingrifle.iqm");
- precache_sound ("weapons/campingrifle_reload.wav");
precache_sound ("weapons/campingrifle_fire.wav");
precache_sound ("weapons/campingrifle_fire2.wav");
+ precache_sound ("weapons/reload.wav");
}
else if (req == WR_SETUP)
{
weapon_setup(WEP_SNIPERRIFLE);
-
- full = W_SniperRifle_CheckMaxBullets(TRUE);
- if(autocvar_g_balance_sniperrifle_auto_reload_on_switch)
- if(!full)
- self.ammo_counter = -1;
+ W_SniperRifle_SetAmmoCounter();
}
else if (req == WR_CHECKAMMO1)
{
else if (req == WR_CHECKAMMO2)
{
if(autocvar_g_balance_sniperrifle_reload_ammo)
- return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_secondary_ammo;
+ return self.sniperrifle_load >= autocvar_g_balance_sniperrifle_primary_ammo;
else
return self.ammo_nails >= autocvar_g_balance_sniperrifle_secondary_ammo;
}
else if (req == WR_RESETPLAYER)
{
self.sniperrifle_accumulator = time - autocvar_g_balance_sniperrifle_bursttime;
- self.ammo_counter = autocvar_g_balance_sniperrifle_reload_ammo;
- W_SniperRifle_CheckMaxBullets(FALSE);
+ self.clip_load = autocvar_g_balance_sniperrifle_reload_ammo;
}
return TRUE;
};
projects / xonotic / xonotic-data.pk3dir.git / blobdiff