Fix Candor's Nurse. (It was crawling with bugs)

1 files changed, 46 insertions, 39 deletions

diff --git a/npc/005-7/nurse.txt b/npc/005-7/nurse.txt
index 590011e57..9f9847c3e 100644
--- a/npc/005-7/nurse.txt
+++ b/npc/005-7/nurse.txt
@@ -3,19 +3,46 @@
 //    Jesusalva
 //    Crazyfefe
 
-005-7,41,30,0	script	Candor"'"s Nurse	NPC_FEMALE,{
-
-    .Item = Candy;
+005-7,41,30,0	script	Candor's Nurse	NPC_FEMALE,{
 
     //if (sc_check(SC_POISON)) goto L_CurePoison;
 
+    mesn;
+    mesq lg("Hello, dear! I love @@, could you bring me some? They're sooooo sweet and delicious!","Hello, dear! I love @@, could you bring me some? They're sooooo sweet and delicious!", getitemlink(Candy) );
+    mesq l("Ah, I can also cure you, if you need.");
+
+    do
+        {
+        select
+            l("Please heal me!"),
+            rif(countitem(Candy) > 0, l("Here, I have a candy!")),
+            l("I'm fine, no worries...");
+
+        switch (@menu)
+        {
+            case 1:
+                goto L_Heal;
+                break;
+            case 2:
+                goto L_Help;
+                break;
+            case 3:
+                goto L_Close;
+                break;
+        }
+        } while (@menu != 3);
+
 L_Help:
-    if (countitem("Candy") == 0)
+    mes "";
+    mesn;
+
+    if (countitem(Candy) == 0)
     {
-        mesq l("You don't seem to have @@", getitemlink(.Item));
+        mesq l("You don't seem to have any @@ with you!", getitemlink(.Item));
         close;
     }
-    mesq l("Thank a lot !");
+    delitem .Item, 1;
+    mesq l("Thanks a lot!");
     if (getq(CandorQuest_Nurse) == 0)
     {
         getexp 20,0;
@@ -32,8 +59,8 @@ L_Help:
     }
     if (getq(CandorQuest_Nurse) == 2)
     {
-        getexp 50,0;
-        Zeny = Zeny +50;
+        getexp 5,0;
+        Zeny = Zeny + 50;
         setq CandorQuest_Nurse, 3;
         close;
     }
@@ -42,36 +69,14 @@ L_Help:
     close;
 
 L_Heal:
+    mes "";
     mesn;
-    @temp = rand(4);
-    if(@temp == 1) goto L_Heal2;
-    if(@temp == 2) goto L_Heal3;
-    if(@temp == 3) goto L_Heal4;
+    .@temp = rand(4);
+    if(.@temp == 1) goto L_Heal2;
+    if(.@temp == 2) goto L_Heal3;
+    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.");
@@ -97,6 +102,8 @@ L_Menu:
     .@price=(MaxHp-Hp)/5;
     .@price=.@price+10;
     if (BaseLevel <= 15) .@price=(.@price/10);
+    else if (BaseLevel <= 20) .@price=(.@price/5);
+    else .@price=(.@price/2);
     mesq l("For you, it'll be @@ GP.", .@price);
     mes "";
     menu
@@ -124,14 +131,14 @@ L_Close:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    // I got lazy and NPC is behind a desk, so minimal equipment.
-    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
+    // I got lazy and NPC is behind a desk, so only a "shirt"...
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1313);
-    //setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
-    //setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 14);
 
+    // quest setup
+    .Item = Candy;
+
     .sex = G_FEMALE;
     .distance = 5;
     end;