NPC Eyes does not work globably because... ... ...

12 files changed, 37 insertions, 11 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index def677159..76d146196 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -10978,6 +10978,32 @@ item_db: (
 		bonus bDef2, 3;
 	">
 },
+{
+	Id: 3025
+	AegisName: "NPCEyesD"
+	Name: "NPC Blinking Eyes 2"
+	Type: "IT_ARMOR"
+	Buy: 320000
+	Sell: 1
+	Weight: 200
+	Def: -100
+	Loc: "EQP_HEAD_TOP"
+	EquipLv: 150
+	Refine: false
+},
+{
+	Id: 3026
+	AegisName: "NPCEyesT"
+	Name: "NPC Blinking Eyes 3"
+	Type: "IT_ARMOR"
+	Buy: 320000
+	Sell: 1
+	Weight: 200
+	Def: -100
+	Loc: "EQP_HEAD_TOP"
+	EquipLv: 150
+	Refine: false
+},
 
 // Neck Armor
 {
diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 39b882a28..47c7cf387 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -113,7 +113,7 @@ L_Assign:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesT);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CopperArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index 19c5505cd..5fb4602ef 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -191,7 +191,7 @@ OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, SamuraiHelmet);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyesT);
     setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // 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 14a9840e3..79c775327 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -22,7 +22,7 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesT);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
     setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index aa7edadfa..ccc8ba7b6 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -53,7 +53,7 @@
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesT);
     setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots);
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index 089b32b24..db41e5ad7 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -7,7 +7,7 @@
 // TODO: Chance to lose a bit of GP by getting water with money inside.
 // I think water should not be so OP, and some minor RNG would be nice here
 
-003-1,46,79,0	script	Mahoud	NPC_PLAYER_TONORI,{
+003-1,46,79,0	script	Mahoud	NPC_PLAYER_ARGAES,{
     mesn;
     mes l("I can fill your bottle with water for only @@ gp the bottle.", .COST_PER_BOTTLE);
     mes l("After all, I am the Well Master!");
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 47acfbcdb..60383895b 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -96,7 +96,7 @@ OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor);
     setunitdata(.@npcId, UDT_HEADMIDDLE, RaidTrousers);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyesT);
     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 39ffa1280..b5e289219 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -81,7 +81,7 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesD);
     setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe);
     //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
     setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index 86ef0946a..4b4cfda5a 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -116,7 +116,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, BowlerHat);
     setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt);
     setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
-    setunitdata(.@npcId, UDT_WEAPON, 1800);
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
     npcsit;
diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt
index c3195eb99..f03e23977 100644
--- a/npc/003-4/sorfina.txt
+++ b/npc/003-4/sorfina.txt
@@ -131,7 +131,7 @@ OnWarn:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesD);
     setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); //TODO
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots
diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt
index 65802d328..8b92626b0 100644
--- a/npc/003-5/jeweler.txt
+++ b/npc/003-5/jeweler.txt
@@ -182,7 +182,7 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesT);
     setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
diff --git a/npc/003-6/cyndala.txt b/npc/003-6/cyndala.txt
index 27199eac0..055cdce1f 100644
--- a/npc/003-6/cyndala.txt
+++ b/npc/003-6/cyndala.txt
@@ -224,7 +224,7 @@ function craft_yellow_dye {
 
 OnInit:
     .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyesD);
     setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); //TODO
     setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers);
     setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); // Boots