Begin implementation of loadable hagar secondary. What this will do: When enabled...

Current code just causes hagar secondary to fire rockats in the same pattern as the crylink, which is just the first step.

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index 55dde194b70e3fbf88d8ff2ea3621570dceb0ddc..180a535154a952d6af1e68cbbbff0a94e29c94eb 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -538,6 +538,8 @@ set g_balance_hagar_primary_lifetime 5
 set g_balance_hagar_primary_refire 0.12
 set g_balance_hagar_primary_ammo 1
 set g_balance_hagar_secondary 1
+set g_balance_hagar_secondary_load 1
+set g_balance_hagar_secondary_load_spread 0.05
 set g_balance_hagar_secondary_damage 14
 set g_balance_hagar_secondary_edgedamage 6
 set g_balance_hagar_secondary_force 70

diff --git a/qcsrc/server/autocvars.qh b/qcsrc/server/autocvars.qh
index d5652b775e4620b3831c96b0ae44d16ba1f737b8..d1ce8b433adaad40cd0e144a3ff48b961c5aea60 100644 (file)
--- a/qcsrc/server/autocvars.qh
+++ b/qcsrc/server/autocvars.qh
@@ -316,6 +316,8 @@ float autocvar_g_balance_hagar_primary_radius;
 float autocvar_g_balance_hagar_primary_refire;
 float autocvar_g_balance_hagar_primary_speed;
 float autocvar_g_balance_hagar_secondary;
+float autocvar_g_balance_hagar_secondary_load;
+float autocvar_g_balance_hagar_secondary_load_spread;
 float autocvar_g_balance_hagar_secondary_ammo;
 float autocvar_g_balance_hagar_secondary_damage;
 float autocvar_g_balance_hagar_secondary_edgedamage;

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index df0d96679890f3b824cfda07b5dbc5384f2f9ce2..4643fa6803df2aa87565256fed2fbda7e6591103 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -4,6 +4,9 @@ REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_RELOAD
 #ifdef SVQC
 // NO bounce protection, as bounces are limited!
 
+.entity queuenext;
+.entity queueprev;
+
 void W_Hagar_Explode (void)
 {
        self.event_damage = SUB_Null;
@@ -112,6 +115,92 @@ void W_Hagar_Attack2 (void)
        other = missile; MUTATOR_CALLHOOK(EditProjectile);
 }
 
+.float temp_limit;
+
+void W_Hagar_Attack2_Load (void)
+{
+       if not(self.BUTTON_ATCK2 && autocvar_g_balance_hagar_secondary)
+               return;
+       if(self.temp_limit > time)
+               return;
+       self.temp_limit = time + 0.5;
+
+       local entity missile, prevmissile, firstmissile;
+       local float counter, shots;
+       local vector s;
+       vector forward, right, up;
+
+       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 = autocvar_g_balance_crylink_primary_shots;
+       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;
+               if(shots == 1) {
+                       missile.queuenext = missile;
+                       missile.queueprev = missile;
+               }
+               else if(counter == 0) { // first projectile, store in firstmissile for now
+                       firstmissile = missile;
+               }
+               else if(counter == shots - 1) { // last projectile, link up with first projectile
+                       prevmissile.queuenext = missile;
+                       firstmissile.queueprev = missile;
+                       missile.queuenext = firstmissile;
+                       missile.queueprev = prevmissile;
+               }
+               else { // else link up with previous projectile
+                       prevmissile.queuenext = missile;
+                       missile.queueprev = prevmissile;
+               }
+
+               prevmissile = missile;
+
+               missile.touch = W_Hagar_Touch;
+               missile.use = W_Hagar_Explode;
+               missile.think = adaptor_think2use_hittype_splash;
+               //missile.nextthink = time + autocvar_g_balance_hagar_secondary_lifetime;
+               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 * autocvar_g_balance_hagar_secondary_load_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;
+       }
+}
+
 void spawnfunc_weapon_hagar (void)
 {
        weapon_defaultspawnfunc(WEP_HAGAR);
@@ -140,6 +229,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)
+                       W_Hagar_Attack2_Load();
                else if (self.BUTTON_ATCK2 && autocvar_g_balance_hagar_secondary)
                {
                        if (weapon_prepareattack(1, autocvar_g_balance_hagar_secondary_refire))