Merge remote branch 'origin/fruitiex/fruitbalance' into divVerent/fruitbalance

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 8e4d45d364413adbf0c88777f28a36b996d5526f..f553047154a8838bdb50199563618407e9f00057 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -345,7 +345,7 @@ set sv_fragmessage_information_typefrag 1 "Enable typefrag display information,
 
 // use default physics
 set sv_friction_on_land 0
-exec physicsNoQWBunny.cfg
+exec physicsNoQWBunny-nexbased.cfg
 
 set sv_player_viewoffset "0 0 35" "view offset of the player model"
 set sv_player_mins "-16 -16 -24" "playermodel mins"

diff --git a/physicsNoQWBunny-nexbased.cfg b/physicsNoQWBunny-nexbased.cfg
index 53f1e534e40a5c0e14654c2a3dcda5112a704373..a440ecbeb326ecd5b2770021a49882a2627655a2 100644 (file)
--- a/physicsNoQWBunny-nexbased.cfg
+++ b/physicsNoQWBunny-nexbased.cfg
@@ -2,23 +2,27 @@
 sv_gravity 800
 sv_maxspeed 400
 sv_maxairspeed 400
+
+
 sv_stopspeed 100
 sv_accelerate 15
 sv_airaccelerate 2
-sv_friction 7
+sv_friction 8
 edgefriction 1
 sv_stepheight 34
-sv_jumpvelocity 300
+
+sv_jumpvelocity 250
 sv_wateraccelerate -1
 sv_waterfriction -1
-sv_airaccel_sideways_friction -0.2
+sv_airaccel_sideways_friction 0
 sv_airaccel_qw -0.9475
-sv_airstopaccelerate 2.5
+
+sv_airstopaccelerate 3
 sv_airstrafeaccelerate 24
 sv_maxairstrafespeed 100
 sv_airstrafeaccel_qw -0.9825
 sv_aircontrol 125
-sv_aircontrol_penalty 0
+sv_aircontrol_penalty 100
 sv_aircontrol_power 2.5
 sv_airspeedlimit_nonqw 0
 sv_warsowbunny_turnaccel 0

diff --git a/physicsNoQWBunny-xpmbased.cfg b/physicsNoQWBunny-xpmbased.cfg
new file mode 100644 (file)
index 0000000..3e1cc96
--- /dev/null
+++ b/physicsNoQWBunny-xpmbased.cfg
@@ -0,0 +1,36 @@
+// "NoQWBunny" physics based on XPM
+sv_gravity 800
+sv_maxspeed 320
+
+sv_maxairspeed 320
+
+sv_stopspeed 100
+sv_accelerate 15
+sv_airaccelerate 2
+sv_friction 8
+edgefriction 1
+sv_stepheight 34
+
+sv_jumpvelocity 250
+sv_wateraccelerate 4
+sv_waterfriction 1
+sv_airaccel_sideways_friction 0
+sv_airaccel_qw -0.937
+
+sv_airstopaccelerate 3
+sv_airstrafeaccelerate 20
+sv_maxairstrafespeed 96
+sv_airstrafeaccel_qw -0.979
+sv_aircontrol 125
+sv_aircontrol_penalty 100
+sv_aircontrol_power 2.5
+sv_airspeedlimit_nonqw 0
+sv_warsowbunny_turnaccel 0
+sv_warsowbunny_accel 0.1593
+sv_warsowbunny_topspeed 925
+sv_warsowbunny_backtosideratio 0.8
+sv_friction_on_land 0
+sv_doublejump 0
+sv_jumpspeedcap_min ""
+sv_jumpspeedcap_max ""
+sv_jumpspeedcap_max_disable_on_ramps 1

diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
deleted file mode 100644 (file)
index 3e1cc96..0000000
--- a/physicsNoQWBunny.cfg
+++ /dev/null
@@ -1,36 +0,0 @@
-// "NoQWBunny" physics based on XPM
-sv_gravity 800
-sv_maxspeed 320
-
-sv_maxairspeed 320
-
-sv_stopspeed 100
-sv_accelerate 15
-sv_airaccelerate 2
-sv_friction 8
-edgefriction 1
-sv_stepheight 34
-
-sv_jumpvelocity 250
-sv_wateraccelerate 4
-sv_waterfriction 1
-sv_airaccel_sideways_friction 0
-sv_airaccel_qw -0.937
-
-sv_airstopaccelerate 3
-sv_airstrafeaccelerate 20
-sv_maxairstrafespeed 96
-sv_airstrafeaccel_qw -0.979
-sv_aircontrol 125
-sv_aircontrol_penalty 100
-sv_aircontrol_power 2.5
-sv_airspeedlimit_nonqw 0
-sv_warsowbunny_turnaccel 0
-sv_warsowbunny_accel 0.1593
-sv_warsowbunny_topspeed 925
-sv_warsowbunny_backtosideratio 0.8
-sv_friction_on_land 0
-sv_doublejump 0
-sv_jumpspeedcap_min ""
-sv_jumpspeedcap_max ""
-sv_jumpspeedcap_max_disable_on_ramps 1

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 8b1d5b450a172ad410d74d3a3828d208a92e5f8f..60a510af213226684c67ed4021341c0aaeb5818b 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2412,7 +2412,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                if(WEP_VALID(w)) {
                        HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
                        if (alsoprint)
-                               print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n");
+                               print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n");
                } else if (type == DEATH_KILL) {
                        HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
                        if (alsoprint)
@@ -2454,7 +2454,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
                if(WEP_VALID(w)) {
                        HUD_KillNotify_Push(s2, s1, 1, w);
                        if (alsoprint)
-                               print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n");
+                               print("^1", sprintf(Weapon_KillMessage(type), strcat(s2, "^1"), strcat(s1, "^1")), "\n"); // default order: victim, killer
                }
                else if(type == KILL_TEAM_RED || type == KILL_TEAM_BLUE || type == KILL_TEAM_SPREE) {
                        HUD_KillNotify_Push(s1, s2, 1, type);

diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc
index 96dc36fc21bacfee4d07ca1865fedfdad9f4fcd1..f14d5689b175116611764c6d26940387e6b5a075 100644 (file)
--- a/qcsrc/server/w_campingrifle.qc
+++ b/qcsrc/server/w_campingrifle.qc
@@ -307,32 +307,32 @@ float w_campingrifle(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "shot themself automatically";
+                       w_deathtypestring = "%s shot themself automatically";
                else
-                       w_deathtypestring = "sniped themself somehow";
+                       w_deathtypestring = "%s sniped themself somehow";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
-                               w_deathtypestring = "failed to hide from #'s bullet hail";
+                               w_deathtypestring = "%s failed to hide from %s's bullet hail";
                        else
-                               w_deathtypestring = "died in #'s bullet hail";
+                               w_deathtypestring = "%s died in %s's bullet hail";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
                        {
                                // TODO special headshot message here too?
-                               w_deathtypestring = "failed to hide from #'s rifle";
+                               w_deathtypestring = "%s failed to hide from %s's rifle";
                        }
                        else
                        {
                                if(w_deathtype & HITTYPE_HEADSHOT)
-                                       w_deathtypestring = "got hit in the head by #";
+                                       w_deathtypestring = "%s got hit in the head by %s";
                                else
-                                       w_deathtypestring = "was sniped by #";
+                                       w_deathtypestring = "%s was sniped by %s";
                        }
                }
        }

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index d80317a346ef1a1b3a3be3479b3c67e038133aad..3d18ba12d9838f2e9458e9e8c2edb74f195421c2 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -250,16 +250,16 @@ float w_crylink(float req)
        }
        else if (req == WR_SUICIDEMESSAGE)
        {
-               w_deathtypestring = "succeeded at self-destructing themself with the Crylink";
+               w_deathtypestring = "%s succeeded at self-destructing themself with the Crylink";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE)
-                       w_deathtypestring = "could not hide from #'s Crylink"; // unchecked: SPLASH (SECONDARY can't be)
+                       w_deathtypestring = "%s could not hide from %s's Crylink"; // unchecked: SPLASH (SECONDARY can't be)
                else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "was too close to #'s Crylink"; // unchecked: SECONDARY
+                       w_deathtypestring = "%s was too close to %s's Crylink"; // unchecked: SECONDARY
                else
