Corrections

3 files changed, 43 insertions, 20 deletions

diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 59a9be17a..54b09ed0f 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -1,7 +1,6 @@
 // TMW-2 Script
 // Author:
 //    Jesusalva
-// TODO IMPORTANT: ON NEXT UPDATE, set everyone with Swezanne on status (1,2) to status (3)
 
 003-1,70,100,0	script	Swezanne	NPC_FEMALE,{
     .@q=getq(TulimsharQuest_Swezanne);
@@ -10,7 +9,8 @@
     next;
     if (.@q == 0) goto L_Quest;
     if (.@q == 1 && gettimetick(2) >= SWEZANNE_TIMER + 60 * 60 * 24) setq TulimsharQuest_Swezanne, 2;
-    else if (.@q == 2) goto L_Repeat;
+    .@q=getq(TulimsharQuest_Swezanne);
+    if (.@q == 2) goto L_Repeat;
     else if (.@q == 3) goto L_Silvia;
     mesq l("I fight every day in hopes to meet Andrei, the famous hero who prevented Hurnscald from total destruction against a horde of monsters alone.");
     if ($MOST_HEROIC$ != "") goto L_Heroics;
diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt
index e62207c2a..e45135cb1 100644
--- a/npc/007-1/dracoula.txt
+++ b/npc/007-1/dracoula.txt
@@ -7,11 +7,11 @@
 // Variable:
 //      MineQuest_Dracoula
 
-007-1,165,99,0	script	Dracoula	NPC_ELVEN_FEMALE,{
+007-1,165,99,0	script	Dracoula	NPC_UKAR_F,{
     mesn;
     mesq lg("Hello adventurer! Are you lost?");
     next;
-    mesq l("This is not a place for unexperimpented people!");
+    mesq l("This is not a place for non-experimented people!");
     next;
     mesq l("Mine exit is top left!");
     if (BaseLevel >= 15) goto L_Menu;
@@ -22,9 +22,9 @@ L_Menu:
     mesq l("But as you're here now, could you do me a favour?");
     mes "";
     menu
-        l("Hum, Which type of favor?."),L_Quest,
-        l("Can I found a mana source here?"),L_Mana,
-        l("Can I become miner?"),L_Miner,
+        l("Hum, Which type of favor?"),L_Quest,
+        l("Can I find a mana source here?"),L_Mana,
+        l("Can I become a miner?"),L_Miner,
         l("No, thanks. I gonna leave this place."),L_Close;
 
 L_Quest:
@@ -38,6 +38,7 @@ L_Quest:
     next;
     if (.@q == 0) goto L_Continue;
     if (.@q == 1 && gettimetick(2) >= getq2(MineQuest_Dracoula) + 60 * 60 * 23) setq1 MineQuest_Dracoula, 2; // Repats every 23 hours
+    .@q=getq(MineQuest_Dracoula); // Fix it
     if (.@q == 2) goto L_Repeat;
     mesn;
     mesq l("But come back in a few hours, I didn't lost all @@!", getitemlink(BatTeeth));
@@ -51,23 +52,23 @@ L_Continue:
         l("Haha, Nice, but how do you do that?"), L_Next;
 
 L_Next:
-    mesq l("I disguise myself into a giant mutated bat but everytime i break or lose my fake teeth.");
+    mesq l("I disguise myself into a giant mutated bat, but every time I break or lose my fake teeth.");
     next;
-    mesq l("I usually ask adventurers for 11 @@, but new miners should arrive soon. I need to make them cry!", getitemlink(BatTeeth));
+    mesq l("I usually ask adventurers for 11 @@, but new miners should be arriving soon. I need to make them cry!", getitemlink(BatTeeth));
     next;
-    mesq l("Could be nice, if you can bring me 20 @@,", getitemlink(BatTeeth));
+    mesq l("So it could be nice, if you could bring me 20 @@,", getitemlink(BatTeeth));
     mes "";
     menu
-        rif(countitem(BatTeeth) >= 20, l("Hey! I already get them!")), L_Finish,
+        rif(countitem(BatTeeth) >= 20, l("Hey! I already got them!")), L_Finish,
         l("I'll get to it."), L_Close;
     close; // double sure
 
 L_Repeat:
     mesn;
     if (getequipid(EQI_HEAD_TOP) != 0)
-        mesq l("Oh its you @@, I did not recognize you with your hat!", strcharinfo(0));
+        mesq l("Oh it's you @@, I did not recognize you with your hat!", strcharinfo(0));
     else
-        mesq l("Oh its you @@, I did not recognize you without a hat!", strcharinfo(0));
+        mesq l("Oh it's you @@, I did not recognize you without a hat!", strcharinfo(0));
     next;
     mesq l("Do you have an extra of 11 @@ for me?", getitemlink(BatTeeth));
     mes "";
@@ -95,7 +96,7 @@ L_Finish2:
     setq MineQuest_Dracoula, 1, gettimetick(2);
     mes "";
     mesn;
-    mesq l("So COOL Thanks! Come back later to bring me extra @@!", getitemlink(BatTeeth));
+    mesq l("So COOL, thanks! Come back later to bring me extra @@!", getitemlink(BatTeeth));
     close;
 
 L_Mana:
@@ -110,10 +111,11 @@ L_Mana:
     mesq l("If one of us found a Mana stone. They would become rich!");
     next;
     mesn;
-    mesq l("Twelve times more if it is an ellusive Mana Fragment no one knows where they are!");
+    mesq l("Twelve times more if it is an elusive Mana Fragment no one knows where they are!");
     next;
     mesn;
-    mesq l("That it is.");
+    mesq l("That is.");
+    next;
     goto L_Menu;
 
 L_Miner:
@@ -123,6 +125,7 @@ L_Miner:
     next;
     mesn;
     mesq l("He is the Miners leader.");
+    next;
     goto L_Menu;
 
 L_Close:
@@ -139,7 +142,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HAIRSTYLE, 7);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 8);
 
-    .sex = G_MALE;
+    .sex = G_FEMALE;
     .distance = 4;
 
     end;
diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt
index 223b858c8..58809c47c 100644
--- a/npc/012-2/helena.txt
+++ b/npc/012-2/helena.txt
@@ -7,11 +7,15 @@
 012-2,47,40,0	script	Helena	NPC_FEMALE,{
     .@q=getq(HurnscaldQuest_Bandits);
 
-    // Stage 1: Level 40, collect Bandit Hood
+    // Stage 1: Level 30, collect Bandit Hood
+    if (BaseLevel < 30) goto L_TooWeak;
+    if (.@q == 1) goto L_Return;
+
+    // Stage 2: Level 40, collect 
     if (BaseLevel < 40) goto L_TooWeak;
     if (.@q == 1) goto L_Return;
 
-    // Stage 2: Level 45, defeat Bandit Lord
+    // Stage 3: Level 45, defeat Bandit Lord
     if (BaseLevel < 45) goto L_Weak;
     goto L_Start;
 
@@ -64,7 +68,23 @@ L_Start:
 
 L_Return:
     mesn;
-    mesq l("Ah, @@! I'm busy now, can we talk again later?", strcharinfo(0));
+    mesq lg("Adventurer, did you brought me what I asked? I see you have @@/10 @@.", countitem(BanditHood), getitemlink(BanditHood));
+    mes "";
+    select
+        rif(countitem(BanditHood) >= 10, l("Yes, take it.")),
+        rif(countitem(BanditHood) < 10, l("No, I'll be back with them.")),
+        l("Hm, can we talk again later?");
+    mes "";
+    if (@menu != 1)
+        close;
+    delitem BanditHood, 10;
+    Zeny=Zeny+2000;
+    setq HurnscaldQuest_Bandits, 2;
+    mesn;
+    mesq l("Hey hey... Good job! I was you would ruin their hoods before being able to take them.");
+    next;
+    mesn;
+    mesq l("Here is 2000 GP for your efforts. Thanks for making Hurnscald a better place to live.");
     close;
 
 OnInit: