X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minstanex.qc;h=8efda9b07f279cea118cf0fd330f6455474d4d52;hb=9cdc5ecff03fff6fe2feef2341a33806aa110a97;hp=03b072b8df8d8c0f1aec1db5eadec1d86e592f42;hpb=5b77ec57a68f8753abd9033076795d17fc966d30;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc index 03b072b8d..8efda9b07 100644 --- a/qcsrc/server/w_minstanex.qc +++ b/qcsrc/server/w_minstanex.qc @@ -1,66 +1,9 @@ #ifdef REGISTER_WEAPON -REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex")) +REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", _("MinstaNex")) #else #ifdef SVQC .float minstanex_lasthit; -void W_Minstanex_SetAmmoCounter() -{ - // set clip_load to the weapon we have switched to, if the gun uses reloading - if(!autocvar_g_balance_minstanex_reload_ammo) - self.clip_load = 0; // also keeps crosshair ammo from displaying - else - { - self.clip_load = self.minstanex_load; - self.clip_size = autocvar_g_balance_minstanex_reload_ammo; // for the crosshair ammo display - } -} - -void W_Minstanex_ReloadedAndReady() -{ - float t; - - // 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_minstanex_reload_ammo && self.ammo_cells) // make sure we don't add more ammo than we have - { - self.clip_load += 1; - self.ammo_cells -= 1; - } - self.minstanex_load = self.clip_load; - - t = ATTACK_FINISHED(self) - autocvar_g_balance_minstanex_reload_time - 1; - ATTACK_FINISHED(self) = t; - w_ready(); -} - -void W_Minstanex_Reload() -{ - // return if reloading is disabled for this weapon - if(!autocvar_g_balance_minstanex_reload_ammo) - return; - - if(autocvar_g_balance_minstanex_laser_ammo) - { - if(!W_ReloadCheck(self.ammo_cells, min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo))) - return; - } - else if(!W_ReloadCheck(self.ammo_cells, autocvar_g_balance_minstanex_ammo)) - return; - - float t; - - sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM); - - t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_minstanex_reload_time + 1; - ATTACK_FINISHED(self) = t; - - weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_minstanex_reload_time, W_Minstanex_ReloadedAndReady); - - self.old_clip_load = self.clip_load; - self.clip_load = -1; -} - void W_MinstaNex_Attack (void) { float flying; @@ -137,25 +80,10 @@ void W_MinstaNex_Attack (void) if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)) Damage_DamageInfo(trace_endpos, 10000, 0, 0, 800 * w_shotdir, WEP_MINSTANEX, self); - // 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_minstanex_reload_ammo) - { - if (g_minstagib) - self.clip_load -= - 1; - else - self.clip_load -= autocvar_g_balance_minstanex_ammo; - self.minstanex_load = self.clip_load; - } - else - { - if (g_minstagib) - self.ammo_cells -= - 1; - else - self.ammo_cells -= autocvar_g_balance_minstanex_ammo; - } - } + if (g_minstagib) + W_DecreaseAmmo(ammo_cells, 1, autocvar_g_balance_minstanex_reload_ammo); + else + W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_reload_ammo); } @@ -260,9 +188,9 @@ float w_minstanex(float req) // if the laser uses load, we also consider its ammo for reloading if(autocvar_g_balance_minstanex_reload_ammo && autocvar_g_balance_minstanex_laser_ammo && self.clip_load < min(minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo)) // forced reload - W_Minstanex_Reload(); + weapon_action(self.weapon, WR_RELOAD); else if(autocvar_g_balance_minstanex_reload_ammo && self.clip_load < minstanex_ammo) // forced reload - W_Minstanex_Reload(); + weapon_action(self.weapon, WR_RELOAD); else if (self.BUTTON_ATCK) { if (weapon_prepareattack(0, autocvar_g_balance_minstanex_refire)) @@ -279,12 +207,7 @@ float w_minstanex(float req) // decrease ammo for the laser? if(autocvar_g_balance_minstanex_laser_ammo) - { - if(autocvar_g_balance_minstanex_reload_ammo) - self.clip_load -= autocvar_g_balance_minstanex_laser_ammo; - else - self.ammo_cells -= autocvar_g_balance_minstanex_laser_ammo; - } + W_DecreaseAmmo(ammo_cells, autocvar_g_balance_minstanex_laser_ammo, autocvar_g_balance_minstanex_reload_ammo); // ugly minstagib hack to reuse the fire mode of the laser float w; @@ -305,19 +228,19 @@ float w_minstanex(float req) precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); - precache_sound ("weapons/reload.wav"); + //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else w_laser(WR_PRECACHE); } else if (req == WR_SETUP) { weapon_setup(WEP_MINSTANEX); - W_Minstanex_SetAmmoCounter(); + self.current_ammo = ammo_cells; self.minstanex_lasthit = 0; } else if (req == WR_CHECKAMMO1) { ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_ammo; - ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_ammo); + ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_ammo; return ammo_amount; } else if (req == WR_CHECKAMMO2) @@ -325,19 +248,22 @@ float w_minstanex(float req) if(!autocvar_g_balance_minstanex_laser_ammo) return TRUE; ammo_amount = self.ammo_cells >= autocvar_g_balance_minstanex_laser_ammo; - ammo_amount += (autocvar_g_balance_minstanex_reload_ammo && self.minstanex_load >= autocvar_g_balance_minstanex_laser_ammo); + ammo_amount += self.weapon_load[WEP_MINSTANEX] >= autocvar_g_balance_minstanex_laser_ammo; return ammo_amount; } else if (req == WR_RESETPLAYER) { self.minstanex_lasthit = 0; - - // all weapons must be fully loaded when we spawn - self.minstanex_load = autocvar_g_balance_minstanex_reload_ammo; } else if (req == WR_RELOAD) { - W_Minstanex_Reload(); + float used_ammo; + if(autocvar_g_balance_minstanex_laser_ammo) + used_ammo = min(autocvar_g_balance_minstanex_ammo, autocvar_g_balance_minstanex_laser_ammo); + else + used_ammo = autocvar_g_balance_minstanex_ammo; + + W_Reload(used_ammo, autocvar_g_balance_minstanex_reload_ammo, autocvar_g_balance_minstanex_reload_time, "weapons/reload.wav"); } return TRUE; }; @@ -358,9 +284,9 @@ float w_minstanex(float req) precache_sound("weapons/neximpact.wav"); } else if (req == WR_SUICIDEMESSAGE) - w_deathtypestring = "%s did the impossible"; + w_deathtypestring = _("%s did the impossible"); else if (req == WR_KILLMESSAGE) - w_deathtypestring = "%s has been vaporized by %s"; + w_deathtypestring = _("%s has been vaporized by %s"); return TRUE; } #endif