Add 001-2-41 (Edouard's house) and improve the barber system.

4 files changed, 176 insertions, 0 deletions

diff --git a/npc/001-2-41/_import.txt b/npc/001-2-41/_import.txt
new file mode 100644
index 00000000..22042e39
--- /dev/null
+++ b/npc/001-2-41/_import.txt
@@ -0,0 +1,4 @@
+// Map 001-2-41:
+npc: npc/001-2-41/_warps.txt
+npc: npc/001-2-41/mapflags.txt
+npc: npc/001-2-41/edouard.txt
diff --git a/npc/001-2-41/_warps.txt b/npc/001-2-41/_warps.txt
new file mode 100644
index 00000000..48ff7b05
--- /dev/null
+++ b/npc/001-2-41/_warps.txt
@@ -0,0 +1,2 @@
+// Map 001-2-41:
+001-2-41,24,32,0	warp	ToHall#001-2-41  	0,0,001-2-31,35,32
diff --git a/npc/001-2-41/edouard.txt b/npc/001-2-41/edouard.txt
new file mode 100644
index 00000000..aba5367c
--- /dev/null
+++ b/npc/001-2-41/edouard.txt
@@ -0,0 +1,169 @@
+// Evol scripts.
+// Authors:
+//    Reid
+//    Travolta
+// Description:
+//    Barber of Aemil
+
+function	script	EdouardCheckChair	{
+
+    getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
+
+    if ((.@map$ != getarg(0)) || (.@x != getarg(1)) || (.@y != getarg(2)))
+    {
+        doevent "Edouard#001-2-41::OnWrongPlace";
+    }
+    else if (!issit())
+    {
+        doevent "Edouard#001-2-41::OnNotSit";
+    }
+    else
+    {
+        doevent "Edouard#001-2-41::OnChair";
+    }
+
+    close;
+}
+
+001-2-41,29,23,0	script	Chair#Chair1-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,31,23,0	script	Chair#Chair2-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,35,27,0	script	Chair#Chair3-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,35,29,0	script	Chair#Chair4-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,35,35,0	script	Chair#Chair5-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,35,37,0	script	Chair#Chair6-001-2-41	NPC_NO_SPRITE,{
+
+    EdouardCheckChair .map$, .x, .y;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 1;
+    end;
+}
+
+001-2-41,30,29,0	script	Edouard#001-2-41	NPC_EDOUARD,{
+
+    function tellStory {
+        if (Edouard_StoryTold != 0)
+        {
+            mes "";
+            mesn;
+        }
+        speech 12,
+            l("I am new in this town, just like you are."),
+            l("I came here, looking for a better life."),
+            l("And so far, the Merchant Guild helped me to find this appartment so I don't complain!"),
+            l("Anyway."),
+            l("I'm a barber, you see. I can change your hair style or color to your liking.");
+
+        Edouard_StoryTold = 1;
+
+        return;
+    }
+
+OnWrongPlace:
+    npctalkonce ("Sit on the chair I will come in a second!");
+    close;
+
+OnNotSit:
+    npctalkonce ("Please sit.");
+    close;
+
+OnChair:
+    speech 4,
+        lg("Hello, young lady.", "Hello, young man.");
+
+    if (Edouard_StoryTold == 0)
+    {
+        tellStory;
+    }
+
+    speech 12,
+        l("What would you like me to do?");
+
+    do
+    {
+        menuint
+            l("What is my current hairstyle and hair color?"), 1,
+            l("I'd like to get a different style."), 2,
+            l("Can you do something with my color?"), 3,
+            l("What's your story again?"), 4,
+            l("I'm fine for now, thank you."), 5;
+
+        switch (@menuret)
+        {
+            case 1:
+                BarberSayStyle 3;
+                break;
+            case 2:
+                BarberChangeStyle;
+                speech 5,
+                    l("Enjoy your new style.");
+                    l("Anything else?");
+                break;
+            case 3:
+                BarberChangeColor;
+                speech 5,
+                    l("I hope you like this color.");
+                    l("Anything else?");
+                break;
+            case 4:
+                tellStory;
+                break;
+            case 5:
+                speech 5,
+                    l("Feel free to come visit me another time.");
+
+                goodbye;
+        }
+    } while (1);
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/001-2-41/mapflags.txt b/npc/001-2-41/mapflags.txt
new file mode 100644
index 00000000..eb1b712b
--- /dev/null
+++ b/npc/001-2-41/mapflags.txt
@@ -0,0 +1 @@
+001-2-41	mapflag	town