]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/client/hud.qc
move more of the weapon stuff to CSQC
[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / hud.qc
index bc1bfa85df1186e6095d8ea795f1598c537a8bc1..f2a5a34f31fec2574e689fde0e6e6fb1bfd6d2e6 100644 (file)
@@ -579,6 +579,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                fputs(fh, strcat("seta hud_skin \"", cvar_string("hud_skin"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg \"", cvar_string("hud_bg"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_color \"", cvar_string("hud_bg_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_bg_color_team \"", cvar_string("hud_bg_color_team"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_alpha \"", cvar_string("hud_bg_alpha"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_border \"", cvar_string("hud_bg_border"), "\"", "\n"));
                fputs(fh, strcat("seta hud_bg_padding \"", cvar_string("hud_bg_padding"), "\"", "\n"));
@@ -587,6 +588,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 
                fputs(fh, strcat("seta hud_dock \"", cvar_string("hud_dock"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_color \"", cvar_string("hud_dock_color"), "\"", "\n"));
+               fputs(fh, strcat("seta hud_dock_color_team \"", cvar_string("hud_dock_color_team"), "\"", "\n"));
                fputs(fh, strcat("seta hud_dock_alpha \"", ftos(cvar("hud_dock_alpha")), "\"", "\n"));
                fputs(fh, "\n");
 
@@ -608,6 +610,7 @@ void HUD_Panel_ExportCfg(string cfgname)
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_size \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_size")), "\"", "\n"));
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg")), "\"", "\n"));
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color")), "\"", "\n"));
+                       fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_color_team \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_color_team")), "\"", "\n"));
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_alpha \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_alpha")), "\"", "\n"));
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_border \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_border")), "\"", "\n"));
                        fputs(fh, strcat("seta hud_", HUD_Panel_GetName(i), "_bg_padding \"", cvar_string(strcat("hud_", HUD_Panel_GetName(i), "_bg_padding")), "\"", "\n"));
@@ -642,6 +645,7 @@ void HUD_Panel_ExportCfg(string cfgname)
 vector HUD_Panel_GetMinSize(float id)
 {
        vector mySize;
+       // note: please only set mySize_y on aspect ratio forced panels
        switch(id) {
                case 0: 
                        mySize_x = 1/10; // at least 1/10 * height
@@ -676,6 +680,8 @@ vector HUD_Panel_GetMinSize(float id)
                        mySize_y = 0.5898; // 0.5898 * width, reason: bg has weird dimensions...
                        break;
        }
+       if(!mySize_x)
+               mySize_x = 1/mySize_y;
        return mySize;
 }
 
@@ -727,12 +733,24 @@ vector HUD_Panel_GetColor(float id)
        float f;
        vector color_vec;
        string color;
-       color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
+
+       // fetch per-panel color
+       if(teamplay && cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")) != "") {
+               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               color = vtos(colormapPaletteColor(mod(f, 16), 1) * cvar(strcat("hud_", HUD_Panel_GetName(id), "_bg_color_team")));
+       }
+       else
+               color = cvar_string(strcat("hud_", HUD_Panel_GetName(id), "_bg_color"));
        color_vec = stov(color);
