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

Conflicts:
	world/map/db/mob_db.txt

23 files changed, 65 insertions, 41 deletions

diff --git a/world/map/npc/001-1/_mobs.txt b/world/map/npc/001-1/_mobs.txt
index 6aaae042..bb79c71d 100644
--- a/world/map/npc/001-1/_mobs.txt
+++ b/world/map/npc/001-1/_mobs.txt
@@ -23,7 +23,8 @@
 001-1.gat,137,25,15,7|monster|FireGoblin|1011,1,61000,60000,Mob001-1::On1011
 
 
-001-1.gat,0,0,0|script|Mob001-1|-1,{
+001-1.gat,0,0,0|script|Mob001-1|-1,
+{
 On1002:
     set @mobID, 1002;
     callfunc "MobPoints";
diff --git a/world/map/npc/001-1/banker.txt b/world/map/npc/001-1/banker.txt
index c5807d0e..aee3e4ba 100644
--- a/world/map/npc/001-1/banker.txt
+++ b/world/map/npc/001-1/banker.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,57,52,0|script|Tybalt|107,{
+001-1.gat,57,52,0|script|Tybalt|107,
+{
     callfunc "ClearVariables";
     set @npcname$, "Tybalt";
     callfunc "Banker";
diff --git a/world/map/npc/001-1/barber.txt b/world/map/npc/001-1/barber.txt
index 103e303a..e58ee880 100644
--- a/world/map/npc/001-1/barber.txt
+++ b/world/map/npc/001-1/barber.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,53,38,0|script|Nicolas|100,{
+001-1.gat,53,38,0|script|Nicolas|100,
+{
     mes "[Nicolas the Barber]";
     mes "\"Do you need a barber?\"";
     next;
diff --git a/world/map/npc/001-1/bard.txt b/world/map/npc/001-1/bard.txt
index 4278bb7a..2de20249 100644
--- a/world/map/npc/001-1/bard.txt
+++ b/world/map/npc/001-1/bard.txt
@@ -1,7 +1,8 @@
 //
 
-//001-1.gat,46,76,0|script|Bard|152,{
-001-1.gat,40,73,0|script|Bard|152,{
+//001-1.gat,46,76,0|script|Bard|152,
+001-1.gat,40,73,0|script|Bard|152,
+{
     setarray @songs$, "\"There once was a bard, who had it hard, because a man in dark green, was very mean.\"",
         "\"At Hurnscald inn, there was a person of fairest skin, declining wedding bands from quite a many hands.\"",
         "\"As the Sun sets down in the forest's brown, she whom the fragrance holds counts her gold.\"";
diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index 0d65e6d2..25364698 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
@@ -1,7 +1,7 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,37,44,0|script|Bernard|117,{
-
+001-1.gat,37,44,0|script|Bernard|117,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/001-1/bleacher.txt b/world/map/npc/001-1/bleacher.txt
index 6ff75cca..e681f8c0 100644
--- a/world/map/npc/001-1/bleacher.txt
+++ b/world/map/npc/001-1/bleacher.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,27,53,0|script|Candide|156,{
+001-1.gat,27,53,0|script|Candide|156,
+{
     mes "[Candide]";
     mes "\"I've figured out how that volcanic ash bleaches cloth.";
     mes "I could do it for you, but I'll need three piles of ash and 5,000 GP for supplies per item.\"";
diff --git a/world/map/npc/001-1/children.txt b/world/map/npc/001-1/children.txt
index 91aa2e1f..16c2d10a 100644
--- a/world/map/npc/001-1/children.txt
+++ b/world/map/npc/001-1/children.txt
@@ -1,6 +1,7 @@
 // Aisha and Nina
 
-001-1.gat,95,29,0|script|Aisha|108,{
+001-1.gat,95,29,0|script|Aisha|108,
+{
     set @TEMP,rand(9);
     if(@TEMP == 0) goto L_1;
     if(@TEMP == 1) goto L_1;
@@ -57,7 +58,8 @@ L_Close:
     close;
 }
 
-001-1.gat,39,67,0|script|Nina|103,{
+001-1.gat,39,67,0|script|Nina|103,
+{
     mes "[Nina]";
     set @TEMP,rand(10);
     if(@TEMP == 0) goto L_1;
diff --git a/world/map/npc/001-1/constable.txt b/world/map/npc/001-1/constable.txt
index 6c8be358..e5de9b92 100644
--- a/world/map/npc/001-1/constable.txt
+++ b/world/map/npc/001-1/constable.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,37,35,0|script|Constable Perry Graf|150,{
+001-1.gat,37,35,0|script|Constable Perry Graf|150,
+{
 //    set @npcname$, "Constable Perry Graf";
     set @canSkip, 1;
     callfunc "GameRules";
diff --git a/world/map/npc/001-1/elanore.txt b/world/map/npc/001-1/elanore.txt
index 24ca9edd..34b30766 100644
--- a/world/map/npc/001-1/elanore.txt
+++ b/world/map/npc/001-1/elanore.txt
@@ -1,6 +1,7 @@
 //
 
-function|script|ElanoreFix|{
+function|script|ElanoreFix|,
+{
     set @Q_MASK, NIBBLE_1_MASK;
     set @Q_SHIFT, NIBBLE_1_SHIFT;
 
@@ -16,8 +17,8 @@ function|script|ElanoreFix|{
     return;
 }
 
-001-1.gat,58,68,0|script|Elanore#_M|108,{
-
+001-1.gat,58,68,0|script|Elanore#_M|108,
+{
     set @has_magic, getskilllv(SKILL_MAGIC);
 
     set @Q_MASK, NIBBLE_1_MASK;
diff --git a/world/map/npc/001-1/entertainer.txt b/world/map/npc/001-1/entertainer.txt
index b1ef1372..ea8e0870 100644
--- a/world/map/npc/001-1/entertainer.txt
+++ b/world/map/npc/001-1/entertainer.txt
@@ -1,6 +1,7 @@
 // Emote NPC allows for players to learn the emote skill
 
-001-1.gat,30,45,0|script|Entertainer|165,{
+001-1.gat,30,45,0|script|Entertainer|165,
+{
     if (getskilllv(SKILL_EMOTE) > 0) goto L_Has;
 
     mes "[Entertainer]";
@@ -40,5 +41,6 @@ OnTimer3000:
     setnpctimer 0;
 
 OnInit:
+    if (debug >= 2) end;
     initnpctimer;
 }
diff --git a/world/map/npc/001-1/gossip.txt b/world/map/npc/001-1/gossip.txt
index 468b8b48..881ada61 100644
--- a/world/map/npc/001-1/gossip.txt
+++ b/world/map/npc/001-1/gossip.txt
@@ -1,7 +1,7 @@
 // NPC to provide hints on progression of linear quest chain in Tulimshar
 
-001-1.gat,49,31,0|script|Gladys|154,{
-
+001-1.gat,49,31,0|script|Gladys|154,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/001-1/guards.txt b/world/map/npc/001-1/guards.txt
index 184956da..cce350c7 100644
--- a/world/map/npc/001-1/guards.txt
+++ b/world/map/npc/001-1/guards.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,48,79,0|script|Ekinu|104,{
+001-1.gat,48,79,0|script|Ekinu|104,
+{
     mes "[Ekinu the Town Guard]";
     mes "\"What a disaster... I can't believe that we managed to rebuild the town so fast, though.\"";
     next;
@@ -74,8 +75,8 @@ L_Close:
     close;
 }
 
-001-1.gat,40,79,0|script|Ryan|104,{
-
+001-1.gat,40,79,0|script|Ryan|104,
+{
     if (getskilllv(SKILL_MAGIC)) goto L_message;
 
     mes "[Ryan the Town Guard]";
diff --git a/world/map/npc/001-1/guide.txt b/world/map/npc/001-1/guide.txt
index 18ee0a09..f50e3eda 100644
--- a/world/map/npc/001-1/guide.txt
+++ b/world/map/npc/001-1/guide.txt
@@ -1,12 +1,17 @@
 //
 
-001-1.gat,32,27,0|script|Ian|102,{
+001-1.gat,32,27,0|script|Ian|102,
+{
     // This line is only relevant for players, who started before the timestamp was introduced.
     // Set the graduation cap flag at the right position.
     // It is a bugfix
-    if ((TUT_var < 4) && (TUT_var & 2)) set FLAGS, FLAGS|FLAG_GOT_GRADUATIONCAP;
+    if ((TUT_var < 4) && (TUT_var & 2))
+        set FLAGS, FLAGS|FLAG_GOT_GRADUATIONCAP;
 
-    if ((TUT_var != 0) && !(FLAGS & FLAG_GOT_GRADUATIONCAP) && BaseLevel >= 10) callsub S_Grad;
+    if ((TUT_var != 0) && !(FLAGS & FLAG_GOT_GRADUATIONCAP) && BaseLevel >= 10)
+        goto L_Grad;
+
+L_DoneGrad:
     mes "[Ian the Guide]";
     mes "\"Would you like to know about something?\"";
     next;
@@ -160,7 +165,7 @@ L_Know:
     mes "\"But remember, the game isn't fun when you already know what to do. Use it well or you will lose interest in playing The Mana World! Please help by reporting anything that is unclear, outdated or that needs to be seen on our forums at http://forums.themanaworld.org.\"";
     close;
 
-S_Grad:
+L_Grad:
     getinventorylist;
     if (@inventorylist_count == 100) goto L_TooMany;
     mes "[Ian the Guide]";
@@ -168,11 +173,11 @@ S_Grad:
     getitem "GraduationCap", 1;
     set FLAGS, FLAGS | FLAG_GOT_GRADUATIONCAP;
     next;
-    return;
+    goto L_DoneGrad;
 
 L_TooMany:
     mes "[Ian the Guide]";
     mes "\"I wanted to give you something, but you don't have room for it.\"";
     next;
-    return;
+    goto L_DoneGrad;
 }
diff --git a/world/map/npc/001-1/luca.txt b/world/map/npc/001-1/luca.txt
index f1725404..55502e35 100644
--- a/world/map/npc/001-1/luca.txt
+++ b/world/map/npc/001-1/luca.txt
@@ -1,7 +1,7 @@
 //
 
-001-1.gat,108,55,0|script|Luca|102,{
-
+001-1.gat,108,55,0|script|Luca|102,
+{
     set @EXP_BRAWLING, 2000;
 
     if (BaseLevel >= 35) goto L_teach;
diff --git a/world/map/npc/001-1/mikhail.txt b/world/map/npc/001-1/mikhail.txt
index 3980ac9b..c82dd89f 100644
--- a/world/map/npc/001-1/mikhail.txt
+++ b/world/map/npc/001-1/mikhail.txt
@@ -1,7 +1,7 @@
 // Variables used: nibble 0 of QUEST_SouthTulimshar
 
-001-1.gat,50,46,0|script|Mikhail|120,{
-
+001-1.gat,50,46,0|script|Mikhail|120,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/001-1/monster_guide.txt b/world/map/npc/001-1/monster_guide.txt
index 7d5693e2..0aca7e41 100644
--- a/world/map/npc/001-1/monster_guide.txt
+++ b/world/map/npc/001-1/monster_guide.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,48,52,0|script|Aidan|102,{
+001-1.gat,48,52,0|script|Aidan|102,
+{
     if(MPQUEST == 0) goto Register;
     mes "[Aidan the Monster Guide]";
     mes "You currently have " +Mobpt+ " Monster Points. These points are acquired while killing monsters";
diff --git a/world/map/npc/001-1/npcs.txt b/world/map/npc/001-1/npcs.txt
index b58ae7d8..c2b020af 100644
--- a/world/map/npc/001-1/npcs.txt
+++ b/world/map/npc/001-1/npcs.txt
@@ -1,6 +1,7 @@
 // Talk NPCs to help make trek interesting around the Bazaar.
 
-001-1.gat,46,26,0|script|Yalina|209,{
+001-1.gat,46,26,0|script|Yalina|209,
+{
     set @npcname$, "Yalina";
 
     mes "[" + @npcname$ + "]";
@@ -13,7 +14,8 @@
     close;
 }
 
-001-1.gat,84,72,0|script|Cyndala|210,{
+001-1.gat,84,72,0|script|Cyndala|210,
+{
     set @npcname$, "Cyndala";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/001-1/rewards_master.txt b/world/map/npc/001-1/rewards_master.txt
index abf85ce8..7ebc12f5 100644
--- a/world/map/npc/001-1/rewards_master.txt
+++ b/world/map/npc/001-1/rewards_master.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,50,53,0|script|Ishi|106,{
+001-1.gat,50,53,0|script|Ishi|106,
+{
     if (MPQUEST == 0) goto L_Register;
     if (tvis == 0) set tvis, 1;
     if (Mobpt < tvis) goto L_NotEnough;
diff --git a/world/map/npc/001-1/sandra.txt b/world/map/npc/001-1/sandra.txt
index 021f8519..50e302db 100644
--- a/world/map/npc/001-1/sandra.txt
+++ b/world/map/npc/001-1/sandra.txt
@@ -1,7 +1,7 @@
 // Variables used: nibble 3 of QUEST_SouthTulimshar
 
-001-1.gat,110,71,0|script|Sandra|114,{
-
+001-1.gat,110,71,0|script|Sandra|114,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/001-1/sarah.txt b/world/map/npc/001-1/sarah.txt
index 3d2cb806..9f61fc19 100644
--- a/world/map/npc/001-1/sarah.txt
+++ b/world/map/npc/001-1/sarah.txt
@@ -1,7 +1,7 @@
 // Variables used: nibble 1 of QUEST_SouthTulimshar
 
-001-1.gat,137,78,0|script|Sarah|106,{
-
+001-1.gat,137,78,0|script|Sarah|106,
+{
     // This NPC previously used the variable TMW_Quest
     callfunc "ClearVarTMW_Quest";
 
diff --git a/world/map/npc/001-1/soul-menhir.txt b/world/map/npc/001-1/soul-menhir.txt
index 2a7f5c27..4ebea361 100644
--- a/world/map/npc/001-1/soul-menhir.txt
+++ b/world/map/npc/001-1/soul-menhir.txt
@@ -1,6 +1,7 @@
 //
 
-001-1.gat,38,69,0|script|Soul Menhir|345,{
+001-1.gat,38,69,0|script|Soul Menhir|345,
+{
     callfunc "ClearVariables";
     set @map$, "001-1.gat";
     setarray @Xs, 37, 38, 39, 37, 39, 37, 39;
diff --git a/world/map/npc/001-1/trader.txt b/world/map/npc/001-1/trader.txt
index b4157ab2..cf2854ef 100644
--- a/world/map/npc/001-1/trader.txt
+++ b/world/map/npc/001-1/trader.txt
@@ -3,7 +3,8 @@
 // Updated by: TheKandiman
 // Reviewed by: Wombat
 
-001-1.gat,57,33,0|script|Trader|115,{
+001-1.gat,57,33,0|script|Trader|115,
+{
     set @Ironprice, 1000;
     set @Sulphurprice, 1200;
     set @Potionprice, 500;
diff --git a/world/map/npc/001-1/vincent.txt b/world/map/npc/001-1/vincent.txt
index 4ed4adfc..eb4c1fed 100644
--- a/world/map/npc/001-1/vincent.txt
+++ b/world/map/npc/001-1/vincent.txt
@@ -1,6 +1,7 @@
 // Variables used: nibble 2 of QUEST_SouthTulimshar
 
-001-1.gat,135,42,0|script|Vincent|113,{
+001-1.gat,135,42,0|script|Vincent|113,
+{
     set @hw2011_npc_id, $@hw2011_npc_vincent;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;