Zax wasn't being rendered properly; This fixes it and add a bit of flavor.

2 files changed, 17 insertions, 9 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 4ebf97ae..e9cc8271 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3160,6 +3160,9 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC429:429
 	NPC430:430
 	NPC431:431
+	NPC432:432
+	NPC433:433
+	NPC434:434
 	NPC32767:32767
 
 	// NPCs decently named
diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index f737b38c..a645351b 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -132,6 +132,7 @@ OnAbort:
     killmonster "099-4", "all";
     setmapmask "099-4", 1;
     setmapmask "099-5", 1;
+    setnpcdisplay "Zax De'Kagen#0", NPC432;
     disablenpc "Gema III";
     disablenpc "Flying Ship";
     disablenpc "Jande#0";
@@ -384,6 +385,7 @@ OnPrologue1:
     // set the sprite (implies enablenpc)
     // FIXME - Can we still use mobid here? Also: fakenpcname() deprecated!
     enablenpc "Zax De'Kagen#0";
+    setnpcdisplay "Zax De'Kagen#0", NPC432;
     mapannounce "099-5", "Zax De'Kagen : What is that, a bunch of Talpans in my domains?" , 0;
     mapannounce "099-4", "Zax De'Kagen : What is that, a bunch of Talpans in my domains?" , 0;
     npctalk "What is that, a bunch of Talpans in my domains?", "Zax De'Kagen#0";
@@ -517,6 +519,7 @@ OnShowdown0:
     areatimer 0, "099-4", 20, 20, 75, 75, 10, "#TMWFinalExam::OnMTReward41";
     disablenpc "Xakelbael the Dark#0";
     enablenpc "Zax De'Kagen#0";
+    setnpcdisplay "Zax De'Kagen#0", NPC432;
 
     mapannounce "099-5", "Zax De'Kagen : Hah...! That was a good workout!" , 0;
     mapannounce "099-4", "Zax De'Kagen : Hah...! That was a good workout!" , 0;
@@ -535,19 +538,20 @@ OnShowdown1:
     end;
 
 OnShowdown2:
-    $@DD5_TPASSED = (gettimetick(2)-$@DD5_BEGIN);
-    $@DD5_TSPENT$ = $@DD5_TPASSED/60+" minute(s) and "+$@DD5_TPASSED%60+" second(s)";
+    .@DD5_TPASSED = (gettimetick(2)-$@DD5_BEGIN);
+    .@DD5_TSPENT$ = $@DD5_TPASSED/60+" minute(s) and "+$@DD5_TPASSED%60+" second(s)";
     // FIXME: Use FuzzyTime()
-    mapannounce "099-5", "Zax De'Kagen : Well, we still have time! Only "+$@DD5_TSPENT$+" passed!" , 0;
-    mapannounce "099-4", "Zax De'Kagen : Well, we still have time! Only "+$@DD5_TSPENT$+" passed!" , 0;
-    npctalk2 "Zax De'Kagen#0", "Well, we still have time! Only "+$@DD5_TSPENT$+" passed!";
+    mapannounce "099-5", "Zax De'Kagen : Well, we still have time! Only "+.@DD5_TSPENT$+" passed!" , 0;
+    mapannounce "099-4", "Zax De'Kagen : Well, we still have time! Only "+.@DD5_TSPENT$+" passed!" , 0;
+    npctalk2 "Zax De'Kagen#0", "Well, we still have time! Only "+.@DD5_TSPENT$+" passed!";
 
-    $@DD5_TPASSED = 0;
-    $@DD5_TSPENT$ = "";
+    .@DD5_TPASSED = 0;
+    .@DD5_TSPENT$ = "";
     addnpctimer 10000, "#TMWFinalExam::OnShowdown3";
     end;
 
 OnShowdown3:
+    setnpcdisplay "Zax De'Kagen#0", NPC434;
     mapannounce "099-5", "Zax De'Kagen : I will now acknowledge your strength and fight for realz." , 0;
     mapannounce "099-4", "Zax De'Kagen : I will now acknowledge your strength and fight for realz." , 0;
     npctalk2 "Zax De'Kagen#0", "I will now acknowledge your strength and fight for realz.";
@@ -745,6 +749,7 @@ OnEpilogue4:
     end;
 
 OnEpilogue5:
+    setnpcdisplay "Zax De'Kagen#0", NPC432;
     disablenpc "Zax De'Kagen#0";
     disablenpc "Flying Ship";
 
@@ -1457,7 +1462,7 @@ OnInit:
     disablenpc "Gema III";
     end;
 }
-099-5,50,49,0	script	Xakelbael the Dark#0	NPC400,{
+099-5,50,49,0	script	Xakelbael the Dark#0	NPC433,{
     end;
 OnInit:
     disablenpc "Xakelbael the Dark#0";
@@ -1476,7 +1481,7 @@ OnDisable:
     end;
 }
 
-099-5,50,49,0	script	Zax De'Kagen#0	NPC400,{
+099-5,50,49,0	script	Zax De'Kagen#0	NPC432,{
     end;
 OnInit:
     disablenpc "Zax De'Kagen#0";