Switch Electro secondary refire and refire2, fix guide DPS entry

Unlike all other weapons with a refire2, Electro's secondary refire2 cvar meant the time between shots in a burst, and refire meant the time between bursts.
Switched this behavior to make it consistent with other weapons.
Fixed up the Electro guide DPS entry, added total combo DPS.
Also cleaned up W_Guide_DPS* functions again.

diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg
index 80d249d55a4aa0f5ae9d07876259c675e0517e9d..3c78f42e545b875d79b3d383ca2dc6607d07c48e 100644 (file)
--- a/bal-wep-xdf.cfg
+++ b/bal-wep-xdf.cfg
@@ -48,7 +48,7 @@ set g_balance_electro_primary_midaircombo_radius 100
 set g_balance_electro_secondary_bouncefactor 0.4
 set g_balance_electro_secondary_force 200
 set g_balance_electro_secondary_lifetime 3
-set g_balance_electro_secondary_refire 1.1
+set g_balance_electro_secondary_refire2 1.1
 set g_balance_electro_secondary_speed 900
 set g_balance_electro_secondary_touchexplode 0
 set g_balance_electro_switchdelay_drop 0

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index a84f54d808236d805d910162ec64597765c8743b..3dd6cbda3f766f40388856f993a7c8127552ef17 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -244,8 +244,8 @@ set g_balance_electro_secondary_health 5
 set g_balance_electro_secondary_lifetime 4
 set g_balance_electro_secondary_limit 0
 set g_balance_electro_secondary_radius 150
