From cc134f26faf0198079d1ca74cc9338d5bf76d3b4 Mon Sep 17 00:00:00 2001
From: Samual <samual@xonotic.org>
Date: Sat, 24 Sep 2011 16:55:43 -0400
Subject: [PATCH] Change around some of the death messages for weapons - Some
were outdated, others were just using bad naming schemes (shotgun for
example) -- now they're all alike, with a few exceptions. (soon to be fixing
the rest of them)
---
qcsrc/server/w_electro.qc | 14 +++++++-------
qcsrc/server/w_grenadelauncher.qc | 4 ++--
qcsrc/server/w_hagar.qc | 6 +++---
qcsrc/server/w_hlac.qc | 2 +-
qcsrc/server/w_hook.qc | 2 +-
qcsrc/server/w_minelayer.qc | 5 ++++-
qcsrc/server/w_minstanex.qc | 2 +-
qcsrc/server/w_nex.qc | 2 +-
qcsrc/server/w_rifle.qc | 13 +++++--------
qcsrc/server/w_rocketlauncher.qc | 2 +-
qcsrc/server/w_seeker.qc | 6 +++---
qcsrc/server/w_shotgun.qc | 4 ++--
qcsrc/server/w_uzi.qc | 4 ++--
13 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 526d4cd32d..dcacee6c46 100644
--- 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 1d2ee93b9a..968f157c7a 100644
--- 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 080eea39e4..adecf1487f 100644
--- 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 978ac5f4a4..bcda0a8078 100644
--- 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 754ffff909..ba315f96ae 100644
--- 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 4e56d2d94e..a2c57004ff 100644
--- 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 16cbdcded3..8c071ed1d8 100644
--- 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 f936705955..6847d89b96 100644
--- 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 02d859e0fd..4a8ed746a2 100644
--- 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 b4987b69f9..280899fba7 100644
--- 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 c108ba3cfa..b74eb3d1d3 100644
--- 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 2088073f99..62b190bb22 100644
--- 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 4a10ecdf3a..e63d54a415 100644
--- 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;
}
--
2.39.5