From 5abbd88954d1eb569822e13e597f537ea2fc1b57 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 15 Jan 2020 00:23:10 +1000 Subject: [PATCH] Rename g_balance_electro_combo_damagerate to g_balance_electro_combo_damage_interval --- bal-wep-mario.cfg | 2 +- bal-wep-nexuiz25.cfg | 2 +- bal-wep-samual.cfg | 2 +- bal-wep-testing.cfg | 2 +- bal-wep-xdf.cfg | 2 +- bal-wep-xonotic.cfg | 2 +- qcsrc/common/weapons/weapon/electro.qc | 6 +++--- qcsrc/common/weapons/weapon/electro.qh | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 1ee9dbee8..2e3dd2a6b 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 300 set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 1.5 set g_balance_electro_combo_edgedamage 45 set g_balance_electro_combo_force -100 diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index c3580487d..f965f5d4a 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 0 set g_balance_electro_combo_comboradius_thruwall 0 set g_balance_electro_combo_damage 80 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 0 set g_balance_electro_combo_edgedamage 0 set g_balance_electro_combo_force 200 diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg index 413e1a75f..d085176bd 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 300 set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 0 set g_balance_electro_combo_edgedamage 25 set g_balance_electro_combo_force 120 diff --git a/bal-wep-testing.cfg b/bal-wep-testing.cfg index 22f8a7b9c..f3f8e3490 100644 --- a/bal-wep-testing.cfg +++ b/bal-wep-testing.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 300 set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 0 set g_balance_electro_combo_edgedamage 25 set g_balance_electro_combo_force 120 diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg index 13e2683d5..cae63efb1 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 275 set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 0 set g_balance_electro_combo_edgedamage 25 set g_balance_electro_combo_force 120 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index c8948f20c..bbd117d85 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -179,7 +179,7 @@ set g_balance_minelayer_weaponthrowable 1 set g_balance_electro_combo_comboradius 300 set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 -set g_balance_electro_combo_damagerate 0.05 +set g_balance_electro_combo_damage_interval 0.05 set g_balance_electro_combo_duration 0 set g_balance_electro_combo_edgedamage 25 set g_balance_electro_combo_force 120 diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index dfba8f62b..98c67f3eb 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -51,7 +51,7 @@ void W_Electro_TriggerCombo(vector org, float rad, entity own) void W_Electro_ExplodeComboThink(entity this) { - float dt = time - this.teleport_time + this.dmg_rate; + float dt = time - this.teleport_time + this.dmg_interval; float dmg_remaining_next = (bound(0, 1 - dt / this.dmg_duration, 1) ** this.dmg_power); float f = this.dmg_last - dmg_remaining_next; @@ -61,7 +61,7 @@ void W_Electro_ExplodeComboThink(entity this) this.projectiledeathtype |= HITTYPE_BOUNCE; // ensure it doesn't spam its effect if(dt < this.dmg_duration) - this.nextthink = time + this.dmg_rate; // soon + this.nextthink = time + this.dmg_interval; // soon else delete(this); } @@ -87,7 +87,7 @@ void W_Electro_ExplodeCombo(entity this) this.dmg_force = WEP_CVAR(electro, combo_force); this.dmg_power = WEP_CVAR(electro, combo_power); this.dmg_duration = WEP_CVAR(electro, combo_duration); - this.dmg_rate = WEP_CVAR(electro, combo_damagerate); + this.dmg_interval = WEP_CVAR(electro, combo_damage_interval); this.teleport_time = time; this.dmg_last = 1; set_movetype(this, MOVETYPE_NONE); diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index febb6e322..8a7140442 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -27,7 +27,7 @@ CLASS(Electro, Weapon) P(class, prefix, combo_comboradius, float, NONE) \ P(class, prefix, combo_comboradius_thruwall, float, NONE) \ P(class, prefix, combo_damage, float, NONE) \ - P(class, prefix, combo_damagerate, float, NONE) \ + P(class, prefix, combo_damage_interval, float, NONE) \ P(class, prefix, combo_duration, float, NONE) \ P(class, prefix, combo_edgedamage, float, NONE) \ P(class, prefix, combo_force, float, NONE) \ @@ -80,7 +80,7 @@ SPAWNFUNC_WEAPON(weapon_electro, WEP_ELECTRO) .float dmg_power; .float dmg_duration; .float dmg_last; -.float dmg_rate; +.float dmg_interval; .float electro_count; .float electro_secondarytime; -- 2.39.2