Merge branch 'PiouIsles-fixes-patch' into 'master'

Piou isles fixes patch

See merge request TMW2/serverdata!66

8 files changed, 16 insertions, 29 deletions

diff --git a/npc/006-2-1/_import.txt b/npc/006-2-1/_import.txt
index 87ae69a2f..7a60f1202 100644
--- a/npc/006-2-1/_import.txt
+++ b/npc/006-2-1/_import.txt
@@ -2,8 +2,8 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/006-2-1/_mobs.txt",
 "npc/006-2-1/_warps.txt",
-"npc/006-2-1/camilot.txt",
 "npc/006-2-1/chirp.txt",
-"npc/006-2-1/jenny.txt",
+"npc/006-2-1/server.txt",
 "npc/006-2-1/lune.txt",
+"npc/006-2-1/miltaco.txt",
 "npc/006-2-1/plum.txt",
diff --git a/npc/006-2-1/chirp.txt b/npc/006-2-1/chirp.txt
index 3b0f146da..05de00c8b 100644
--- a/npc/006-2-1/chirp.txt
+++ b/npc/006-2-1/chirp.txt
@@ -8,7 +8,7 @@
     close;
 
 OnInit:
-    .sex = OTHER;
+    .sex = G_OTHER;
     .distance = 4;
     end;
 }
diff --git a/npc/006-2-1/lune.txt b/npc/006-2-1/lune.txt
index 8a63fc86d..486ac01dc 100644
--- a/npc/006-2-1/lune.txt
+++ b/npc/006-2-1/lune.txt
@@ -76,7 +76,7 @@ L_AgiPotionA:
 	.@price=POL_AdjustPrice(1000);
     mes "";
     mesn;
-    mesq l("To make an %s I need a %s, an %s, and %s GP for commission.", getitemlink(AgiPotionA), getitemlink(TopazPowder), getitemlink(HerbalTea) fnum(.@price));
+    mesq l("To make an %s I need a %s, an %s, and %s GP for commission.", getitemlink(AgiPotionA), getitemlink(TopazPowder), getitemlink(HerbalTea), fnum(.@price));
     next;
     select
         l("I have the ingredients here."),
@@ -115,7 +115,7 @@ L_AgiPotionB:
 	.@price=POL_AdjustPrice(1250);
     mes "";
     mesn;
-	mesq l("To make an %s I need a %s, two %s, and %s GP for commission.", getitemlink(AgiPotionB), getitemlink(Topaz), getitemlink(HerbalTea) fnum(.@price));
+	mesq l("To make an %s I need a %s, two %s, and %s GP for commission.", getitemlink(AgiPotionB), getitemlink(Topaz), getitemlink(HerbalTea), fnum(.@price));
     next;
     select
         l("I have the ingredients here."),
@@ -154,7 +154,7 @@ L_AgiPotionC:
 	.@price=POL_AdjustPrice(1500);
     mes "";
     mesn;
-	mesq l("To make an %s I need a %s, three %s, and %s GP for commission.", getitemlink(AgiPotionC), getitemlink(PolishedTopaz), getitemlink(HerbalTea) fnum(.@price));
+	mesq l("To make an %s I need a %s, three %s, and %s GP for commission.", getitemlink(AgiPotionC), getitemlink(PolishedTopaz), getitemlink(HerbalTea), fnum(.@price));
     next;
     select
         l("I have the ingredients here."),
@@ -195,14 +195,6 @@ L_Quit:
     close;
 
 OnInit:
-    .@npcId = getnpcid(.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);
-
     .sex = G_OTHER;
     .distance = 4;
     end;
diff --git a/npc/006-2-1/camilot.txt b/npc/006-2-1/miltaco.txt
index 8cd6b3c07..427b9a47a 100644
--- a/npc/006-2-1/camilot.txt
+++ b/npc/006-2-1/miltaco.txt
@@ -4,13 +4,14 @@
 //    Jesusalva
 //    Reid
 //    Travolta
-//    +Seeds
+// Modified by:
+//	  +seeds
 // Description:
-//    Camilot is the barber.
+//    Miltaco is the barber.
 
-006-2-1,85,67,0	script	Camilot	NPC_PIOU_BARBER,{
+006-2-1,85,67,0	script	Miltaco	NPC_PIOU_BARBER,{
      mesn;
-    mesq l("Hi! I'm Camilot, a piou specialist in humanoid hairstyles. Do you want a hair cut?");
+    mesq l("Hi! I'm Miltaco, a piou specialist in humanoid hairstyles. Do you want a hair cut?");
 
     do
     {
@@ -18,7 +19,7 @@
             l("What is my current hairstyle and hair color?"),
             l("I'd like to get a different style."),
             l("Can you do something with my color?"),
-            l("I'm allergic to piou, goodbye.");
+            l("I'm allergic to pious, goodbye.");
 
         switch (@menu)
         {
diff --git a/npc/006-2-1/plum.txt b/npc/006-2-1/plum.txt
index 12c6c9043..cc987b46f 100644
--- a/npc/006-2-1/plum.txt
+++ b/npc/006-2-1/plum.txt
@@ -10,13 +10,6 @@
     close;
 
 OnInit:
-    .@npcId = getnpcid(.name$);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, CottonSkirt);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, TneckSweater);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 14);
-
     .sex = G_OTHER;
     .distance = 5;
     end;
diff --git a/npc/006-2-1/jenny.txt b/npc/006-2-1/server.txt
index 72525f8a3..8b14c143f 100644
--- a/npc/006-2-1/jenny.txt
+++ b/npc/006-2-1/server.txt
@@ -4,7 +4,7 @@
 // Modified by:
 //	  +seeds
 
-006-2-1,41,74,0	script	Jenny	NPC_PIOU_SERVER,{
+006-2-1,41,74,0	script	Server	NPC_PIOU_SERVER,{
 
     mesn;
     mesq l("Hello! Would you like to try some piou delicacies?");
@@ -37,5 +37,5 @@ OnClock0003:
     restoreshopitem LettuceLeaf, 30, 15;
     restoreshopitem Bread, 46, 10;
     restoreshopitem Cheese, 55, 15;
-    end;
+    
 }
diff --git a/npc/006-2/_mobs.txt b/npc/006-2/_mobs.txt
index ea4136dd7..56a83d86b 100644
--- a/npc/006-2/_mobs.txt
+++ b/npc/006-2/_mobs.txt
@@ -1,6 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 006-2: The Piou Islands mobs
 006-2,68,72,9,6	monster	Forest Piou	1202,5,30000,30000
+006-2,68,72,6,5 	monster	Shrewboo	1435,4,30000,30000
 006-2,92,100,9,6	monster	Piousse	1003,12,30000,30000
 006-2,68,101,9,6	monster	Mana Piou	1155,8,30000,30000
 006-2,44,100,9,6	monster	Piou	1002,18,30000,30000
diff --git a/npc/006-2/_warps.txt b/npc/006-2/_warps.txt
index 41770a969..9dbdec770 100644
--- a/npc/006-2/_warps.txt
+++ b/npc/006-2/_warps.txt
@@ -7,4 +7,4 @@
 006-2,61,109,0	warp	#006-2_61_109	0,0,006-2-3,42,29
 006-2,68,113,0	warp	#006-2_68_113	0,0,006-2-3,41,55
 006-2,68,118,0	warp	#006-2_68_118	0,0,006-0,40,36
-006-2,68,74,0	warp	#006-2_68_74	0,0,006-2-4,38,34
+006-2,68,74,0	warp	#006-2_68_74	0,0,006-2-5,38,34