add Sarah into Tulimshar

4 files changed, 163 insertions, 1 deletions

diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 8f7b3aa18..0c5d8d4cb 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -3,3 +3,5 @@
 "npc/003-1/_mobs.txt",
 "npc/003-1/_warps.txt",
 "npc/003-1/tamiloc.txt",
+"npc/003-1/sarah.txt",
+"npc/003-1/guardphilip.txt",
\ No newline at end of file
diff --git a/npc/003-1/guardphilip.txt b/npc/003-1/guardphilip.txt
new file mode 100644
index 000000000..99c7f85a1
--- /dev/null
+++ b/npc/003-1/guardphilip.txt
@@ -0,0 +1,80 @@
+// Author:
+//    Saulc
+
+003-1,98,100,0	script	Guard Philipe	451,{
+
+    .cake = CherryCake;
+    .reward = FancyHat;
+    
+    function quest_completed{
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("It was so tasty, I can't eat anything more... Thank you.");
+            close;
+    }
+
+    function quest_open {
+        if (countitem(.cake) > 0)
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("You brought me Cherry Cake! Here is your @@, as promised.",getitemlink(.reward));
+            delitem .cake,1;
+            getitem .reward,1;
+            setq TulimsharQuest_Sarah, 1;
+            close;
+        }
+        else 
+        {
+            speech S_FIRST_BLANK_LINE,
+                l("Sorry it's not the cake i love.");
+            close;
+        }
+    }
+
+    function quest_started {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Oh Welcoem then.");
+        speech S_LAST_NEXT,
+            l("Can you bring me a piece of Cherry Cake? Pretty please?.");
+        do
+        {
+        select
+            l("Here is it !"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                quest_open;
+                break;
+        }
+    } while (@menu != 2);
+    }
+   
+    do
+    {
+        .@chest = getq(TulimsharQuest_Sarah);
+        if (.@chest == 1)
+            goto quest_completed;
+        select
+            rif(.@chest == 0,  
+            l("Hello i'm new there, can i help you ?")),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                quest_started;
+                break;
+        }
+    } while (@menu != 2);
+
+    closedialog;
+    goodbye;
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+    end;
+}
+
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
new file mode 100644
index 000000000..6cfeeb60a
--- /dev/null
+++ b/npc/003-1/sarah.txt
@@ -0,0 +1,80 @@
+// Author:
+//    Saulc
+
+003-1,90,144,0	script	Sarah	NPC_PLAYER,{
+
+    .cake = CherryCake;
+    .reward = FancyHat;
+    
+    function quest_completed{
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("It was so tasty, I can't eat anything more... Thank you.");
+            close;
+    }
+
+    function quest_open {
+        if (countitem(.cake) > 0)
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("You brought me Cherry Cake! Here is your @@, as promised.",getitemlink(.reward));
+            delitem .cake,1;
+            getitem .reward,1;
+            setq TulimsharQuest_Sarah, 1;
+            close;
+        }
+        else 
+        {
+            speech S_FIRST_BLANK_LINE,
+                l("Sorry it's not the cake i love.");
+            close;
+        }
+    }
+
+    function quest_started {
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("Oh Welcoem then.");
+        speech S_LAST_NEXT,
+            l("Can you bring me a piece of Cherry Cake? Pretty please?.");
+        do
+        {
+        select
+            l("Here is it !"),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                quest_open;
+                break;
+        }
+    } while (@menu != 2);
+    }
+   
+    do
+    {
+        .@chest = getq(TulimsharQuest_Sarah);
+        if (.@chest == 1)
+            goto quest_completed;
+        select
+            rif(.@chest == 0,  
+            l("Hello i'm new there, can i help you ?")),
+            menuaction(l("Quit"));
+
+        switch (@menu)
+        {
+            case 1:
+                quest_started;
+                break;
+        }
+    } while (@menu != 2);
+
+    closedialog;
+    goodbye;
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 3;
+    end;
+}
+
diff --git a/npc/003-8/jhedia.txt b/npc/003-8/jhedia.txt
index 8a5754d62..7994be439 100644
--- a/npc/003-8/jhedia.txt
+++ b/npc/003-8/jhedia.txt
@@ -2,7 +2,7 @@
 // Author:
 //    Crazyfefe
 
-003-8,28,30,0	script	Jhedia	NPC_ELVEN_FEMALE_ARMOR_SHOP,{
+003-8,28,30,0	script	Jhedia	427,{
 
     .Item1 = IronOre; //7
     .Item2 = Coal; //11