From 3889336c72b965276e978a4d2d673324ed57ad98 Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 17 Dec 2014 11:11:32 +1100 Subject: [PATCH] Make vaporizer deal 150 damage in most configs --- bal-wep-nexuiz25.cfg | 1 + bal-wep-samual.cfg | 1 + bal-wep-xdf.cfg | 1 + bal-wep-xonotic.cfg | 1 + bal-wep-xpm.cfg | 1 + qcsrc/common/weapons/w_vaporizer.qc | 8 +++++--- vehicles.cfg | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index b2427eccd..b9e6da4c3 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -433,6 +433,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage -1 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 diff --git a/bal-wep-samual.cfg b/bal-wep-samual.cfg index 2ec59d610..985033998 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -486,6 +486,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #13: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage 150 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 diff --git a/bal-wep-xdf.cfg b/bal-wep-xdf.cfg index ef8035ea7..9f59c5e52 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -433,6 +433,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage -1 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 320ce2280..dc82b8b66 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -433,6 +433,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage 150 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg index 320ce2280..dc82b8b66 100644 --- a/bal-wep-xpm.cfg +++ b/bal-wep-xpm.cfg @@ -433,6 +433,7 @@ set g_balance_porto_weaponthrowable 1 // {{{ #12: Vaporizer set g_balance_vaporizer_primary_ammo 10 set g_balance_vaporizer_primary_animtime 0.3 +set g_balance_vaporizer_primary_damage 150 set g_balance_vaporizer_primary_refire 1 set g_balance_vaporizer_reload_ammo 0 set g_balance_vaporizer_reload_time 0 diff --git a/qcsrc/common/weapons/w_vaporizer.qc b/qcsrc/common/weapons/w_vaporizer.qc index 90ea15d5c..f55342f92 100644 --- a/qcsrc/common/weapons/w_vaporizer.qc +++ b/qcsrc/common/weapons/w_vaporizer.qc @@ -19,6 +19,7 @@ REGISTER_WEAPON( #define VAPORIZER_SETTINGS_LIST(w_cvar,w_prop,id,sn) \ w_cvar(id, sn, PRI, ammo) \ w_cvar(id, sn, PRI, animtime) \ + w_cvar(id, sn, PRI, damage) \ w_cvar(id, sn, PRI, refire) \ w_cvar(id, sn, SEC, ammo) \ w_cvar(id, sn, SEC, animtime) \ @@ -53,17 +54,18 @@ void spawnfunc_weapon_minstanex(void) { spawnfunc_weapon_vaporizer(); } void W_Vaporizer_Attack(void) { - float flying; + float flying, vaporizer_damage; flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last + vaporizer_damage = ((WEP_CVAR_PRI(vaporizer, damage) > 0) ? WEP_CVAR_PRI(vaporizer, damage) : 10000); - W_SetupShot(self, TRUE, 0, "", CH_WEAPON_A, 10000); + W_SetupShot(self, TRUE, 0, "", CH_WEAPON_A, vaporizer_damage); // handle sound separately so we can change the volume // added bonus: no longer plays the strength sound (strength gives no bonus to instakill anyway) sound (self, CH_WEAPON_A, "weapons/minstanexfire.wav", VOL_BASE * 0.8, ATTEN_NORM); yoda = 0; damage_goodhits = 0; - FireRailgunBullet(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_VAPORIZER); + FireRailgunBullet(w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, vaporizer_damage, 800, 0, 0, 0, 0, WEP_VAPORIZER); if(yoda && flying) Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_ACHIEVEMENT_YODA); diff --git a/vehicles.cfg b/vehicles.cfg index ea296146d..52ff0b367 100644 --- a/vehicles.cfg +++ b/vehicles.cfg @@ -21,6 +21,6 @@ set g_vehicles_delayspawn_jitter 10 set g_vehicles_vortex_damagerate 0.5 set g_vehicles_machinegun_damagerate 0.65 set g_vehicles_rifle_damagerate 1 -set g_vehicles_vaporizer_damagerate 0.007 +set g_vehicles_vaporizer_damagerate 0.8 set g_vehicles_tag_damagerate 2 -- 2.39.2