Merge remote-tracking branch 'origin/master' into waric

Conflicts:
	world/map/db/mob_db.txt

8 files changed, 38 insertions, 33 deletions

diff --git a/world/map/npc/009-1/_mobs.txt b/world/map/npc/009-1/_mobs.txt
index f3cac242..e368c8d5 100644
--- a/world/map/npc/009-1/_mobs.txt
+++ b/world/map/npc/009-1/_mobs.txt
@@ -8,7 +8,8 @@
 009-1.gat,0,0,0,0|monster|Butterfly|1055,5,30,20,Mob009-1::On1055
 
 
-009-1.gat,0,0,0|script|Mob009-1|-1,{
+009-1.gat,0,0,0|script|Mob009-1|-1,
+{
 On1014:
     set @mobID, 1014;
     callfunc "MobPoints";
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 65968d5e..6d7bf498 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -14,7 +14,8 @@
 //#################################################################################
 
 // Lumberjack
-009-1.gat,40,45,0|script|Jack|141,{
+009-1.gat,40,45,0|script|Jack|141,
+{
     callfunc "ClearVariables";
 
     set @RAWLOGS_AMOUNT, 40;
@@ -39,8 +40,11 @@
 
     mes "[Jack Lumber]";
     mes "\"Hello there, my name is Jack Lumber, the enemy of all trees.  If you need some firewood just let me know.\"";
-    if (@inspector == 1)
-        callsub S_NohMask_Ask;
+    if (@inspector != 1)
+        goto L_NotInspector;
+    callsub S_NohMask_Ask;
+
+L_NotInspector:
     next;
     if (@Q_Forestbow < 1)
         goto L_Close;
@@ -96,8 +100,9 @@ L_Bow_state_2:
     if (@Q_Forestbow > 3) goto L_Bow_state_4;
 
     mes "\"Good luck hunting those tree monsters - you will need it.\"";
-    if (@inspector == 1)
-        callsub S_NohMask_Ask;
+    if (@inspector != 1)
+        goto L_Close;
+    callsub S_NohMask_Ask;
     goto L_Close;
 
 L_Bow_state_4:
diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index a6b505cc..00a63939 100644
--- a/world/map/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
@@ -6,7 +6,8 @@
 //
 // Inspector quest
 
-009-1.gat,81,41,0|script|Milly|114,{
+009-1.gat,81,41,0|script|Milly|114,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
@@ -29,8 +30,7 @@
     mes "[Milly]";
     mes "\"Hello traveler, welcome to Hurnscald.\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"Have you met Kfahr yet? He is the greatest hero that ever walked the land of Hurnscald!\"";
     menu
@@ -61,8 +61,7 @@ L_NoKnifeYet:
     mes "[Milly]";
     mes "\"Hi again.\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"Have you talked to Kfahr lately?\"";
     menu
@@ -109,8 +108,7 @@ L_GotBoneKnife:
     mes "[Milly]";
     mes "\"Hi there.\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"I heard that you got an exotic knife from Kfahr.";
     mes "Would you kindly show it to me?\"";
@@ -159,8 +157,7 @@ L_SavedRossy:
     mes "[Milly]";
     mes "\"Hi friend!\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"Word of your fame has spread throughout all Hurnscald of your great heroism by helping my friends Rossy and Julia!\"";
     next;
@@ -195,8 +192,7 @@ L_SavedCindy:
     mes "[Milly]";
     mes "\"Hi!\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"Are the rumors true?\"";
     next;
@@ -234,8 +230,7 @@ L_GotSetzer:
     mes "[Milly]";
     mes "\"Hello!\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"I heard that you got hold of a Setzer!\"";
     next;
@@ -266,8 +261,7 @@ L_OfferCap:
     mes "[Milly]";
     mes "\"Hi there, hero of Hurnscald!\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"You really have proven yourself over and over. There is no way anyone could possibly say, you are not the equal of Kfahr!\"";
     next;
@@ -326,8 +320,7 @@ L_FinishedGood:
     mes "[Milly]";
     mes "\"Hi there friend, my hero!\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
 
     mes "\"Wear the copter beany cap in good health, mana and wealth! See you around!\"";
     goto L_Close;
@@ -336,8 +329,7 @@ L_FinishedBad:
     mes "[Milly]";
     mes "\"Oh, it's you. I suppose you're here to make fun of my hat again.\"";
     next;
-    if (@inspector == 1)
-        callsub S_InspectorQuest;
+    callsub S_InspectorMaybe;
     mes "\"Won't you continue your travels soon?\"";
     menu
         "That's what I'm going to do.", -,
@@ -368,7 +360,9 @@ L_Close:
     set @inspector, 0;
     close;
 
-S_InspectorQuest:
+S_InspectorMaybe:
+    if (@inspector != 1)
+        return;
     menu
         "Have you seen anything strange lately?", L_NohMask_Strange,
         "Do you know anything about the recent robberies?", L_NohMask_Robbery,
@@ -390,8 +384,8 @@ L_Return:
     return;
 }
 
-009-1.gat,82,41,0|script|MillyDebugHelper|114,{
-
+009-1.gat,82,41,0|script|MillyDebugHelper|114,
+{
     mes "You can set certain quests as finished or not finished. What would you like to do?";
     menu
         "Bone Knife Quest done.", L_DBoneKnife,
diff --git a/world/map/npc/009-1/old_man.txt b/world/map/npc/009-1/old_man.txt
index e799cc89..cebd0f59 100644
--- a/world/map/npc/009-1/old_man.txt
+++ b/world/map/npc/009-1/old_man.txt
@@ -1,6 +1,7 @@
 // Old man
 
-009-1.gat,85,51,0|script|Old Man|159,{
+009-1.gat,85,51,0|script|Old Man|159,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/009-1/old_woman.txt b/world/map/npc/009-1/old_woman.txt
index fbd0e7aa..7e33e034 100644
--- a/world/map/npc/009-1/old_woman.txt
+++ b/world/map/npc/009-1/old_woman.txt
@@ -1,6 +1,7 @@
 // Old woman
 
-009-1.gat,29,43,0|script|Old Woman|154,{
+009-1.gat,29,43,0|script|Old Woman|154,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/009-1/sabine.txt b/world/map/npc/009-1/sabine.txt
index d67c55b0..48d7e441 100644
--- a/world/map/npc/009-1/sabine.txt
+++ b/world/map/npc/009-1/sabine.txt
@@ -1,6 +1,7 @@
 // Girl sitting on bench
 
-009-1.gat,88,27,0|script|Sabine|106,{
+009-1.gat,88,27,0|script|Sabine|106,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
diff --git a/world/map/npc/009-1/soul-menhir.txt b/world/map/npc/009-1/soul-menhir.txt
index d3e5d385..063ac7a9 100644
--- a/world/map/npc/009-1/soul-menhir.txt
+++ b/world/map/npc/009-1/soul-menhir.txt
@@ -1,6 +1,7 @@
 //
 
-009-1.gat,53,40,0|script|Soul Menhir|344,{
+009-1.gat,53,40,0|script|Soul Menhir|344,
+{
     callfunc "ClearVariables";
     set @map$, "009-1.gat";
     setarray @Xs, 52, 53, 54, 52, 54, 52, 54;
diff --git a/world/map/npc/009-1/water_pump.txt b/world/map/npc/009-1/water_pump.txt
index 3ce09159..b582b312 100644
--- a/world/map/npc/009-1/water_pump.txt
+++ b/world/map/npc/009-1/water_pump.txt
@@ -1,5 +1,6 @@
 // Water pump. You can fill empty bottles here
 
-009-1.gat,76,33,0|script|Water Pump|203,{
+009-1.gat,76,33,0|script|Water Pump|203,
+{
     callfunc "WaterBottle";
 }