-                       w_deathtypestring = "took a close look at #'s Crylink"; // unchecked: SECONDARY
+                       w_deathtypestring = "%s took a close look at %s's Crylink"; // unchecked: SECONDARY
        }
        return TRUE;
 }

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

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 278099c633877a2e056bc2fcbd9a72d20d773af9..368faecbf3b9c340fb945a673102e20e31ba2f97 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -384,36 +384,32 @@ float w_fireball(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "forgot about some firemine";
+                       w_deathtypestring = "%s forgot about some firemine";
                else
-                       w_deathtypestring = "should have used a smaller gun";
+                       w_deathtypestring = "%s should have used a smaller gun";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
                {
                        if(w_deathtype & HITTYPE_HEADSHOT)
-                               w_deathtypestring = "tried to catch #'s firemine";
+                               w_deathtypestring = "%s tried to catch %s's firemine";
                        else
-                               w_deathtypestring = "fatefully ignored #'s firemine";
+                               w_deathtypestring = "%s fatefully ignored %s's firemine";
                }
                else
                {
                        if(w_deathtype & HITTYPE_BOUNCE)
                        {
                                if(w_deathtype & HITTYPE_SPLASH) // BFG effect
-                               {
-                                       w_deathtypestring = "could not hide from #'s fireball";
-                               }
+                                       w_deathtypestring = "%s could not hide from %s's fireball";
                                else // laser
-                               {
-                                       w_deathtypestring = "saw the pretty lights of #'s fireball";
-                               }
+                                       w_deathtypestring = "%s saw the pretty lights of %s's fireball";
                        }
                        else if(w_deathtype & HITTYPE_SPLASH)
-                               w_deathtypestring = "got too close to #'s fireball";
+                               w_deathtypestring = "%s got too close to %s's fireball";
                        else
-                               w_deathtypestring = "tasted #'s fireball";
+                               w_deathtypestring = "%s tasted %s's fireball";
                }
        }
        return TRUE;

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index f6851af212d5d8afb909da7489291b09aa6a7f1d..a8930cd41d9fce14b1a23f6db259f69a1625346e 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -265,19 +265,19 @@ float w_glauncher(float req)
        else if (req == WR_SUICIDEMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "tried out his own grenade";
+                       w_deathtypestring = "%s tried out his own grenade";
                else
-                       w_deathtypestring = "detonated";
+                       w_deathtypestring = "%s detonated";
        }
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SPLASH)
                        if(w_deathtype & HITTYPE_BOUNCE) // (must be secondary then)
-                               w_deathtypestring = "didn't see #'s grenade";
+                               w_deathtypestring = "%s didn't see %s's grenade";
                        else // unchecked: SECONDARY
-                               w_deathtypestring = "almost dodged #'s grenade";
+                               w_deathtypestring = "%s almost dodged %s's grenade";
                else // unchecked: SECONDARY, BOUNCE