-       if(color == "") {
+
+       if(color == "") { // fetch default color
                color = cvar_string("hud_bg_color");
                color_vec = stov(color);
-               if(color == "shirt") {
+               if(teamplay && cvar(strcat("hud_bg_color_team"))) {
+                       f = stof(getplayerkey(self.sv_entnum, "colors"));
+                       color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_bg_color_team");
+               }
+               else if(color == "shirt") {
                        f = stof(getplayerkey(self.sv_entnum, "colors"));
                        color_vec = colormapPaletteColor(floor(f / 16), 0);
                }
@@ -759,7 +777,11 @@ vector HUD_Panel_Dock_GetColor(void)
        string color;
        color = cvar_string("hud_dock_color");
        color_vec = stov(color);
-       if(color == "shirt") {
+       if(teamplay && cvar(strcat("hud_dock_color_team"))) {
+               f = stof(getplayerkey(self.sv_entnum, "colors"));
+               color_vec = colormapPaletteColor(mod(f, 16), 1) * cvar("hud_dock_color_team");
+       }
+       else if(color == "shirt") {
                f = stof(getplayerkey(self.sv_entnum, "colors"));
                color_vec = colormapPaletteColor(floor(f / 16), 0);
        }
@@ -948,7 +970,6 @@ void HUD_Panel_SetPos(float id, vector pos)
        cvar_set(strcat("hud_", HUD_Panel_GetName(id), "_pos"), s);
 }
 
-float resizeCorner; // 1 = topleft, 2 = topright, 3 = bottomleft, 4 = bottomright
 // check if resize will result in panel being moved into another panel. If so, return snapped vector, otherwise return the given vector
 vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
 {
@@ -992,28 +1013,28 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
                targCenter_x = targPos_x + 0.5 * targSize_x;
                targCenter_y = targPos_y + 0.5 * targSize_y;
 
-               if(myCenter_x < targCenter_x && myCenter_y < targCenter_y && resizeCorner != 1) // top left (of target panel)
+               if(myCenter_x < targCenter_x && myCenter_y < targCenter_y) // top left (of target panel)
                {
                        if(myPos_x + mySize_x - targPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
                                myTarget_x = targPos_x - myPos_x;
                        else // push it upwards
                                myTarget_y = targPos_y - myPos_y;
                }
-               else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y && resizeCorner != 2) // top right
+               else if(myCenter_x > targCenter_x && myCenter_y < targCenter_y) // top right
                {
                        if(targPos_x + targSize_x - myPos_x < myPos_y + mySize_y - targPos_y) // push it to the side
                                myTarget_x = targPos_x + targSize_x;
                        else // push it upwards
                                myTarget_y = targPos_y - myPos_y;
                }
-               else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y && resizeCorner != 3) // bottom left
+               else if(myCenter_x < targCenter_x && myCenter_y > targCenter_y) // bottom left
                {
                        if(myPos_x + mySize_x - targPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
                                myTarget_x = targPos_x - myPos_x;
                        else // push it downwards
                                myTarget_y = targPos_y + targSize_y;
                }
-               else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y && resizeCorner != 4) // bottom right
+               else if(myCenter_x > targCenter_x && myCenter_y > targCenter_y) // bottom right
                {
                        if(targPos_x + targSize_x - myPos_x < targPos_y + targSize_y - myPos_y) // push it to the side
                                myTarget_x = targPos_x + targSize_x;
@@ -1025,59 +1046,89 @@ vector HUD_Panel_CheckResize(float id, vector myPos, vector mySize)
        return myTarget;
 }
 
-void HUD_Panel_SetPosSize(float id, vector myPos, vector resizeorigin)
+void HUD_Panel_SetPosSize(float id, vector resizeorigin)
 {
-       vector oldSize, oldPos;
+       vector mySize, myPos;
+       vector oldPos;
 
-       vector mySize;
-       mySize = resizeorigin - myPos;
+       if(resizeCorner == 1) {
+               mySize_x = resizeorigin_x - (mousepos_x - panel_click_distance_x);
+               mySize_y = resizeorigin_y - (mousepos_y - panel_click_distance_y);
+       } else if(resizeCorner == 2) {          
+               mySize_x = mousepos_x + panel_click_distance_x - resizeorigin_x;
+               mySize_y = panel_click_distance_y + resizeorigin_y - mousepos_y;
+       } else if(resizeCorner == 3) {
+               mySize_x = resizeorigin_x + panel_click_distance_x - mousepos_x;
+               mySize_y = mousepos_y + panel_click_distance_y - resizeorigin_y;
+       } else { // resizeCorner == 4
+               mySize_x = mousepos_x - (resizeorigin_x - panel_click_distance_x);
+               mySize_y = mousepos_y - (resizeorigin_y - panel_click_distance_y);
+       }
+
+       // minimum panel size cap
+       mySize_x = max(0.025 * vid_conwidth, mySize_x);
+       mySize_y = max(0.025 * vid_conheight, mySize_y);
 
        // cap against panel's own limits
        vector minSize;
-       minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa // TODO: this likely fails at minlimit now
+       minSize = HUD_Panel_GetMinSize(id); // mySize_x at least minSize_x * mySize_y, and vice versa
 
        mySize_x = max(minSize_x * mySize_y, mySize_x);
        mySize_y = max(minSize_y * mySize_x, mySize_y);
 
-       oldPos = HUD_Panel_GetPos(id);
-       oldSize = HUD_Panel_GetSize(id);
+       // collision testing|
+       // -----------------+
 
-       myPos_x = resizeorigin_x - mySize_x;
-       myPos_y = resizeorigin_y - mySize_y;
-       /*
-       if(cvar("hud_configure_grid"))
-       {
-               mySize_x = floor(mySize_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x");
-               mySize_y = floor(mySize_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y");
+       // we need to know pos at this stage, but it might still change later if we hit a screen edge/other panel (?)
+       if(resizeCorner == 1) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 2) {
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 3) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y;
+       } else { // resizeCorner == 4
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y;
        }
 
+       // left/top screen edges
+       mySize_x = min(myPos_x + mySize_x, mySize_x);
+       mySize_y = min(myPos_y + mySize_y, mySize_y);
+
+       // bottom/right screen edges
+       mySize_x = min(vid_conwidth - myPos_x, mySize_x); 
+       mySize_y = min(vid_conheight - myPos_y, mySize_y); 
+
        if(cvar("hud_configure_checkcollisions")) {
+               oldPos = myPos;
                mySize = HUD_Panel_CheckResize(id, myPos, mySize);
-               myPos = HUD_Panel_CheckMove(id, myPos, mySize);
+               myPos = HUD_Panel_CheckMove(id, myPos, mySize); // touching myPos won't do anything... unless we make it change mySize somehow, see next line
+               mySize = mySize - myPos + oldPos; // TODO: this is still borked in some situations :(
        }
 
-       mySize_x = bound(0.025 * vid_conwidth, mySize_x, vid_conwidth - myPos_x);
-       mySize_y = bound(0.025 * vid_conheight, mySize_y, vid_conheight - myPos_y);
-
-       if(oldSize_x == mySize_x)
-               myPos_x = oldPos_x;
-       if(oldSize_y == mySize_y)
-               myPos_y = oldPos_y;
-
-       myPos_x = bound(0, myPos_x, vid_conwidth - mySize_x);
-       myPos_y = bound(0, myPos_y, vid_conheight - mySize_y);
-
        if(cvar("hud_configure_grid"))
        {
-               myPos_x = floor(myPos_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x");
-               myPos_y = floor(myPos_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y");
+               mySize_x = floor(mySize_x/cvar("hud_configure_grid_x") + 0.5) * cvar("hud_configure_grid_x");
+               mySize_y = floor(mySize_y/cvar("hud_configure_grid_y") + 0.5) * cvar("hud_configure_grid_y");
        }
 
-       if (myPos_x + 0.5 * mySize_x > 0.5 * vid_conwidth)
-               myPos_x = myPos_x - vid_conwidth;
-       if (myPos_y + 0.5 * mySize_y > 0.5 * vid_conheight)
-               myPos_y = myPos_y - vid_conheight;
-       */
+       // do another pos check, as size might have changed by now
+       if(resizeCorner == 1) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 2) {
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y - mySize_y;
+       } else if(resizeCorner == 3) {
+               myPos_x = resizeorigin_x - mySize_x;
+               myPos_y = resizeorigin_y;
+       } else { // resizeCorner == 4
+               myPos_x = resizeorigin_x;
+               myPos_y = resizeorigin_y;
+       }
 
        string s;
        s = strcat(ftos(mySize_x/vid_conwidth), " ", ftos(mySize_y/vid_conheight));
@@ -1106,12 +1157,6 @@ float HUD_Panel_InputEvent(float bInputType, float nPrimary, float nSecondary)
        return false;
 }
 
-// get rid of mouseprevpos, it was a terrible idea TODO
-vector mousepos, mouseprevpos;
-vector panel_click_distance; // mouse cursor distance from the top left corner of the panel (saved only upon a click)
-vector panel_click_resizeorigin; // coordinates for opposite point when resizing
-float highlightedPanel;
-float highlightedAction; // 0 = nothing, 1 = move, 2 = resize
 void HUD_Panel_Mouse()
 {
        if(mouseClicked == 0) {
@@ -1178,28 +1223,35 @@ void HUD_Panel_Mouse()
                        {
                                if(prevMouseClicked == 0)
                                {
-                                       panel_click_distance = mousepos - panelPos;
-                                       if(highlightedAction == 2)
+                                       if(highlightedAction == 1)
+                                               panel_click_distance = mousepos - panelPos;
+                                       else if(highlightedAction == 2)
                                        {
-                                               if(resizeCorner == 1)
+                                               if(resizeCorner == 1) {
+                                                       panel_click_distance = mousepos - panelPos;
                                                        panel_click_resizeorigin = panelPos + panelSize;
-                                               else if(resizeCorner == 2)
+                                               } else if(resizeCorner == 2) {
+                                                       panel_click_distance_x = panelSize_x - mousepos_x + panelPos_x;
+                                                       panel_click_distance_y = mousepos_y - panelPos_y;
                                                        panel_click_resizeorigin = panelPos + eY * panelSize_y;
-                                               else if(resizeCorner == 3)
+                                               } else if(resizeCorner == 3) {
+                                                       panel_click_distance_x = mousepos_x - panelPos_x;
+                                                       panel_click_distance_y = panelSize_y - mousepos_y + panelPos_y;
                                                        panel_click_resizeorigin = panelPos + eX * panelSize_x;
-                                               else if(resizeCorner == 4)
+                                               } else if(resizeCorner == 4) {
+                                                       panel_click_distance = panelSize - mousepos + panelPos;
                                                        panel_click_resizeorigin = panelPos;
+                                               }
                                        }       
                                }
 
                                if(highlightedAction == 1)
                                        HUD_Panel_SetPos(i, mousepos - panel_click_distance);
                                else if(highlightedAction == 2)
-                                       HUD_Panel_SetPosSize(i, mousepos - panel_click_distance, panel_click_resizeorigin);
+                                       HUD_Panel_SetPosSize(i, panel_click_resizeorigin);
                        }
                }
        }
-       mouseprevpos = mousepos;
        prevMouseClicked = mouseClicked;
 }
 
@@ -1946,6 +1998,329 @@ void HUD_HealthArmor(void)
 // ___TODO___ !!!
 // Notification area (#4)
 //
+
+string Weapon_SuicideMessage(float deathtype)
+{
+       float w;
+       w = DEATH_WEAPONOF(deathtype);
+
+       switch (w)
+       {
+               case 1:
+                       return "lasered himself to hell";
+               case 2:
+                       return "did the impossible";
+               case 3:
+                       return "did the impossible";
+               case 4:
+                       if(deathtype & HITTYPE_SECONDARY)
+                               return "tried out his own grenade";
+                       return "detonated";
+       }
+       // TODO: was blasted by?
+       return strcat("[no kill message for weapon ", ftos(w), "!]");
+}
+
+string Weapon_KillMessage(float deathtype)
+{
+       float w;
+       w = DEATH_WEAPONOF(deathtype);
+
+       switch (w)
+       {
+               case 1:
+                       return "was lasered to death by";
+               case 2:
+                       return "was gunned by";
+               case 3:
+                       if(id & HITTYPE_SECONDARY)
+                               return "was sniped by";
+                       return "was riddled full of holes by";
+               case 4:
+                       if(id & HITTYPE_BOUNCE)
+                               return "didn't see #'s grenade";
+                       return "almost dodged #'s grenade";
+       }
+       return strcat("[no suicide message for weapon ", ftos(w), "!]");
+}
+
+float killnotify_times[10];
+float killnotify_weapons[10];
+string killnotify_attackers[10];
+string killnotify_victims[10];
+void HUD_KillNotify_Push(string attacker, string victim, float wpn)
+{
+       float i;
+       for (i = 9; i > 0; --i) {
+               killnotify_times[i] = killnotify_times[i-1];
+               killnotify_weapons[i] = killnotify_weapons[i-1];
+               killnotify_attackers[i] = killnotify_attackers[i-1];
+               killnotify_victims[i] = killnotify_victims[i-1];
+       }
+       killnotify_times[0] = time;
+       killnotify_weapons[0] = wpn;
+       killnotify_attackers[0] = attacker;
+       killnotify_victims[0] = victim;
+}
+
+void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
+{
+       if(msg == MSG_SUICIDE) {
+               // TODO: cl_gentle
+               // TODO: way of finding out secondary?
+               print("deathtype: ", ftos(type), "\n");
+
+               float w;
+               w = DEATH_WEAPONOF(type);
+               if(WEP_VALID(w)) {
+                       HUD_KillNotify_Push(s1, "", w);
+                       if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print"))
+                               print("^1", s1, "^1 ", Weapon_SuicideMessage(type), "\n");
+               }
+               else if (type == DEATH_KILL)
+                       print ("^1",s1, "^1 couldn't take it anymore\n");
+               else if (type == DEATH_ROT)
+                       print ("^1",s1, "^1 died\n");
+               else if (type == DEATH_NOAMMO)
+                       print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n");
+               else if (type == DEATH_CAMP)
+                       print ("^1",s1, "^1 thought they found a nice camping ground\n");
+               else if (type == DEATH_MIRRORDAMAGE)
+                       print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n");
+               else if (type == DEATH_CHEAT)
+                       print ("^1",s1, "^1 unfairly eliminated themself\n");
+               else if (type == DEATH_FIRE)
+                       print ("^1",s1, "^1 burned to death\n");
+               else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET)
+                       print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n");
+               if (stof(s2) > 2) // killcount > 2
+                       print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
+       } else if(msg == MSG_KILL) {
+               print("deathtype: ", ftos(type), "\n");
+
+               float w;
+               w = DEATH_WEAPONOF(type);
+               if(WEP_VALID(w)) {
+                       HUD_KillNotify_Push(s1, s2, w);
+                       if (!HUD_Panel_CheckActive(4) || cvar("hud_notify_print"))
+                               print("^1", s1, "^1 ", Weapon_KillMessage(type), "\n");
+               }
+               else if(type == KILL_TEAM || type == KILL_TEAM_SPREE) {
+                               if(cvar("cl_gentle")) {
+                                       print ("^1", s1, "^1 took action against a team mate\n");
+                               } else {
+                                       print ("^1", s1, "^1 mows down a team mate\n");
+                               }
+                               if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {
+                                       if(cvar("cl_gentle"))
+                                               print ("^1",s1,"^1 ended a ",s2," scoring spree by going against a team mate\n");
+                                       else
+                                               print ("^1",s1,"^1 ended a ",s2," kill spree by killing a team mate\n");
+                               }
+                               else if (stof(s2) > 2) {
+                                       if(cvar("cl_gentle"))
+                                               print ("^1",s1,"'s ^1",s2," scoring spree was ended by a team mate!\n");
+                                       else
+                                               print ("^1",s1,"'s ^1",s2," kill spree was ended by a team mate!\n");
+                               }
+               }
+               else if(type == KILL_FIRST_BLOOD)
+                       print("^1",s1, "^1 drew first blood", "\n");
+               else if (type == DEATH_TELEFRAG)
+                       print ("^1",s1, "^1 was telefragged by ", s2, "\n");
+               else if (type == DEATH_DROWN)
+                       print ("^1",s1, "^1 was drowned by ", s2, "\n");
+               else if (type == DEATH_SLIME)
+                       print ("^1",s1, "^1 was slimed by ", s2, "\n");
+               else if (type == DEATH_LAVA)
+                       print ("^1",s1, "^1 was cooked by ", s2, "\n");
+               else if (type == DEATH_FALL)
+                       print ("^1",s1, "^1 was grounded by ", s2, "\n");
+               else if (type == DEATH_SHOOTING_STAR)
+                       print ("^1",s1, "^1 was shot into space by ", s2, "\n");
+               else if (type == DEATH_SWAMP)
+                       print ("^1",s1, "^1 was conserved by ", s2, "\n");
+               // TODO
+               /*else if (type == DEATH_HURTTRIGGER && inflictor.msg2 != "")
+               {
+                       print("^1", s1, "^1 ", s2, "^1", s3, "\n");
+               }*/
+               else if(type == DEATH_SBCRUSH)
+                       print ("^1",s1, "^1 was crushed by ^1", s2, "\n");
+               else if(type == DEATH_SBMINIGUN)
+                       print ("^1",s1, "^1 got shredded by ^1", s2, "\n");
+               else if(type == DEATH_SBROCKET)
+                       print ("^1",s1, "^1 was blased to bits by ^1", s2, "\n");
+               else if(type == DEATH_SBBLOWUP)
+                       print ("^1",s1, "^1 got cought in the destruction of ^1", s2, "'s vehicle\n");
+
+               else if(type == DEATH_WAKIGUN)
+                       print ("^1",s1, "^1 was bolted down by ^1", s2, "\n");
+               else if(type == DEATH_WAKIROCKET)
+                       print ("^1",s1, "^1 could find no shelter from ^1", s2, "'s rockets\n");
+               else if(type == DEATH_WAKIBLOWUP)
+                       print ("^1",s1, "^1 dies when ^1", s2, "'s wakizashi dies.\n");
+
+               else if(type == DEATH_TURRET)
+                       print ("^1",s1, "^1 was pushed into the line of fire by ^1", s2, "\n");
+               else if(type == DEATH_TOUCHEXPLODE)
+                       print ("^1",s1, "^1 was pushed into an accident by ^1", s2, "\n");
+               else if(type == DEATH_CHEAT)
+                       print ("^1",s1, "^1 was unfairly eliminated by ^1", s2, "\n");
+               else if (type == DEATH_FIRE)
+                       print ("^1",s1, "^1 was burnt to death by ^1", s2, "\n");
+               else if (type == DEATH_CUSTOM)
+                       print ("^1",s1, "^1 ", s2, "\n");
+               else
+                       print ("^1",s1, "^1 was fragged by ", s2, "\n");
+       } else if(msg == MSG_SPREE) {
+               if(type == KILL_END_SPREE) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1,"'s ^1", s2, " scoring spree was ended by ", s3, "\n");
+                       else
+                               print ("^1",s1,"'s ^1", s2, " kill spree was ended by ", s3, "\n");
+               } else if(type == KILL_SPREE) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1,"^1 made ",s2," scores in a row\n");
+                       else
+                               print ("^1",s1,"^1 has ",s2," frags in a row\n");
+               } else if(type == KILL_SPREE_3) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made a ^1TRIPLE SCORE\n");
+                       else
+                               print (s1,"^7 made a ^1TRIPLE FRAG\n");
+               } else if(type == KILL_SPREE_5) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 unleashes ^1SCORING RAGE\n");
+                       else
+                               print (s1,"^7 unleashes ^1RAGE\n");
+               } else if(type == KILL_SPREE_10) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TEN SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 starts the ^1MASSACRE!\n");
+               } else if(type == KILL_SPREE_15) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1FIFTEEN SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 executes ^1MAYHEM!\n");
+               } else if(type == KILL_SPREE_20) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TWENTY SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 is a ^1BERSERKER!\n");
+               } else if(type == KILL_SPREE_25) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1TWENTY FIFE SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 inflicts ^1CARNAGE!\n");
+               } else if(type == KILL_SPREE_30) {
+                       if(cvar("cl_gentle"))
+                               print (s1,"^7 made ^1THIRTY SCORES IN A ROW!\n");
+                       else
+                               print (s1,"^7 unleashes ^1ARMAGEDDON!\n");
+               }
+       } else if(msg == MSG_KILL_ACTION) { // wtf is this? isnt it basically the same as MSG_SUICIDE?
+               if (type == DEATH_DROWN) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 was in the water for too long\n");
+                       else
+                               print ("^1",s1, "^1 drowned\n");
+               }
+               else if (type == DEATH_SLIME)
+                       print ("^1",s1, "^1 was slimed\n");
+               else if (type == DEATH_LAVA) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 found a hot place\n");
+                       else
+                               print ("^1",s1, "^1 turned into hot slag\n");
+               }
+               else if (type == DEATH_FALL) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 tested gravity (and it worked)\n");
+                       else
+                               print ("^1",s1, "^1 hit the ground with a crunch\n");
+               }
+               else if (type == DEATH_SHOOTING_STAR)
+                       print ("^1",s1, "^1 became a shooting star\n");
+               else if (type == DEATH_SWAMP) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 discovered a swamp\n");
+                       else
+                               print ("^1",s1, "^1 is now conserved for centuries to come\n");
+               }
+               else if(type == DEATH_TURRET)
+                       print ("^1",s1, "^1 was mowed down by a turret \n");
+               else if (type == DEATH_CUSTOM)
+                       print ("^1",s1, "^1 ", s2, "\n");
+               else if(type == DEATH_TOUCHEXPLODE)
+                       print ("^1",s1, "^1 died in an accident\n");
+               else if(type == DEATH_CHEAT)
+                       print ("^1",s1, "^1 was unfairly eliminated\n");
+               else if(type == DEATH_FIRE) {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 felt a little hot\n");
+                       else
+                               print ("^1",s1, "^1 burnt to death\n");
+               }
+               else {
+                       if(cvar("cl_gentle"))
+                               print ("^1",s1, "^1 needs a restart\n");
+                       else
+                               print ("^1",s1, "^1 died\n");
+               }
+       } else if(msg == MSG_KILL_ACTION_SPREE) {
+               if(cvar("cl_gentle"))
+                       print ("^1",s1,"^1 needs a restart after a ",s2," scoring spree\n");
+               else
+                       print ("^1",s1,"^1 died with a ",s2," kill spree\n");
+       }
+}
+
+#define DAMAGE_CENTERPRINT_SPACER NEWLINES
+
+void HUD_Centerprint(string s1, float type)
+{
+       if (type == DEATH_TEAMCHANGE) {
+               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You are now on: ", s1));
+       } else if (type == DEATH_AUTOTEAMCHANGE) {
+               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "You have been moved into a different team to improve team balance\nYou are now on: ", s1));
+       } else if (type == DEATH_CAMP) {
+               if(cvar("cl_gentle"))
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Reconsider your tactics, camper!"));
+               else
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Die camper!"));
+       } else if (type == DEATH_NOAMMO) {
+               if(cvar("cl_gentle"))
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You are reinserted into the game for running out of ammo..."));
+               else
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were killed for running out of ammo..."));
+       } else if (type == DEATH_ROT) {
+               if(cvar("cl_gentle"))
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to preserve your health"));
+               else
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You grew too old without taking your medicine"));
+       } else if (type == DEATH_MIRRORDAMAGE) {
+               if(cvar("cl_gentle"))
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't go against team mates!"));
+               else
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Don't shoot your team mates!"));
+       } else if (type == DEATH_QUIET) {
+               // do nothing
+       } else if (type == DEATH_KILL) {
+               if(cvar("cl_gentle"))
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You need to be more careful!"));
+               else
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You killed your own dumb self!"));
+       } else if (type == KILL_TEAM) {
+               if(cvar("cl_gentle")) {
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You went against a team mate!"));
+               } else {
+                       centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1Moron! You fragged ", s1, ", a team mate!"));
+               }
+       }
+}
+
 void HUD_Notify (void)
 {
        float id = 4;
@@ -1962,6 +2337,16 @@ void HUD_Notify (void)
                mySize -= '2 2 0' * padding;
        }
 