-set g_balance_electro_secondary_refire 1.2
-set g_balance_electro_secondary_refire2 0.2
+set g_balance_electro_secondary_refire 0.2
+set g_balance_electro_secondary_refire2 1.2
 set g_balance_electro_secondary_speed 1000
 set g_balance_electro_secondary_speed_up 200
 set g_balance_electro_secondary_speed_z 0

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 6f47dcf5dffa668aaa897764cf619a86c856a9ad..2dbd6d4af88870a2cb408c19e8adc9f93b889286 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -836,10 +836,10 @@ REPLICATE(cvar_cl_weaponpriorities[9], string, "cl_weaponpriority9", W_FixWeapon
 
 string W_Guide_DPS_onlyOne_unnamed(string name)
 {
-       const string dmg =      cvar_defstring(sprintf("g_balance_%s_damage", name));
-       const float  rft = stof(cvar_defstring(sprintf("g_balance_%s_refire", name)));
+       const string dmg_s =      cvar_defstring(sprintf("g_balance_%s_damage", name));
+       const float rft    = stof(cvar_defstring(sprintf("g_balance_%s_refire", name)));
        return sprintf(_("By default, it does %s damage (DPS: %.2f)."),
-               dmg, rft <= 0 ? 1337 : stof(dmg) / rft);
+               dmg_s, rft <= 0 ? 1337 : stof(dmg_s) / rft);
 }
 string W_Guide_DPS_onlyOne(string name, string fire)
 {
@@ -849,85 +849,96 @@ string W_Guide_DPS(string name, string pri, string sec)
 {
        // TODO: rename all wep primary cvars to g_balance_*_primary_*, vice versa for secondary.
        // Example exception: g_balance_arc_beam_* (primary)
-       const string pri_dmg =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       const float  pri_rft = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
-       const string sec_dmg =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       const float  sec_rft = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const string pri_dmg_s =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       const float pri_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
+       const string sec_dmg_s =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       const float sec_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
        return sprintf(_("By default, the primary does %s damage (DPS: %.2f), and the secondary does %s damage (DPS: %.2f)."),
-               pri_dmg, (pri_rft <= 0 ? 1337 : stof(pri_dmg) / pri_rft),
-               sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft));
+               pri_dmg_s, (pri_rft <= 0 ? 1337 : stof(pri_dmg_s) / pri_rft),
+               sec_dmg_s, (sec_rft <= 0 ? 1337 : stof(sec_dmg_s) / sec_rft));
 }
 string W_Guide_DPS_bothMultishot(string name, string pri, string sec)
 {
-       const string pri_dmg   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       const float pri_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
-       const string pri_shots =      cvar_defstring(sprintf("g_balance_%s_%s_shots", name, pri));
-       const string sec_dmg   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       const float sec_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
-       const string sec_shots =      cvar_defstring(sprintf("g_balance_%s_%s_shots", name, sec));
+       const string pri_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       const float pri_rft      = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
+       const string pri_shots_s =      cvar_defstring(sprintf("g_balance_%s_%s_shots", name, pri));
+       const string sec_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       const float sec_rft      = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const string sec_shots_s =      cvar_defstring(sprintf("g_balance_%s_%s_shots", name, sec));
        return sprintf(_("By default, the primary shoots %s shots doing %s damage each (DPS: %.2f), and the secondary shoots %s shots doing %s damage each (DPS: %.2f)."),
-               pri_shots, pri_dmg, (pri_rft <= 0 ? 1337 : stof(pri_dmg) / pri_rft * stof(pri_shots)),
-               sec_shots, sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft * stof(sec_shots)));
+               pri_shots_s, pri_dmg_s, (pri_rft <= 0 ? 1337 : stof(pri_dmg_s) / pri_rft * stof(pri_shots_s)),
+               sec_shots_s, sec_dmg_s, (sec_rft <= 0 ? 1337 : stof(sec_dmg_s) / sec_rft * stof(sec_shots_s)));
 }
 string W_Guide_DPS_secondaryMultishot(string name, string pri, string sec, string shots, string refire2)
 {
-       const string pri_dmg   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       const float pri_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
-       string sec_dmg         =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       if (sec_dmg == "")
-               sec_dmg = pri_dmg;
-       float sec_rft          = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
-       const string sec_shots =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
-       const float num_shots = stof(sec_shots);
+       const string pri_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       const float pri_rft      = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
+       string sec_dmg_s         =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       float sec_rft            = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const string sec_shots_s =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
+       if (sec_dmg_s == "")
+               sec_dmg_s = pri_dmg_s;
+       const float num_shots = stof(sec_shots_s);
        if (refire2 != "")
                sec_rft = (num_shots - 1) * sec_rft + stof(cvar_defstring(sprintf("g_balance_%s_%s", name, refire2)));
        return sprintf(_("By default, the primary does %s damage (DPS: %.2f), and the secondary shoots %s shots doing %s damage each (DPS: %.2f)."),
-                          pri_dmg, (pri_rft <= 0 ? 1337 : stof(pri_dmg) / pri_rft),
-               sec_shots, sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft * num_shots));
+                            pri_dmg_s, (pri_rft <= 0 ? 1337 : stof(pri_dmg_s) / pri_rft),
+               sec_shots_s, sec_dmg_s, (sec_rft <= 0 ? 1337 : stof(sec_dmg_s) / sec_rft * num_shots));
 }
 string W_Guide_DPS_primaryMultishot(string name, string pri, string sec, string shots, string refire2)
 {
-       const string pri_dmg   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       float pri_rft          = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
-       const string pri_shots =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
-       const string sec_dmg   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       const float sec_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
-       const float num_shots = stof(pri_shots);
+       const string pri_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       float pri_rft            = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
+       const string pri_shots_s =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
+       const string sec_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       const float sec_rft      = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const float num_shots = stof(pri_shots_s);
        if (refire2 != "")
                pri_rft = (num_shots - 1) * pri_rft + stof(cvar_defstring(sprintf("g_balance_%s_%s", name, refire2)));
        return sprintf(_("By default, the primary shoots %s shots doing %s damage each (DPS: %.2f), and the secondary does %s damage (DPS: %.2f)."),
-               pri_shots, pri_dmg, (pri_rft <= 0 ? 1337 : stof(pri_dmg) / pri_rft * num_shots),
-                          sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft));
+               pri_shots_s, pri_dmg_s, (pri_rft <= 0 ? 1337 : stof(pri_dmg_s) / pri_rft * num_shots),
+                            sec_dmg_s, (sec_rft <= 0 ? 1337 : stof(sec_dmg_s) / sec_rft));
 }
 string W_Guide_DPS_onlyOneMultishot(string name, string fire, string shots, string refire2)
 {
-       const string dmg     =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, fire));
+       const string dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, fire));
        float rft            = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, fire)));
        const string shots_s =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
        const float num_shots = stof(shots_s);
        if (refire2 != "")
                rft = (num_shots - 1) * rft + stof(cvar_defstring(sprintf("g_balance_%s_%s", name, refire2)));
        return sprintf(_("By default, it shoots %s shots doing %s damage each (DPS: %.2f)."),
-               shots_s, dmg, (rft <= 0 ? 1337 : stof(dmg) / rft * num_shots));
-}
-string W_Guide_DPS_withCombo(string name, string pri, string sec)
-{
-       const string pri_dmg =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       const float  pri_rft = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
-       const string sec_dmg =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       const float  sec_rft = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
-       const string cmb_dmg =      cvar_defstring(sprintf("g_balance_%s_combo_damage", name));
-       return sprintf(_("By default, the primary does %s damage (DPS: %.2f), the secondary does %s damage (DPS: %.2f), and the combo adds an extra %s damage."),
-               pri_dmg, (pri_rft <= 0 ? 1337 : stof(pri_dmg) / pri_rft),
-               sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft),
-               cmb_dmg);
+               shots_s, dmg_s, (rft <= 0 ? 1337 : stof(dmg_s) / rft * num_shots));
+}
+string W_Guide_DPS_secondaryMultishotWithCombo(string name, string pri, string sec, string shots, string refire2)
+{
+       const string pri_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       const float  pri_rft     = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, pri)));
+       const string sec_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       float sec_rft            = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const string sec_shots_s =      cvar_defstring(sprintf("g_balance_%s_%s", name, shots));
+       const string cmb_dmg_s   =      cvar_defstring(sprintf("g_balance_%s_combo_damage", name));
+       const float num_shots = stof(sec_shots_s);
+       float combo_t = max(pri_rft, sec_rft);
+       if (refire2 != "")
+       {
+               const float sec_rft2 = stof(cvar_defstring(sprintf("g_balance_%s_%s", name, refire2)));
+               combo_t = max(combo_t, num_shots * sec_rft + sec_rft2);
+               sec_rft = (num_shots - 1) * sec_rft + sec_rft2;
+       }
+       const float pri_dmg = stof(pri_dmg_s);
+       const float sec_dmg = stof(sec_dmg_s);
+       return sprintf(_("By default, the primary does %s damage (DPS: %.2f), the secondary can shoot %s shots doing %s damage each (DPS: %.2f), and the combo adds an extra %s damage (total DPS: %.2f)."),
+                            pri_dmg_s, (pri_rft <= 0 ? 1337 : pri_dmg / pri_rft),
+               sec_shots_s, sec_dmg_s, (sec_rft <= 0 ? 1337 : sec_dmg / sec_rft * num_shots),
+                            cmb_dmg_s, (combo_t <= 0 ? 1337 : (pri_dmg + sec_dmg * num_shots + stof(cmb_dmg_s)) / combo_t));
 }
 string W_Guide_DPS_primaryDPS(string name, string pri, string sec)
 {
-       const string pri_dps =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
-       const string sec_dmg =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
-       const float  sec_rft = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
+       const string pri_dps_s =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, pri));
+       const string sec_dmg_s =      cvar_defstring(sprintf("g_balance_%s_%s_damage", name, sec));
+       const float sec_rft    = stof(cvar_defstring(sprintf("g_balance_%s_%s_refire", name, sec)));
        return sprintf(_("By default, the primary does %s damage per second, and the secondary does %s damage (DPS: %.2f)."),
-               pri_dps, sec_dmg, (sec_rft <= 0 ? 1337 : stof(sec_dmg) / sec_rft));
+               pri_dps_s, sec_dmg_s, (sec_rft <= 0 ? 1337 : stof(sec_dmg_s) / sec_rft));
 }
 #endif

diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh
index 37188d0a76eecb77378818b7aa7065ac5bef72d1..67922a95cbbe7d671656e28cc1e08d5910b4755e 100644 (file)
--- a/qcsrc/common/weapons/all.qh
+++ b/qcsrc/common/weapons/all.qh
@@ -462,6 +462,6 @@ string W_Guide_DPS_bothMultishot(string name, string pri, string sec);
 string W_Guide_DPS_secondaryMultishot(string name, string pri, string sec, string shots, string refire2);
 string W_Guide_DPS_primaryMultishot(string name, string pri, string sec, string shots, string refire2);
 string W_Guide_DPS_onlyOneMultishot(string name, string fire, string shots, string refire2);
-string W_Guide_DPS_withCombo(string name, string pri, string sec);
+string W_Guide_DPS_secondaryMultishotWithCombo(string name, string pri, string sec, string shots, string refire2);
 string W_Guide_DPS_primaryDPS(string name, string pri, string sec);
 #endif

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index 4beeda4331fab12af6c40ad23115096247281980..6e55c33be88a519c09e187162040d010b079c991 100644 (file)
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -673,7 +673,7 @@ METHOD(Electro, wr_think, void(entity thiswep, entity actor, .entity weaponentit
 
        if(fire & 1)
        {
-               if(time >= actor.(weaponentity).electro_secondarytime + WEP_CVAR_SEC(WEP_ELECTRO, refire2) * W_WeaponRateFactor(actor))
+               if(time >= actor.(weaponentity).electro_secondarytime + WEP_CVAR_SEC(WEP_ELECTRO, refire) * W_WeaponRateFactor(actor))
                if(weapon_prepareattack(thiswep, actor, weaponentity, false, WEP_CVAR_PRI(WEP_ELECTRO, refire)))
                {
                        W_Electro_Attack_Bolt(thiswep, actor, weaponentity);
@@ -682,7 +682,7 @@ METHOD(Electro, wr_think, void(entity thiswep, entity actor, .entity weaponentit
        }
        else if(fire & 2)
        {
-               if(time >= actor.(weaponentity).electro_secondarytime + WEP_CVAR_SEC(WEP_ELECTRO, refire) * W_WeaponRateFactor(actor))
+               if(time >= actor.(weaponentity).electro_secondarytime + WEP_CVAR_SEC(WEP_ELECTRO, refire2) * W_WeaponRateFactor(actor))
                if(weapon_prepareattack(thiswep, actor, weaponentity, true, -1))
                {
                        W_Electro_Attack_Orb(thiswep, actor, weaponentity);
@@ -790,7 +790,7 @@ METHOD(Electro, describe, string(Electro this))
                "The %s is one of the best spam weapons to use in crowded areas, since combos can deal tons of damage, if the enemy is close enough. "
                "Since the primary fire doesn't travel particularly fast, the %s is not useful in many other situations.\n\n%s"),
        COLORED_NAME(this), COLORED_NAME(MAPINFO_TYPE_CTF), COLORED_NAME(ITEM_Cells), COLORED_NAME(this), COLORED_NAME(this),
-       W_Guide_DPS_withCombo(this.netname, "primary", "secondary")); // TODO FIXME
+       W_Guide_DPS_secondaryMultishotWithCombo(this.netname, "primary", "secondary", "secondary_count", "secondary_refire2"));
 }
 
 #endif