Allow some NPCs to blink, and update various legacy setunitdata()

33 files changed, 169 insertions, 136 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 1b1381659..4b6bf312a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -6481,7 +6481,7 @@ item_db: (
 {
     Id: 1318
     AegisName: "UglyChristmasSweater"
-    Name: "Tneck Sweater"
+    Name: "Christmas Sweater"
     Type: "IT_ARMOR"
     Buy: 12000
     Sell: 800
@@ -10369,6 +10369,27 @@ item_db: (
     Sprite: 0
 },
 {
+    Id: 2984
+    AegisName: "NPCEyes"
+    Name: "NPC Blinking Eyes"
+    Type: "IT_ARMOR"
+    Buy: 320000
+    Sell: 1
+    Weight: 200
+    Def: -100
+    Range: 0
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 150
+    Refine: false
+    ViewSprite: 2984
+    BindOnEquip: false
+    BuyingStore: true
+    Delay: 0
+    Sprite: 0
+},
+{
     Id: 3200
     AegisName: "Shemagh"
     Name: "Shemagh"
diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt
index 4f66bbca9..dbac830c3 100644
--- a/npc/001-1/bgmaster.txt
+++ b/npc/001-1/bgmaster.txt
@@ -11,7 +11,7 @@
     if ($@BGMaster1) goto L_Busy;
 
 L_Intro:
-    mesq l("Hello! I am Cassia, Ambassator. During the Monster War outbreak, Halinarzo felt.");
+    mesq l("Hello! I am Cassia, Ambassator. During the Monster War outbreak, Halinarzo was almost entirely destroyed.");
     next;
     mesq l("To train their soldiers, they frequently face Frostia in duels. Adventurers are welcome to join their drills.");
     next;
@@ -143,9 +143,9 @@ OnVictor2:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1322); // Dress
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2204); // Not needed
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
+    setunitdata(.@npcId, UDT_HEADTOP, GMRobe); // Dress
+    setunitdata(.@npcId, UDT_HEADMIDDLE, NPCEyes); // Not needed
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
     setunitdata(.@npcId, UDT_WEAPON, 3501);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
@@ -240,10 +240,10 @@ OnSet:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1312); // Light armor
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2212); // Pants
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501);
+    setunitdata(.@npcId, UDT_HEADTOP, LightPlatemail); // Light armor
+    setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
+    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
@@ -266,10 +266,10 @@ OnSet:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1311); // Terranite armor
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2212); // Pants
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501);
+    setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor); // Terranite armor
+    setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
+    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 13);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt
index e879c7148..41ec2c5ab 100644
--- a/npc/001-1/rewards.txt
+++ b/npc/001-1/rewards.txt
@@ -20,10 +20,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 2935);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1329);
-    setunitdata(.@npcId, UDT_WEAPON, 2204);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1801);
+    setunitdata(.@npcId, UDT_HEADTOP, TopHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, GoldenWarlordPlate);
+    setunitdata(.@npcId, UDT_WEAPON, JeansChaps);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, AssassinBoots);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 25);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
 
diff --git a/npc/003-1-3/thief.txt b/npc/003-1-3/thief.txt
index 36bf75f0c..9e3fd46e0 100644
--- a/npc/003-1-3/thief.txt
+++ b/npc/003-1-3/thief.txt
@@ -30,9 +30,9 @@ L_Warp:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1308); // Dress
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2204); // 2214 FIXME
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
+    setunitdata(.@npcId, UDT_HEADTOP, ForestArmor); // Dress
+    setunitdata(.@npcId, UDT_HEADMIDDLE, JeansChaps); // 2214 FIXME
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
     setunitdata(.@npcId, UDT_WEAPON, 3501); // We should use a hood instead
     setunitdata(.@npcId, UDT_HAIRSTYLE, 8);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 3b8fd7a10..748f4a09e 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -76,10 +76,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 3);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 3);
 
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index 97a9e685a..3ef4b1c56 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -11,11 +11,11 @@
 
 
 OnInit:
-    .@npcId = getnpcid(0, "Ched");
-    setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
-    setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, SamuraiHelmet);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/003-1/cyndala.txt b/npc/003-1/cyndala.txt
index 9fd6e4620..a4dc4c92d 100644
--- a/npc/003-1/cyndala.txt
+++ b/npc/003-1/cyndala.txt
@@ -147,10 +147,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); //TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 16);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
 
diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index 60e9e1b6f..9dc6ad9dd 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -86,10 +86,10 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, "Gladys");
-    setunitdata(.@npcId, UDT_HEADTOP, 2921);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, TrapperHat); // Whaaaaaaaaat
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 20);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 20);
 
diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt
index 38129c45d..8c05e6a3e 100644
--- a/npc/003-1/inac.txt
+++ b/npc/003-1/inac.txt
@@ -8,11 +8,11 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Inac");
-    setunitdata(.@npcId, UDT_HEADTOP, 2900);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1301);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, Bandana);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt
index 862502fc5..31de35a39 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -21,10 +21,10 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    //setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
+    //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 4);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 1);
 
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 4aaf96869..7e6b26f77 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -202,10 +202,10 @@ L_Give_all:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 4);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
 
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index c18662f3a..436ef75e1 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -1,3 +1,4 @@
+// TMW2 Script.
 // Author:
 //    Jesusalva
 
@@ -13,10 +14,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1320); 
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // I prefer 1801 but the short doesn't match
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, VneckSweater);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // I prefer 1801 but the short doesn't match
     setunitdata(.@npcId, UDT_HAIRSTYLE, 17);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 19);
 
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index be576cb16..6d5a35b24 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -8,10 +8,10 @@ hello;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 24);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
 
diff --git a/npc/003-1/jerican.txt b/npc/003-1/jerican.txt
index 903ed4f79..2fbcc0ebe 100644
--- a/npc/003-1/jerican.txt
+++ b/npc/003-1/jerican.txt
@@ -1,5 +1,8 @@
+// TMW-2 Script
 // Author:
 //    Saulc
+// Description:
+//    An NPC in need of a quest
 
 003-1,93,125,0	script	Jerican	NPC_PLAYER,{
 
@@ -8,10 +11,10 @@ hello;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1308); // FIXME: 1307 broken
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2205); // FIXME: 2204 broken
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor); // Maybe Bromenal Chest? ...Who is Jerican anyway?
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonShorts); // Maybe LeatherTrousers?
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 3);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 9);
 
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 8eba3b95e..b4470bddb 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -272,13 +272,14 @@ OnTimer1000:
 
 OnInit:
 
-    // Check items.xml for info about this
+    // Check items.xml for info about this.
+    // NOTE: Why Dausen item list is on Philip...?
     .@npcId = getnpcid(0, "Lieutenant Dausen");
-    setunitdata(.@npcId, UDT_HEADTOP, 2906);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1304);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
-    setunitdata(.@npcId, UDT_SHIELD, 1800);    // TODO FIXME: Display Boots
-    setunitdata(.@npcId, UDT_WEAPON, 3504);
+    setunitdata(.@npcId, UDT_HEADTOP, Bull);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionTrainingShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
+    setunitdata(.@npcId, UDT_SHIELD, LousyMoccasins);    // TODO FIXME: Display Boots
+    setunitdata(.@npcId, UDT_WEAPON, ArtisBacksword);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 0b3962d6c..2eadf0507 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -23,10 +23,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1308);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
-    setunitdata(.@npcId, UDT_WEAPON, 1802);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
 
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index 0aa508292..cd00763d8 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -46,11 +46,11 @@ OnInit:
     .sex = G_MALE;
     .distance = 7;
 
-    .@npcId = getnpcid(0, "Mahoud");
+    .@npcId = getnpcid(0, .name$);
     // Check items.xml for info about this
-    setunitdata(.@npcId, UDT_HEADTOP, 2911);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1303);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
+    setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt
index 4ad7b0a95..a893d8d57 100644
--- a/npc/003-1/malivox.txt
+++ b/npc/003-1/malivox.txt
@@ -86,11 +86,11 @@ L_Quit:
     goodbye;
 
 OnInit:
-    .@npcId = getnpcid(0, "Malivox");
-    setunitdata(.@npcId, UDT_HEADTOP, 2902);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1303);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2203);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, FancyHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index e85277990..591cb59d0 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -6,21 +6,15 @@
 
 003-1,103,106,0	script	Neko	NPC_PLAYER,{
 
-if (getgmlevel()) goto L_Debug;
 hello;
 
-L_Debug:
-    if (MPQUEST < 1) mes "Not on MPQUEST";
-    mes l("You have: @@ Mob Points", str(Mobpt));
-    close;
 
 OnInit:
-    .@npcId = getnpcid(0, "Neko");
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1314); // TODO 1314 is now BROKEN
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1801); // FIXME: 1801 IS BROKEN!
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
+    //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // FIXME: LeatherTrousers are BROKEN!
+    setunitdata(.@npcId, UDT_WEAPON, AssassinBoots);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
 
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 9a6fdd244..628922c38 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -135,12 +135,13 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1318);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
-    setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 27);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+    npcsit;
 
     .sex = G_FEMALE;
     .distance = 5;
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 809656038..46df41ab2 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -75,10 +75,10 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1311);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
-    setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, RaidTrousers);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 19);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 16);
 
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 606b6db70..fada31675 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -11,10 +11,10 @@ end;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1800);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
+    //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
 
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 306056b84..4c7d0f82a 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -71,10 +71,10 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1307);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADTOP, BromenalChest);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
 
