Fix map cache for 032-1 and the NPC_MOUBOOTAUR placeholder

2 files changed, 40 insertions, 4 deletions

diff --git a/maps/re/032-1.mcache b/maps/re/032-1.mcache
index 104618c17..e7998ac74 100644
--- a/maps/re/032-1.mcache
+++ b/maps/re/032-1.mcache
diff --git a/npc/032-1/episode.txt b/npc/032-1/episode.txt
index e0d322287..bd0cb00dd 100644
--- a/npc/032-1/episode.txt
+++ b/npc/032-1/episode.txt
@@ -25,38 +25,74 @@ OnTouch:
     end;
 }
 
-032-1,68,54,0	script	Adrian	NPC_MOUBOOTAUR,{
+032-1,68,54,0	script	Adrian	NPC_PLAYER,{
     npctalk3 l("Hi. Are you here to get luggage?");
     end;
 
 OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, SailorHat);
+    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);
+
+    .sex = G_MALE;
     .distance=5;
     end;
 }
 
-032-1,45,36,0	script	Marikel	NPC_MOUBOOTAUR,{
+032-1,45,36,0	script	Marikel	NPC_PLAYER,{
     npctalk3 l("Hi. Working on the docks can be hard, but I'm glad I at least get to eat!");
     end;
 
 OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, SailorHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+
+    .sex = G_MALE;
     .distance=5;
     end;
 }
 
-032-1,75,46,0	script	Joelin	NPC_MOUBOOTAUR,{
+032-1,75,46,0	script	Joelin	NPC_FEMALE,{
     npctalk3 l("Hi. My ship is about to set sail, we'll try to find somewhere better to live than this ruined place!");
     end;
 
 OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, CaptainCap);
+    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);
+
+    .sex = G_FEMALE;
     .distance=5;
     end;
 }
 
-032-1,77,46,0	script	Harper	NPC_MOUBOOTAUR,{
+032-1,77,46,0	script	Harper	NPC_PLAYER,{
     npctalk3 l("Hi. My captain believe the world is round, can you believe that?");
     end;
 
 OnInit:
+    .@npcId = getnpcid(.name$);
+    setunitdata(.@npcId, UDT_HEADTOP, SailorHat);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO
+    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins);
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+
+    .sex = G_MALE;
     .distance=5;
     end;
 }