Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir

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

diff --git a/qcsrc/server/w_rifle.qc b/qcsrc/server/w_rifle.qc
index 941a528a4b0b4fa9eac087b0222cc3c4d60b9d93..1c5f766d7dbf2240ce03ee0bce3e149db4c48489 100644 (file)
--- a/qcsrc/server/w_rifle.qc
+++ b/qcsrc/server/w_rifle.qc
@@ -1,5 +1,5 @@
 #ifdef REGISTER_WEAPON
-REGISTER_WEAPON(RIFLE, w_rifle, IT_NAILS, 7, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "campingrifle", "rifle", _("Rifle"))
+REGISTER_WEAPON(RIFLE, w_rifle, IT_NAILS, 7, WEP_FLAG_MUTATORBLOCKED | WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "campingrifle", "rifle", _("Rifle"))
 #else
 #ifdef SVQC
 
@@ -201,7 +201,7 @@ float w_rifle(float req)
                W_Reload(min(autocvar_g_balance_rifle_primary_ammo, autocvar_g_balance_rifle_secondary_ammo), autocvar_g_balance_rifle_reload_ammo, autocvar_g_balance_rifle_reload_time, "weapons/reload.wav");
        }
        return TRUE;
-};
+}
 #endif
 #ifdef CSQC
 float w_rifle(float req)
@@ -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");
                        }
                }
        }