diff --git a/npc/003-1/tinris.txt b/npc/003-1/tinris.txt
index 972891192..a96566818 100644
--- a/npc/003-1/tinris.txt
+++ b/npc/003-1/tinris.txt
@@ -1,3 +1,4 @@
+// TMW2 Script
 // Author:
 //    Saulc
 
@@ -13,11 +14,11 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(0, "Tinris");
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1308);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    .@npcId = getnpcid(0, .name$);
+    //setunitdata(.@npcId, UDT_HEADTOP, 2929); // TODO: This NPC is an Elf and therefore, CANNOT use NPCEyes.
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 3);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 19);
 
diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt
index 0f9414d02..151a88bd3 100644
--- a/npc/003-13/arnea.txt
+++ b/npc/003-13/arnea.txt
@@ -6,6 +6,10 @@
 //    Arena for Duels and PVP (temporary map)
 
 003-13,29,29,0	script	Arnea#003-13	NPC_ELF_F,{
+    // FIXIT
+    hello;
+    end;
+
     mes "npc name: " + .name$;
     mes "npc ext name: " + .extname$;
     mes "npc id: " + .id;
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index c7177951e..28d1c3042 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -83,9 +83,9 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1300);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
+    setunitdata(.@npcId, UDT_HEADTOP, BowlerHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
     setunitdata(.@npcId, UDT_WEAPON, 1800);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt
index 0f0db3336..e35c35734 100644
--- a/npc/003-2/lua.txt
+++ b/npc/003-2/lua.txt
@@ -94,10 +94,10 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 1322); // Dress
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 2204); // Not needed
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 1800); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, GMRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins);
+    setunitdata(.@npcId, UDT_WEAPON, PiouSlayer);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
 
diff --git a/npc/003-5/arnea.txt b/npc/003-5/arnea.txt
index 055f2f3e7..eeb95f1e3 100644
--- a/npc/003-5/arnea.txt
+++ b/npc/003-5/arnea.txt
@@ -6,6 +6,10 @@
 //    Arena for Duels and PVP (003-13,31,31)
 
 003-5,33,37,0	script	Arnea	NPC_ELF_F,{
+    // FiXIT
+    hello;
+    end;
+
     if (DESTROY_ME) {
         DESTROY_ME=0;
         instance_destroy(DESTROY_MY_ID);
diff --git a/npc/004-1/elanore.txt b/npc/004-1/elanore.txt
index 9bac704b6..aa79f8da0 100644
--- a/npc/004-1/elanore.txt
+++ b/npc/004-1/elanore.txt
@@ -120,9 +120,9 @@ L_Close:
 OnInit:
     .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1317);
-    //setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 8);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 17);
 
diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt
index 779e88563..7368804de 100644
--- a/npc/005-1/vincent.txt
+++ b/npc/005-1/vincent.txt
@@ -61,9 +61,10 @@ L_QuestDone:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1300);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2200);
-    setunitdata(.@npcId, UDT_WEAPON, 1800);
+    setunitdata(.@npcId, UDT_HEADTOP, CreasedShirt);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShorts);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 25);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 4);
 
diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt
index e17a23770..baf6a8b40 100644
--- a/npc/005-5/nylo.txt
+++ b/npc/005-5/nylo.txt
@@ -163,11 +163,11 @@
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1321);
-    //setunitdata(.@npcId, UDT_HEADBOTTOM, 2217);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1300);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2200);
-    setunitdata(.@npcId, UDT_WEAPON, 1803);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1321); // Maybe Nylo could use the whole Candor set...
+    setunitdata(.@npcId, UDT_HEADTOP, CreasedShirt);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShorts);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
 
diff --git a/npc/005-7/nurse.txt b/npc/005-7/nurse.txt
index 202bf62c7..78b42c29f 100644
--- a/npc/005-7/nurse.txt
+++ b/npc/005-7/nurse.txt
@@ -132,8 +132,9 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    // I got lazy and NPC is behind a desk, so only a "shirt"...
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1313);
+    // I got lazy and NPC is behind a desk... So... :hides:
+    setunitdata(.@npcId, UDT_HEADMIDDLE, ShortTankTop);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 14);
 
diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt
index 531ceb8b6..c1ba4735f 100644
--- a/npc/005-7/trainer.txt
+++ b/npc/005-7/trainer.txt
@@ -506,9 +506,10 @@ OnKillManaBug:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1314);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    setunitdata(.@npcId, UDT_WEAPON, 1802);
+    setunitdata(.@npcId, UDT_HEADTOP, LeatherShirt);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 20);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 7);