]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/w_hagar.qc
If no loading speed is set, fill in all the rockets at once. Might be a better and...
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_hagar.qc
index cbc146915c122e05180851ec3f383afc0f2595be..2aeba812d201ef7c3bca19dc5d758aa5de316894 100644 (file)
@@ -1,61 +1,9 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hagar", "hagar", _("Hagar"))
+REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hagar", "hagar", _("Hagar"))
 #else
 #ifdef SVQC
 // NO bounce protection, as bounces are limited!
 
-void W_Hagar_SetAmmoCounter()
-{
-       // set clip_load to the weapon we have switched to, if the gun uses reloading
-       if(!autocvar_g_balance_hagar_reload_ammo)
-               self.clip_load = 0; // also keeps crosshair ammo from displaying
-       else
-       {
-               self.clip_load = self.hagar_load;
-               self.clip_size = autocvar_g_balance_hagar_reload_ammo; // for the crosshair ammo display
-       }
-}
-
-void W_Hagar_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_hagar_reload_ammo && self.ammo_rockets) // make sure we don't add more ammo than we have
-       {
-               self.clip_load += 1;
-               self.ammo_rockets -= 1;
-       }
-       self.hagar_load = self.clip_load;
-
-       t = ATTACK_FINISHED(self) - autocvar_g_balance_hagar_reload_time - 1;
-       ATTACK_FINISHED(self) = t;
-       w_ready();
-}
-
-void W_Hagar_Reload()
-{
-       // return if reloading is disabled for this weapon
-       if(!autocvar_g_balance_hagar_reload_ammo)
-               return;
-
-       if(!W_ReloadCheck(self.ammo_rockets, min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)))
-               return;
-
-       float t;
-
-       sound (self, CHAN_WEAPON2, "weapons/reload.wav", VOL_BASE, ATTN_NORM);
-
-       t = max(time, ATTACK_FINISHED(self)) + autocvar_g_balance_hagar_reload_time + 1;
-       ATTACK_FINISHED(self) = t;
-
-       weapon_thinkf(WFRAME_RELOAD, autocvar_g_balance_hagar_reload_time, W_Hagar_ReloadedAndReady);
-
-       self.old_clip_load = self.clip_load;
-       self.clip_load = -1;
-}
-
 void W_Hagar_Explode (void)
 {
        self.event_damage = SUB_Null;
@@ -97,17 +45,7 @@ void W_Hagar_Attack (void)
 {
        local entity missile;
 
-       // 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_hagar_reload_ammo)
-               {
-                       self.clip_load -= autocvar_g_balance_hagar_primary_ammo;
-                       self.hagar_load = self.clip_load;
-               }
-               else
-                       self.ammo_rockets -= autocvar_g_balance_hagar_primary_ammo;
-       }
+       W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
        W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_primary_damage);
 
@@ -142,17 +80,7 @@ void W_Hagar_Attack2 (void)
 {
        local entity missile;
 
-       // 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_hagar_reload_ammo)
-               {
-                       self.clip_load -= autocvar_g_balance_hagar_secondary_ammo;
-                       self.hagar_load = self.clip_load;
-               }
-               else
-                       self.ammo_rockets -= autocvar_g_balance_hagar_secondary_ammo;
-       }
+       W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo, autocvar_g_balance_hagar_reload_ammo);
 
        W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_secondary_damage);
 
@@ -184,6 +112,110 @@ void W_Hagar_Attack2 (void)
        other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
