From: Mario Date: Mon, 2 Apr 2018 09:32:11 +0000 (+1000) Subject: Unhardcode vaporizer primary force and fix monsters targeting players after the match... X-Git-Tag: xonotic-v0.8.5~2208 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5bbb901475aa3190206bcbbc9774ca4b95b6f5a;p=xonotic%2Fxonotic-data.pk3dir.git Unhardcode vaporizer primary force and fix monsters targeting players after the match ends --- diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 57d5d745d..4c0eebfae 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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-nexuiz25.cfg b/bal-wep-nexuiz25.cfg index f7d912ca7..f10275919 100644 --- a/bal-wep-nexuiz25.cfg +++ b/bal-wep-nexuiz25.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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-overkill.cfg b/bal-wep-overkill.cfg index 9cfffed10..317c8a9f8 100644 --- a/bal-wep-overkill.cfg +++ b/bal-wep-overkill.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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 b3ec457a8..295756779 100644 --- a/bal-wep-samual.cfg +++ b/bal-wep-samual.cfg @@ -502,6 +502,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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 cc8936c33..fc9a1ddf8 100644 --- a/bal-wep-xdf.cfg +++ b/bal-wep-xdf.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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 6d81b309f..9048f383d 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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 ac5be34f3..2a391a202 100644 --- a/bal-wep-xpm.cfg +++ b/bal-wep-xpm.cfg @@ -436,6 +436,7 @@ set g_balance_porto_weaponthrowable 1 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_force 800 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/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc index 1197c2613..bf019b9cf 100644 --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@ -82,6 +82,7 @@ bool Monster_ValidTarget(entity this, entity targ) || (IS_VEHICLE(targ) && !((Monsters_from(this.monsterid)).spawnflags & MON_FLAG_RANGED)) // melee vs vehicle is useless || (time < game_starttime) // monsters do nothing before match has started || (targ.takedamage == DAMAGE_NO) + || (game_stopped) || (targ.items & IT_INVISIBILITY) || (IS_SPEC(targ) || IS_OBSERVER(targ)) // don't attack spectators || (!IS_VEHICLE(targ) && (IS_DEAD(targ) || IS_DEAD(this) || targ.health <= 0 || this.health <= 0)) diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc index 06562f68a..e46745c2a 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qc +++ b/qcsrc/common/weapons/weapon/vaporizer.qc @@ -125,7 +125,7 @@ void W_Vaporizer_Attack(Weapon thiswep, entity actor, .entity weaponentity) yoda = 0; damage_goodhits = 0; - FireRailgunBullet(actor, weaponentity, w_shotorg, w_shotorg + w_shotdir * max_shot_distance, vaporizer_damage, 800, 0, 0, 0, 0, WEP_VAPORIZER.m_id); + FireRailgunBullet(actor, weaponentity, w_shotorg, w_shotorg + w_shotdir * max_shot_distance, vaporizer_damage, WEP_CVAR_PRI(vaporizer, force), 0, 0, 0, 0, WEP_VAPORIZER.m_id); // do this now, as goodhits is disabled below SendCSQCVaporizerBeamParticle(actor, damage_goodhits); diff --git a/qcsrc/common/weapons/weapon/vaporizer.qh b/qcsrc/common/weapons/weapon/vaporizer.qh index ea9f8dd2b..9bbc5e9bd 100644 --- a/qcsrc/common/weapons/weapon/vaporizer.qh +++ b/qcsrc/common/weapons/weapon/vaporizer.qh @@ -22,7 +22,8 @@ CLASS(Vaporizer, Weapon) BEGIN(class) \ P(class, prefix, ammo, float, PRI) \ P(class, prefix, animtime, float, PRI) \ - P(class, prefix, damage, float, PRI) \ + P(class, prefix, damage, float, PRI) \ + P(class, prefix, force, float, PRI) \ P(class, prefix, refire, float, PRI) \ P(class, prefix, ammo, float, SEC) \ P(class, prefix, animtime, float, SEC) \