Change around some of the death messages for weapons - Some were outdated, others...

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 526d4cd32d6253ff11f5b07022f8e76bd0b369f7..dcacee6c46b936cc7e701bac7f0e0acc5a587f2e 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -571,27 +571,27 @@ float w_electro(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%s could not remember where they put plasma");
+                       w_deathtypestring = _("%s could not remember where they put their electro plasma");
                else
-                       w_deathtypestring = _("%s played with plasma");
+                       w_deathtypestring = _("%s played with electro plasma");
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE
-                               w_deathtypestring = _("%s just noticed %s's blue ball");
+                               w_deathtypestring = _("%s just noticed %s's electro plasma");
                        else // unchecked: BOUNCE
-                               w_deathtypestring = _("%s got in touch with %s's blue ball");
+                               w_deathtypestring = _("%s got in touch with %s's electro plasma");
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE) // combo
-                               w_deathtypestring = _("%s felt the electrifying air of %s's combo");
+                               w_deathtypestring = _("%s felt the electrifying air of %s's electro combo");
                        else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = _("%s got too close to %s's blue beam");
+                               w_deathtypestring = _("%s got too close to %s's blue electro bolt");
                        else
-                               w_deathtypestring = _("%s was blasted by %s's blue beam");
+                               w_deathtypestring = _("%s was blasted by %s's blue electro bolt");
                }
        }
        return TRUE;

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 1d2ee93b9a2cfb8778d290f69f5071b0491b55ed..968f157c7aa29735b7791b9ad417bdd90f1f14b3 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -380,9 +380,9 @@ float w_glauncher(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%s tried out his own grenade");
+                       w_deathtypestring = _("%s didn't see their own grenade");
                else
-                       w_deathtypestring = _("%s detonated");
+                       w_deathtypestring = _("%s blew themself up with their grenadelauncher");
        }
        else if (req == WR_KILLMESSAGE)
        {

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 080eea39e453fe7ed7a7704bc1d6d8aae3321e45..adecf1487fbb8c1e43c52de08d1ba884215e1709 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -399,13 +399,13 @@ float w_hagar(float req)
                precache_sound("weapons/hagexp3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = _("%s played with tiny rockets");
+               w_deathtypestring = _("%s played with tiny hagar rockets");
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // must be secondary; unchecked: SPLASH
-                       w_deathtypestring = _("%s hoped %s's missiles wouldn't bounce");
+                       w_deathtypestring = _("%s was pummeled with a burst of hagar rockets by %s");
                else // unchecked: SPLASH, SECONDARY
-                       w_deathtypestring = _("%s was pummeled by %s");
+                       w_deathtypestring = _("%s was pummeled with hagar rockets by %s");
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 978ac5f4a4df38316360403e436aad260974183a..bcda0a807829b384885550b0e774bcddd74b2c43 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -239,7 +239,7 @@ float w_hlac(float req)
        else if (req == WR_SUICIDEMESSAGE)
                w_deathtypestring = _("%s should have used a smaller gun");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = _("%s was cut down by %s");
+               w_deathtypestring = _("%s was cut down with a HLAC by %s");
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 754ffff909bf1a90a75976f115e86d70f8c9bef5..ba315f96ae45845a68ac1e284c3047d774ac0f1a 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -265,7 +265,7 @@ float w_hook(float req)
        else if (req == WR_SUICIDEMESSAGE)
                w_deathtypestring = _("%s did the impossible");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = _("%s has run into %s's gravity bomb");
+               w_deathtypestring = _("%s was caught in %s's hook gravity bomb");
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index 4e56d2d94ed99916ff21662fa019e944100785ab..a2c57004ff9fa813df69df2186fb31667458aa98 100644 (file)
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -520,7 +520,10 @@ float w_minelayer(float req)
                precache_sound("weapons/mine_exp.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = _("%s exploded");
+               if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
+                       w_deathtypestring = _("%s blew themself up with their minelayer");
+               else
+                       w_deathtypestring = _("%s forgot about their mine");
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 16cbdcded3778eb1bb7988991ecbeb39a11c54ec..8c071ed1d84f9ab6170d33e4328cc97aec7758cb 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -292,7 +292,7 @@ float w_minstanex(float req)
        else if (req == WR_SUICIDEMESSAGE)
                w_deathtypestring = _("%s is now thinking with portals");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = _("%s has been vaporized by %s");
+               w_deathtypestring = _("%s has been vaporized by %s's minstanex");
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index f9367059555cca67c033a8311e593e9bfc152a81..6847d89b96542c9c95c4695007042fc06c06af8e 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -252,7 +252,7 @@ float w_nex(float req)
        else if (req == WR_SUICIDEMESSAGE)
                w_deathtypestring = _("%s is now thinking with portals");
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = _("%s has been vaporized by %s");
+               w_deathtypestring = _("%s has been vaporized by %s's nex");
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/server/w_rifle.qc
index 02d859e0fdf854c734e8739111a8bf19aa5558b2..4a8ed746a289dd5ee82bf9dae8f9755e57239ded 100644 (file)
--- a/qcsrc/server/w_rifle.qc
+++ b/qcsrc/server/w_rifle.qc
@@ -229,19 +229,16 @@ float w_rifle(float req)
        }
        else if (req == WR_SUICIDEMESSAGE)
        {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%s shot themself automatically");
-               else
-                       w_deathtypestring = _("%s sniped themself somehow");
+               w_deathtypestring = _("%s is now thinking with portals");
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
-                               w_deathtypestring = _("%s failed to hide from %s's bullet hail");
+                               w_deathtypestring = _("%s failed to hide from %s's rifle bullet hail");
                        else
-                               w_deathtypestring = _("%s died in %s's bullet hail");
+                               w_deathtypestring = _("%s died in %s's rifle bullet hail");
                }
                else
                {
@@ -253,9 +250,9 @@ float w_rifle(float req)
                        else
                        {
                                if(w_deathtype & HITTYPE_HEADSHOT)
-                                       w_deathtypestring = _("%s got hit in the head by %s");
+                                       w_deathtypestring = _("%s got shot in the head with a rifle by %s");
                                else
-                                       w_deathtypestring = _("%s was sniped by %s");
+                                       w_deathtypestring = _("%s was sniped with a rifle by %s");
                        }
                }
        }

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index b4987b69f9bcf62a9729c428d35009f1024a1953..280899fba78ff30129e93589e995c42d71408fdb 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -498,7 +498,7 @@ float w_rlauncher(float req)
                precache_sound("weapons/rocket_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = _("%s exploded");
+               w_deathtypestring = _("%s blew themself up with their rocketlauncher");
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index c108ba3cfa1707f3b69ea2135a93c4c92e58cbbd..b74eb3d1d3facced36b523cdfe441aa94ab993cd 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -654,13 +654,13 @@ float w_seeker(float req)
                precache_sound("weapons/tag_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = _("%s played with tiny rockets");
+               w_deathtypestring = _("%s played with tiny seeker rockets");
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%s was tagged by %s");
+                       w_deathtypestring = _("%s was tagged with a seeker by %s");
                else
-                       w_deathtypestring = _("%s was pummeled by %s");
+                       w_deathtypestring = _("%s was pummeled with seeker rockets by %s");
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 2088073f9970e62a1836b96725ab231f85898638..62b190bb223541901a862c541ec319211f20c977 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -216,9 +216,9 @@ float w_shotgun(float req)
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%2$s ^7slapped %1$s ^7around a bit with a large ^2shotgun");
+                       w_deathtypestring = _("%2$s slapped %1$s around a bit with a large shotgun");
                else
-                       w_deathtypestring = _("%s was gunned by %s");
+                       w_deathtypestring = _("%s was gunned down with a shotgun by %s");
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 4a10ecdf3a37610e63209edb72eaccac0a6a726f..e63d54a4152456988a2f2b4c9cc013323edd60f3 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -319,9 +319,9 @@ float w_uzi(float req)
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = _("%s was sniped by %s");
+                       w_deathtypestring = _("%s was sniped by %s's machine gun");
                else
-                       w_deathtypestring = _("%s was riddled full of holes by %s");
+                       w_deathtypestring = _("%s was riddled full of holes by %s's machine gun");
        }
        return TRUE;
 }