Merge branch 'master' of gitlab.com:TMW2/serverdata

3 files changed, 64 insertions, 3 deletions

diff --git a/npc/005-1/_mobs.txt b/npc/005-1/_mobs.txt
index 178e77874..9b26c0f83 100644
--- a/npc/005-1/_mobs.txt
+++ b/npc/005-1/_mobs.txt
@@ -1,7 +1,7 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-1: Candor Island mobs
 005-1,36,40,2,1	monster	CloverPatch	1028,1,35000,300000
-005-1,23,56,1,0	monster	IronFragments	1058,1,35000,300000
+005-1,23,56,1,0	monster	Diamond Bif	1108,1,35000,300000
 005-1,63,84,7,6	monster	Maggot	1030,8,35000,300000,Trainer::OnKillMaggot
 005-1,82,87,8,9	monster	Candor Scorpion	1073,7,35000,300000,Trainer::OnKillCandorScorpion
 005-1,36,105,6,3	monster	Piou	1002,1,35000,300000
diff --git a/npc/005-2/_mobs.txt b/npc/005-2/_mobs.txt
index 56667f482..436e0f193 100644
--- a/npc/005-2/_mobs.txt
+++ b/npc/005-2/_mobs.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 005-2: Saxso's House mobs
-005-2,43,40,0,0	monster	Saxso Ghost	1076,1,35000,300000
+005-2,43,40,0,0	monster	Saxso Ghost	1076,1,36000,300000
diff --git a/npc/005-7/nurse.txt b/npc/005-7/nurse.txt
index abf65d66c..590011e57 100644
--- a/npc/005-7/nurse.txt
+++ b/npc/005-7/nurse.txt
@@ -1,11 +1,47 @@
 // TMW-2 Script
 // Author:
 //    Jesusalva
+//    Crazyfefe
 
-005-7,41,30,0	script	Candor's Nurse	NPC_FEMALE,{
+005-7,41,30,0	script	Candor"'"s Nurse	NPC_FEMALE,{
+
+    .Item = Candy;
 
     //if (sc_check(SC_POISON)) goto L_CurePoison;
 
+L_Help:
+    if (countitem("Candy") == 0)
+    {
+        mesq l("You don't seem to have @@", getitemlink(.Item));
+        close;
+    }
+    mesq l("Thank a lot !");
+    if (getq(CandorQuest_Nurse) == 0)
+    {
+        getexp 20,0;
+        Zeny = Zeny + 200;
+        setq CandorQuest_Nurse, 1;
+        close;
+    }
+    if (getq(CandorQuest_Nurse) == 1)
+    {
+        getexp 10,0;
+        Zeny = Zeny + 100;
+        setq CandorQuest_Nurse, 2;
+        close;
+    }
+    if (getq(CandorQuest_Nurse) == 2)
+    {
+        getexp 50,0;
+        Zeny = Zeny +50;
+        setq CandorQuest_Nurse, 3;
+        close;
+    }
+    getexp 5,0;
+    Zeny = Zeny + 25;
+    close;
+
+L_Heal:
     mesn;
     @temp = rand(4);
     if(@temp == 1) goto L_Heal2;
@@ -13,6 +49,30 @@
     if(@temp == 3) goto L_Heal4;
     goto L_Heal1;
 
+    mesq l("Hello can you bring me some @@.",getitemlink(.Item));
+    mesq l("I can also cure you.");
+
+    do
+        {
+        select
+            l("Take this candy !"),
+            l("Heal."),
+            l("No thank.");
+
+        switch (@menu)
+        {
+            case 1:
+                goto L_Help;
+                break;
+            case 2:
+                goto L_Heal;
+                break;
+            case 3:
+                goto L_Close;
+                break;
+        }
+        } while (@menu != 3);
+
 L_Heal1:
     mesq l("You don't look too well; let me treat your wounds.");
     mes "";
@@ -77,3 +137,4 @@ OnInit:
     end;
 
 }
+