From: Lyberta Date: Sun, 11 Feb 2018 03:53:16 +0000 (+0300) Subject: OK weapons: Give them unique icons and kill messages. X-Git-Tag: xonotic-v0.8.5~2119^2~34 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9fc3823b56e2ca2545be9a217b77a0db11f87734;p=xonotic%2Fxonotic-data.pk3dir.git OK weapons: Give them unique icons and kill messages. --- diff --git a/gfx/hud/luma/weaponokmachinegun.tga b/gfx/hud/luma/weaponokmachinegun.tga new file mode 100644 index 000000000..5aee32ab5 Binary files /dev/null and b/gfx/hud/luma/weaponokmachinegun.tga differ diff --git a/gfx/hud/luma/weaponoknex.tga b/gfx/hud/luma/weaponoknex.tga new file mode 100644 index 000000000..e2e83ae75 Binary files /dev/null and b/gfx/hud/luma/weaponoknex.tga differ diff --git a/gfx/hud/luma/weaponokshotgun.tga b/gfx/hud/luma/weaponokshotgun.tga new file mode 100644 index 000000000..f5fb92e13 Binary files /dev/null and b/gfx/hud/luma/weaponokshotgun.tga differ diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc index 4b9e69e30..60f916272 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qc @@ -173,10 +173,7 @@ METHOD(OverkillMachineGun, wr_suicidemessage, Notification(entity thiswep)) METHOD(OverkillMachineGun, wr_killmessage, Notification(entity thiswep)) { - if(w_deathtype & HITTYPE_SECONDARY) - return WEAPON_MACHINEGUN_MURDER_SNIPE; - else - return WEAPON_MACHINEGUN_MURDER_SPRAY; + return WEAPON_OVERKILL_MACHINEGUN_MURDER; } #endif diff --git a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh index 1b085df7d..ca52a77a4 100644 --- a/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okmachinegun.qh @@ -13,7 +13,7 @@ CLASS(OverkillMachineGun, Weapon) #endif /* crosshair */ ATTRIB(OverkillMachineGun, w_crosshair, string, "gfx/crosshairuzi"); /* crosshair */ ATTRIB(OverkillMachineGun, w_crosshair_size, float, 0.6); -/* wepimg */ ATTRIB(OverkillMachineGun, model2, string, "weaponuzi"); +/* wepimg */ ATTRIB(OverkillMachineGun, model2, string, "weaponokmachinegun"); /* refname */ ATTRIB(OverkillMachineGun, netname, string, "okmachinegun"); /* wepname */ ATTRIB(OverkillMachineGun, m_name, string, _("Overkill MachineGun")); diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qc b/qcsrc/common/mutators/mutator/overkill/oknex.qc index a27634320..c9afa7c6c 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qc +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qc @@ -363,7 +363,7 @@ METHOD(OverkillNex, wr_suicidemessage, Notification(entity thiswep)) METHOD(OverkillNex, wr_killmessage, Notification(entity thiswep)) { - return WEAPON_VORTEX_MURDER; + return WEAPON_OVERKILL_NEX_MURDER; } METHOD(OverkillNex, wr_zoom, bool(entity thiswep, entity actor)) diff --git a/qcsrc/common/mutators/mutator/overkill/oknex.qh b/qcsrc/common/mutators/mutator/overkill/oknex.qh index 599a7af04..762a299fc 100644 --- a/qcsrc/common/mutators/mutator/overkill/oknex.qh +++ b/qcsrc/common/mutators/mutator/overkill/oknex.qh @@ -14,7 +14,7 @@ CLASS(OverkillNex, Weapon) /* crosshair */ ATTRIB(OverkillNex, w_crosshair, string, "gfx/crosshairnex"); /* crosshair */ ATTRIB(OverkillNex, w_crosshair_size, float, 0.65); /* reticle */ ATTRIB(OverkillNex, w_reticle, string, "gfx/reticle_nex"); -/* wepimg */ ATTRIB(OverkillNex, model2, string, "weaponnex"); +/* wepimg */ ATTRIB(OverkillNex, model2, string, "weaponoknex"); /* refname */ ATTRIB(OverkillNex, netname, string, "oknex"); /* wepname */ ATTRIB(OverkillNex, m_name, string, _("Overkill Nex")); diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc index 3a7143f78..c71263aee 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qc +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qc @@ -130,10 +130,7 @@ METHOD(OverkillShotgun, wr_suicidemessage, Notification(entity thiswep)) METHOD(OverkillShotgun, wr_killmessage, Notification(entity thiswep)) { - if(w_deathtype & HITTYPE_SECONDARY) - return WEAPON_BLASTER_MURDER; - else - return WEAPON_SHOTGUN_MURDER; + return WEAPON_OVERKILL_SHOTGUN_MURDER; } #endif diff --git a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh index 59519f84a..b0feadda0 100644 --- a/qcsrc/common/mutators/mutator/overkill/okshotgun.qh +++ b/qcsrc/common/mutators/mutator/overkill/okshotgun.qh @@ -13,7 +13,7 @@ CLASS(OverkillShotgun, Weapon) #endif /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair, string, "gfx/crosshairshotgun"); /* crosshair */ ATTRIB(OverkillShotgun, w_crosshair_size, float, 0.65); -/* wepimg */ ATTRIB(OverkillShotgun, model2, string, "weaponshotgun"); +/* wepimg */ ATTRIB(OverkillShotgun, model2, string, "weaponokshotgun"); /* refname */ ATTRIB(OverkillShotgun, netname, string, "okshotgun"); /* wepname */ ATTRIB(OverkillShotgun, m_name, string, _("Overkill Shotgun")); diff --git a/qcsrc/common/notifications/all.inc b/qcsrc/common/notifications/all.inc index b4c6146bb..e0234c2ed 100644 --- a/qcsrc/common/notifications/all.inc +++ b/qcsrc/common/notifications/all.inc @@ -491,6 +491,9 @@ MSG_INFO_NOTIF(WEAPON_MORTAR_MURDER_EXPLODE, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weapongrenadelauncher", _("^BG%s%s^K1 ate ^BG%s^K1's Mortar grenade%s%s"), "") MSG_INFO_NOTIF(WEAPON_MORTAR_SUICIDE_BOUNCE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "weapongrenadelauncher", _("^BG%s^K1 didn't see their own Mortar grenade%s%s"), "") MSG_INFO_NOTIF(WEAPON_MORTAR_SUICIDE_EXPLODE, N_CONSOLE, 2, 1, "s1 s2loc spree_lost", "s1", "weapongrenadelauncher", _("^BG%s^K1 blew themself up with their own Mortar%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_MACHINEGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponokmachinegun", _("^BG%s%s^K1 was riddled full of holes by ^BG%s^K1's Overkill Machine Gun%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_NEX_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponoknex", _("^BG%s%s^K1 has been vaporized by ^BG%s^K1's Overkill Nex%s%s"), "") + MSG_INFO_NOTIF(WEAPON_OVERKILL_SHOTGUN_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponokshotgun", _("^BG%s%s^K1 was gunned down by ^BG%s^K1's Overkill Shotgun%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 was sniped with a Rifle by ^BG%s^K1%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER_HAIL, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 died in ^BG%s^K1's Rifle bullet hail%s%s"), "") MSG_INFO_NOTIF(WEAPON_RIFLE_MURDER_HAIL_PIERCING, N_CONSOLE, 3, 2, "spree_inf s1 s2 s3loc spree_end", "s2 s1", "weaponrifle", _("^BG%s%s^K1 failed to hide from ^BG%s^K1's Rifle bullet hail%s%s"), "") @@ -948,6 +951,9 @@ MSG_MULTI_NOTIF(WEAPON_MORTAR_MURDER_EXPLODE, N_ENABLE, NULL, INFO_WEAPON_MORTAR_MURDER_EXPLODE, NULL) MSG_MULTI_NOTIF(WEAPON_MORTAR_SUICIDE_BOUNCE, N_ENABLE, NULL, INFO_WEAPON_MORTAR_SUICIDE_BOUNCE, CENTER_DEATH_SELF_GENERIC) MSG_MULTI_NOTIF(WEAPON_MORTAR_SUICIDE_EXPLODE, N_ENABLE, NULL, INFO_WEAPON_MORTAR_SUICIDE_EXPLODE, CENTER_DEATH_SELF_GENERIC) + MSG_MULTI_NOTIF(WEAPON_OVERKILL_MACHINEGUN_MURDER, N_ENABLE, NULL, INFO_WEAPON_OVERKILL_MACHINEGUN_MURDER, NULL) + MSG_MULTI_NOTIF(WEAPON_OVERKILL_NEX_MURDER, N_ENABLE, NULL, INFO_WEAPON_OVERKILL_NEX_MURDER, NULL) + MSG_MULTI_NOTIF(WEAPON_OVERKILL_SHOTGUN_MURDER, N_ENABLE, NULL, INFO_WEAPON_OVERKILL_SHOTGUN_MURDER, NULL) MSG_MULTI_NOTIF(WEAPON_RIFLE_MURDER, N_ENABLE, NULL, INFO_WEAPON_RIFLE_MURDER, NULL) MSG_MULTI_NOTIF(WEAPON_RIFLE_MURDER_HAIL, N_ENABLE, NULL, INFO_WEAPON_RIFLE_MURDER_HAIL, NULL) MSG_MULTI_NOTIF(WEAPON_RIFLE_MURDER_HAIL_PIERCING, N_ENABLE, NULL, INFO_WEAPON_RIFLE_MURDER_HAIL_PIERCING, NULL)