Make vaporizer deal 150 damage in most configs

diff --git a/bal-wep-nexuiz25.cfg b/bal-wep-nexuiz25.cfg
index b2427eccd0b2a49da811f920e8cbc5f94d5dfd66..b9e6da4c3f8c0ab4376f8cf40be17458e16e262d 100644 (file)
--- 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 2ec59d610cd558505e0c12598776a5336a36be2b..98503399863a97d843873a9179f8fad09bff6c5e 100644 (file)
--- 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 ef8035ea72180434c1d70e7848b97ace27d8bd9d..9f59c5e52a002fc10835213366087ae5ce4b06d7 100644 (file)
--- 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 320ce228047aa2d2b1838dccc9ec7b4c70f730ba..dc82b8b662282ca60703087f913ad95f91f777db 100644 (file)
--- 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 320ce228047aa2d2b1838dccc9ec7b4c70f730ba..dc82b8b662282ca60703087f913ad95f91f777db 100644 (file)
--- 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 90ea15d5c473dc88c4bda842d46f5114e0c816a5..f55342f923e1151a548960a8a33648774eb5c8a7 100644 (file)
--- 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 ea296146dbecbdaccbe2972f393961d3f14b6ec3..52ff0b367cf88458a99142e9c775879cc99e21bf 100644 (file)
--- 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