+       float entries;
+       entries = 4 * mySize_y/mySize_x;
+       float i;
+       for(i = 0; i <= entries; ++i)
+       {
+               drawcolorcodedstring(pos + eY * i * (mySize_y/entries),killnotify_attackers[i], '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.35 * mySize_x + eY * i * (mySize_y/entries),ftos(killnotify_weapons[i]), '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL);
+               drawcolorcodedstring(pos + eX * 0.75 * mySize_x + eY * i * (mySize_y/entries),killnotify_victims[i], '1 1 0' * (mySize_y/entries), hud_alpha_fg, DRAWFLAG_NORMAL);
+       }
+       /* This will come later.
        string s;
        entity tm;
        if(spectatee_status && !intermission)
@@ -2077,6 +2462,7 @@ void HUD_Notify (void)
                        }
                }
        }
+       */
 }
 
 // Timer (#5)
@@ -2162,7 +2548,7 @@ void HUD_Radar(void)
        float scale2d, normalsize, bigsize;
        float f;
 
-       teamradar_origin2d = pos + 0.5 * mySize; // TODO: stupid compat, should be removed (hint: code seems to assume origin to be in center, where panelhud code uses pos as topleft pixel)
+       teamradar_origin2d = pos + 0.5 * mySize;
        teamradar_size2d = mySize;
 
        if(minimapname == "")
@@ -3224,6 +3610,23 @@ void HUD_Main (void)
        hud_configure = cvar("_hud_configure");
 
        // Drawing stuff
+
+       // HUD configure visible grid
+       if(hud_configure && cvar("hud_configure_grid") && cvar("hud_configure_grid_alpha"))
+       {
+               float i;
+               // x-axis
+               for(i = 0; i < vid_conwidth/cvar("hud_configure_grid_x"); ++i)
+               {
+                       drawfill(eX * i * cvar("hud_configure_grid_x"), eX + eY * vid_conheight, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+               }
+               // y-axis
+               for(i = 0; i < vid_conheight/cvar("hud_configure_grid_y"); ++i)
+               {
+                       drawfill(eY * i * cvar("hud_configure_grid_y"), eY + eX * vid_conwidth, '0.5 0.5 0.5', cvar("hud_configure_grid_alpha"), DRAWFLAG_NORMAL);
+               }
+       }
+
        if(cvar_string("hud_dock") != "")
                drawpic_skin('0 0 0', cvar_string("hud_dock"), eX * vid_conwidth + eY * vid_conheight, HUD_Panel_Dock_GetColor(), cvar("hud_dock_alpha"), DRAWFLAG_NORMAL);