Merge remote branch 'refs/remotes/origin/divVerent/mapinfo-cleanup'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / w_shotgun.qc

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 6528f22f3c1ce052d0b8519bd3e6ddaf8cda3f39..b186230ecf5b5f36b7b506717edf3f1d31a4840a 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -61,6 +61,7 @@ void shotgun_meleethink (void)
        f = (self.cnt + cvar("g_balance_shotgun_secondary_melee_time") - time) / cvar("g_balance_shotgun_secondary_melee_time") * 2 - 1;
        vector targpos;
        targpos = self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_shotgun_secondary_melee_range") + v_right * f * cvar("g_balance_shotgun_secondary_melee_swing") + v_up * f * cvar("g_balance_shotgun_secondary_melee_swing");
+
        WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, targpos, FALSE, self.owner, ANTILAG_LATENCY(self.owner));
 
        // apply the damage, also remove self
@@ -69,6 +70,7 @@ void shotgun_meleethink (void)
                vector force;
                force = angle * cvar("g_balance_shotgun_secondary_force");
                Damage (trace_ent, self.owner, self.owner, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
+               Damage_RecordDamage(self.owner, WEP_SHOTGUN | HITTYPE_SECONDARY, cvar("g_balance_shotgun_secondary_damage") * ((f + 1) / 2));
                remove(self);
        }
        else if(time >= self.cnt + cvar("g_balance_shotgun_secondary_melee_time")) // missed, remove ent
@@ -87,6 +89,7 @@ void W_Shotgun_Attack2 (void)
        meleetemp.owner = self;
        meleetemp.think = shotgun_meleethink;
        meleetemp.nextthink = time + cvar("g_balance_shotgun_secondary_melee_delay");
+       W_SetupShot_Range(self, TRUE, 0, "", cvar("g_balance_shotgun_secondary_damage"), cvar("g_balance_shotgun_secondary_melee_range"));
 }
 
 void spawnfunc_weapon_shotgun(); // defined in t_items.qc
@@ -162,7 +165,10 @@ float w_shotgun(float req)
                w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "%s was gunned by %s"; // unchecked: SECONDARY
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%2$s ^7slapped %1$s ^7around a bit with a large ^2shotgun";
+               else
+                       w_deathtypestring = "%s was gunned by %s";
        }
        return TRUE;
 }