From: Mario <zacjardine@y7mail.com>
Date: Thu, 18 Dec 2014 10:55:45 +0000 (+1100)
Subject: Apply a difference force modifier on vaporizer secondary
X-Git-Tag: xonotic-v0.8.0~63
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=582e0a753f7980e9d0c4b4d92b811e0a98129e74;p=xonotic%2Fxonotic-data.pk3dir.git

Apply a difference force modifier on vaporizer secondary
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index b5e155998..96c7c9e10 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -595,12 +595,18 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp
 	if(self.nade_type == NADE_TYPE_TRANSLOCATE || self.nade_type == NADE_TYPE_SPAWN)
 		return;
 
-	if(DEATH_ISWEAPON(deathtype, WEP_BLASTER) || (DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) && (deathtype & HITTYPE_SECONDARY)))
+	if(DEATH_ISWEAPON(deathtype, WEP_BLASTER))
 	{
 		force *= 1.5;
 		damage = 0;
 	}
 
+	if(DEATH_ISWEAPON(deathtype, WEP_VAPORIZER) && (deathtype & HITTYPE_SECONDARY))
+	{
+		force *= 0.85; // too much
+		frag_damage = 0;
+	}
+
 	if(DEATH_ISWEAPON(deathtype, WEP_VORTEX) || DEATH_ISWEAPON(deathtype, WEP_VAPORIZER))
 	{
 		force *= 6;