-                       w_deathtypestring = "ate #'s grenade";
+                       w_deathtypestring = "%s ate %s's grenade";
        }
        return TRUE;
 }

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

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index 88990de62821685de13d1ce24ca0decad035ac23..9abb8a7a0200f76e63a5ecbe6b2ddeb2d19e7652 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -226,9 +226,9 @@ float w_hlac(float req)
                precache_sound("weapons/laserimpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "should have used a smaller gun";
+               w_deathtypestring = "%s should have used a smaller gun";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "was cut down by";
+               w_deathtypestring = "%s was cut down by %s";
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index c8d1369f7b42b11363f032163ec8b95eb306dc81..70fe77814de201e42e9f583d1e7b49c3da89e8a2 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -262,9 +262,9 @@ float w_hook(float req)
                precache_sound("weapons/hookbomb_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has run into #'s gravity bomb";
+               w_deathtypestring = "%s has run into %s's gravity bomb";
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 7ae406a9c63025131539715ccf3bd8a6a4a4960b..3351816b2c123ae68fe09bf367c1f78abcb0d091 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -307,10 +307,10 @@ float w_laser(float req)
                precache_sound("weapons/laserimpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "lasered themself to hell";
+               w_deathtypestring = "%s lasered themself to hell";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
+               w_deathtypestring = "%s was lasered to death by %s"; // unchecked: SPLASH
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 65d02dcb2d6422151b971a9b6c47e92cb1aa9e8f..352aa2b25c6edfee928e7b3541eb51f9b9a58ad5 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -255,9 +255,9 @@ float w_minstanex(float req)
                precache_sound("weapons/neximpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
+               w_deathtypestring = "%s has been vaporized by %s";
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 4c30f4c675c5f6b1bd45102cd199324c11476708..aee2a80a28e1aad32baa97fb357db263ae8cdb26 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -93,9 +93,9 @@ float w_nex(float req)
                precache_sound("weapons/neximpact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "has been vaporized by";
+               w_deathtypestring = "%s has been vaporized by %s";
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index b78e85574312d4cda870c4fec880701f29324686..010a0f8b36546ccf7ad18a47b3460349b3d61a18 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -288,9 +288,9 @@ float w_porto(float req)
                // nothing to do
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
-               w_deathtypestring = "felt # doing the impossible to him";
+               w_deathtypestring = "%s felt %s doing the impossible to him";
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index f12c2fab1e6927afde0426ab1ca19c3288b4f280..d4056763a84d1e418075a0bd7ffe6a35318eb798 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -586,15 +586,15 @@ float w_rlauncher(float req)
                precache_sound("weapons/rocket_impact.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "exploded";
+               w_deathtypestring = "%s exploded";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_BOUNCE) // (remote detonation)
-                       w_deathtypestring = "got too close to #'s rocket";
+                       w_deathtypestring = "%s got too close to %s's rocket";
                else if(w_deathtype & HITTYPE_SPLASH)
-                       w_deathtypestring = "almost dodged #'s rocket";
+                       w_deathtypestring = "%s almost dodged %s's rocket";
                else
-                       w_deathtypestring = "ate #'s rocket";
+                       w_deathtypestring = "%s ate %s's rocket";
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 3b23c211294895996cfd5ca80567b4f5b1fc271d..c91e4f40869ff7fb11e74a8cd9f514422c31b790 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -468,15 +468,6 @@ float w_seeker(float req)
                return self.ammo_rockets >= cvar("g_balance_seeker_tag_ammo") + cvar("g_balance_seeker_missile_ammo");
        else if (req == WR_CHECKAMMO2)
                return self.ammo_rockets >= cvar("g_balance_seeker_flac_ammo");
-       else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "played with tiny rockets";
-       else if (req == WR_KILLMESSAGE)
-       {
-               if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "ran into #'s flac";
-               else
-                       w_deathtypestring = "was tagged by";
-       }
        return TRUE;
 };
 #endif
@@ -548,6 +539,15 @@ float w_seeker(float req)
                precache_sound("weapons/tagexp3.wav");
                precache_sound("weapons/tag_impact.wav");
        }
+       else if (req == WR_SUICIDEMESSAGE)
+               w_deathtypestring = "%s played with tiny rockets";
+       else if (req == WR_KILLMESSAGE)
+       {
+               if(w_deathtype & HITTYPE_SECONDARY)
+                       w_deathtypestring = "%s ran into %s's flac";
+               else
+                       w_deathtypestring = "%s was tagged by %s";
+       }
        return TRUE;
 }
 #endif

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 9d1d8fba5907662a52ef02f1a649d0daf8336014..7b74e5693f4ea2620def11550afc8ed96a0f032e 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -224,10 +224,10 @@ float w_shotgun(float req)
                precache_sound("weapons/ric3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "was gunned by"; // unchecked: SECONDARY
+               w_deathtypestring = "%s was gunned by %s"; // unchecked: SECONDARY
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index 243b32b20e2b0bdbb3b787dec2275f6bba515d79..c89735e55930fc81a8f8bc752890c5bd1fa1f73d 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -257,11 +257,11 @@ float w_tuba(float req)
        }
        else if (req == WR_SUICIDEMESSAGE)
        {
-               w_deathtypestring = "hurt his own ears with the @!#%'n Tuba";
+               w_deathtypestring = "%s hurt his own ears with the @!#%%'n Tuba";
        }
        else if (req == WR_KILLMESSAGE)
        {
-               w_deathtypestring = "died of #'s great playing on the @!#%'n Tuba";
+               w_deathtypestring = "%s died of %s's great playing on the @!#%%'n Tuba";
        }
        return TRUE;
 }

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 245ad652f6d8bb33eab902171e4975c7580195af..b11e490f4e40aba839ee3bded58a12460ed2e4ae 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -152,13 +152,13 @@ float w_uzi(float req)
                precache_sound("weapons/ric3.wav");
        }
        else if (req == WR_SUICIDEMESSAGE)
-               w_deathtypestring = "did the impossible";
+               w_deathtypestring = "%s did the impossible";
        else if (req == WR_KILLMESSAGE)
        {
                if(w_deathtype & HITTYPE_SECONDARY)
-                       w_deathtypestring = "was sniped by";
+                       w_deathtypestring = "%s was sniped by %s";
                else
-                       w_deathtypestring = "was riddled full of holes by";
+                       w_deathtypestring = "%s was riddled full of holes by %s";
        }
        return TRUE;
 }