+.float hagar_loadtime;
+void W_Hagar_Attack2_Load (void)
+{
+       if not(weapon_action(self.weapon, WR_CHECKAMMO2))
+       {
+               W_SwitchToOtherWeapon(self);
+               return;
+       }
+
+       local entity missile;
+       local float counter, shots, loaded;
+       local float used_ammo, enough_ammo;
+       local vector s;
+       vector forward, right, up;
+
+       loaded = self.hagar_load >= autocvar_g_balance_hagar_secondary_load_max;
+
+       // check if we have enough ammo for another rocket
+       used_ammo = autocvar_g_balance_hagar_secondary_ammo;
+       if(autocvar_g_balance_hagar_reload_ammo)
+               enough_ammo = self.weapon_load[WEP_HAGAR] >= used_ammo + (used_ammo * self.hagar_load);
+       else
+               enough_ammo = self.ammo_rockets >= used_ammo + (used_ammo * self.hagar_load);
+
+       if(self.BUTTON_ATCK2 && !loaded && enough_ammo)
+       {
+               // we can attempt to load another rocket
+               if(self.hagar_loadtime < time)
+               {
+                       // if there's no loading speed, fill in the rockets
+                       if(autocvar_g_balance_hagar_secondary_load_speed)
+                       {
+                               self.hagar_load += 1;
+                               sound(self, CHAN_WEAPON2, "weapons/hagar_load.wav", VOL_BASE, ATTN_NORM);
+                       }
+                       else
+                               self.hagar_load = autocvar_g_balance_hagar_secondary_load_max;
+
+                       self.hagar_loadtime = time + autocvar_g_balance_hagar_secondary_load_speed;
+               }
+       }
+
+       if(self.hagar_load && (!self.BUTTON_ATCK2 || ((loaded || !enough_ammo) && !autocvar_g_balance_hagar_secondary_load_hold)))
+       if(weapon_prepareattack(0, autocvar_g_balance_hagar_secondary_refire))
+       {
+               // time to release the rockets we've loaded
+
+               W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_hagar_secondary_ammo * self.hagar_load, autocvar_g_balance_hagar_reload_ammo);
+
+               W_SetupShot (self, FALSE, 2, "weapons/hagar_fire.wav", CHAN_WEAPON, autocvar_g_balance_hagar_secondary_damage);
+               pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
+
+               forward = v_forward;
+               right = v_right;
+               up = v_up;
+
+               shots = self.hagar_load;
+               missile = world;
+               while (counter < shots)
+               {
+                       missile = spawn ();
+                       missile.owner = missile.realowner = self;
+                       missile.classname = "missile";
+                       missile.bot_dodge = TRUE;
+                       missile.bot_dodgerating = autocvar_g_balance_hagar_secondary_damage;
+
+                       missile.touch = W_Hagar_Touch; // not bouncy
+                       missile.use = W_Hagar_Explode2;
+                       missile.think = adaptor_think2use_hittype_splash;
+                       missile.nextthink = time + autocvar_g_balance_hagar_secondary_lifetime_min + random() * autocvar_g_balance_hagar_secondary_lifetime_rand;
+                       PROJECTILE_MAKETRIGGER(missile);
+                       missile.projectiledeathtype = WEP_HAGAR;
+                       setorigin (missile, w_shotorg);
+                       setsize(missile, '0 0 0', '0 0 0');
+                       missile.movetype = MOVETYPE_FLY;
+
+                       s = '0 0 0';
+                       if (counter == 0)
+                               s = '0 0 0';
+                       else
+                       {
+                               makevectors('0 360 0' * (0.75 + (counter - 0.5) / (shots - 1)));
+                               s_y = v_forward_x;
+                               s_z = v_forward_y;
+                       }
+                       s = s * cvar("g_balance_hagar_secondary_spread") * g_weaponspreadfactor;
+                       W_SetupProjectileVelocityEx(missile, w_shotdir + right * s_y + up * s_z, v_up, cvar("g_balance_hagar_secondary_speed"), 0, 0, 0, FALSE);
+
+                       missile.angles = vectoangles (missile.velocity);
+                       missile.flags = FL_PROJECTILE;
+
+                       CSQCProjectile(missile, TRUE, PROJECTILE_HAGAR, TRUE);
+
+                       other = missile; MUTATOR_CALLHOOK(EditProjectile);
+
+                       counter = counter + 1;
+               }
+
+               weapon_thinkf(WFRAME_FIRE2, autocvar_g_balance_hagar_secondary_refire, w_ready);
+               self.hagar_loadtime = time + autocvar_g_balance_hagar_secondary_refire;
+               self.hagar_load = 0;
+       }
+}
+
 void spawnfunc_weapon_hagar (void)
 {
        weapon_defaultspawnfunc(WEP_HAGAR);
@@ -203,8 +235,8 @@ float w_hagar(float req)
        else if (req == WR_THINK)
        {
                if(autocvar_g_balance_hagar_reload_ammo && self.clip_load < min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo)) // forced reload
-                       W_Hagar_Reload();
-               else if (self.BUTTON_ATCK)
+                       weapon_action(self.weapon, WR_RELOAD);
+               else if (self.BUTTON_ATCK && !self.hagar_load) // not while loading the secondary fire
                {
                        if (weapon_prepareattack(0, autocvar_g_balance_hagar_primary_refire))
                        {
@@ -212,6 +244,8 @@ float w_hagar(float req)
                                weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_hagar_primary_refire, w_ready);
                        }
                }
