Merge branch 'master' into mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 82467348e588de0b7463885bf8e6de406566fb7b..ea7770e0abfc234bfc33bc94360841ab1389148f 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1645,6 +1645,75 @@ void HUD_Notify_Push(string icon, string attacker, string victim)
                if(notify_attackers[kn_index]) { strunzone(notify_attackers[kn_index]); }
                notify_attackers[kn_index] = strzone(attacker);
 
+               if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
+                       if(DEATH_ISMONSTER(type)) {
+                       HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
+                       if(alsoprint)
+                       {
+                               if(gentle)
+                                       print (sprintf(_("^1%s^1 hit a monster, and the monster hit back\n"), s1));
+                               else
+                               {
+                                       switch(type)
+                                       {
+                                               case DEATH_MONSTER_DEMON_MELEE:
+                                                       print (sprintf(_("^1%s^1 was eviscerated by a Fiend \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_DEMON_JUMP:
+                                                       print (sprintf(_("^1%s^1 didn't see the Fiend pouncing at them \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_SHAMBLER_MELEE:
+                                                       print (sprintf(_("^1%s^1 was smashed by a Shambler \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_SHAMBLER_CLAW:
+                                                       print (sprintf(_("^1%s^1's insides were ripped out by a Shambler \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_SHAMBLER_LIGHTNING:
+                                                       print (sprintf(_("^1%s^1 was zapped to death by a Shambler \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_SOLDIER_NAIL:
+                                                       print (sprintf(_("^1%s^1 was riddled full of holes by a Soldier \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_ENFORCER_NAIL:
+                                                       print (sprintf(_("^1%s^1 was riddled full of holes by an Enforcer \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_DOG_BITE:
+                                                       print (sprintf(_("^1%s^1 was mauled by a Rottweiler \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_DOG_JUMP:
+                                                       print (sprintf(_("^1%s^1 didn't see the pouncing Rottweiler \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_TARBABY_BLOWUP:
+                                                       print (sprintf(_("^1%s^1 was slimed by a Spawn \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_FISH_BITE:
+                                                       print (sprintf(_("^1%s^1 was fed to the Rotfish \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_HELLFISH_BITE:                       
+                                                       print (sprintf(_("^1%s^1 was eaten alive by a Hellfish \n"), s1));
+                                                       break;
+                        case DEATH_MONSTER_SHALRATH_MELEE:
+                                                       print (sprintf(_("^1%s^1 was exploded by a Vore \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_OGRE_CHAINSAW:
+                                                       print (sprintf(_("^1%s^1 was destroyed by an Ogre \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_OGRE_NAIL:
+                                                       print (sprintf(_("^1%s^1 was riddled full of holes by an Ogre \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_ZOMBIE:
+                                                       print (sprintf(_("^1%s^1's brains were eaten by a Zombie \n"), s1));
+                                                       break;
+                                               case DEATH_MONSTER_HELLKNIGHT_FIREBALL:
+                                                       print (sprintf(_("^1%s^1 was exploded by a Hell-Knight's fireball \n"), s1));
+                                               case DEATH_MONSTER_MELEE:                       
+                                                       print (sprintf(_("^1%s^1 was killed by a monster \n"), s1));
+                                                       break;
+                                       }
+                               }
+                       }
+               }    
+               }
                // victim
                if(notify_victims[kn_index]) { strunzone(notify_victims[kn_index]); }
                notify_victims[kn_index] = strzone(victim);