+               else if(autocvar_g_balance_hagar_secondary_load && autocvar_g_balance_hagar_secondary)
+                       W_Hagar_Attack2_Load(); // must run each frame
                else if (self.BUTTON_ATCK2 && autocvar_g_balance_hagar_secondary)
                {
                        if (weapon_prepareattack(1, autocvar_g_balance_hagar_secondary_refire))
@@ -227,33 +261,31 @@ float w_hagar(float req)
                precache_model ("models/weapons/v_hagar.md3");
                precache_model ("models/weapons/h_hagar.iqm");
                precache_sound ("weapons/hagar_fire.wav");
-               precache_sound ("weapons/reload.wav");
+               precache_sound ("weapons/hagar_load.wav");
+               //precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound somewhere else
        }
        else if (req == WR_SETUP)
        {
                weapon_setup(WEP_HAGAR);
-               W_Hagar_SetAmmoCounter();
+               self.current_ammo = ammo_rockets;
+
+               self.hagar_load = 0;
        }
        else if (req == WR_CHECKAMMO1)
        {
                ammo_amount = self.ammo_rockets >= autocvar_g_balance_hagar_primary_ammo;
-               ammo_amount += (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= autocvar_g_balance_hagar_primary_ammo);
+               ammo_amount += self.weapon_load[WEP_HAGAR] >= autocvar_g_balance_hagar_primary_ammo;
                return ammo_amount;
        }
        else if (req == WR_CHECKAMMO2)
        {
                ammo_amount = self.ammo_rockets >= autocvar_g_balance_hagar_secondary_ammo;
-               ammo_amount += (autocvar_g_balance_hagar_reload_ammo && self.hagar_load >= autocvar_g_balance_hagar_secondary_ammo);
+               ammo_amount += self.weapon_load[WEP_HAGAR] >= autocvar_g_balance_hagar_secondary_ammo;
                return ammo_amount;
        }
-       else if (req == WR_RESETPLAYER)
-       {
-               // all weapons must be fully loaded when we spawn
-               self.hagar_load = autocvar_g_balance_hagar_reload_ammo;
-       }
        else if (req == WR_RELOAD)
        {
-               W_Hagar_Reload();
+               W_Reload(min(autocvar_g_balance_hagar_primary_ammo, autocvar_g_balance_hagar_secondary_ammo), autocvar_g_balance_hagar_reload_ammo, autocvar_g_balance_hagar_reload_time, "weapons/reload.wav");
        }
        return TRUE;
 };
@@ -283,13 +315,13 @@ float w_hagar(float req)
                precache_sound("weapons/hagexp3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "%s played with tiny rockets";
+               w_deathtypestring = _("%s played with tiny rockets");
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-                       w_deathtypestring = "%s hoped %s's missiles wouldn't bounce";
+                       w_deathtypestring = _("%s hoped %s's missiles wouldn't bounce");
                else // unchecked: SPLASH, SECONDARY
-                       w_deathtypestring = "%s was pummeled by %s";
+                       w_deathtypestring = _("%s was pummeled by %s");
        }
        return TRUE;
 }