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

Conflicts:
	world/map/db/mob_db.txt

7 files changed, 31 insertions, 22 deletions

diff --git a/world/map/npc/001-2/_mobs.txt b/world/map/npc/001-2/_mobs.txt
index 4aeb43d6..a6625718 100644
--- a/world/map/npc/001-2/_mobs.txt
+++ b/world/map/npc/001-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-001-2.gat,0,0,0|script|Mob001-2|-1,{
+001-2.gat,0,0,0|script|Mob001-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index cb7966bc..d5090135 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -1,7 +1,8 @@
 // Casino
 
 // takes part in quest given by 021-2/kylian.txt
-001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1,{
+001-2.gat,32,72,0|script|#CasinoEntrance|32767,1,1,
+{
     set QUEST_NorthTulimshar, QUEST_NorthTulimshar | $@knowCasinoNT;
     set @kylian, ((QUEST_NorthTulimshar & $@businessmanNT_MASK) >> $@businessmanNT_SHIFT);
     if (@kylian != 6)
@@ -14,36 +15,35 @@ L_End:
     end;
 }
 
-001-2.gat,134,23,0|script|Valdo|117,{
+001-2.gat,134,23,0|script|Valdo|117,
+{
     mes "[Valdo the Worker]";
     mes "\"Please let me work. I'm really in a hurry!\"";
     close;
 }
 
-001-2.gat,37,65,0|script|Slot1|400,{
+001-2.gat,37,65,0|script|Slot1|400,
+{
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,39,65,0|script|Slot2|400,{
+001-2.gat,39,65,0|script|Slot2|400,
+{
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,41,65,0|script|Slot3|400,{
+001-2.gat,41,65,0|script|Slot3|400,
+{
     callfunc "SlotMachine";
     close;
 }
 
-001-2.gat,32,67,0|script|MoneyChanger|124,{
-    mes "[Money Changer]";
-    mes "\"I used to exchange Casino Coins for cash, but the Wizard's Council shut me down.  Now the casino runs off only those Casino Coins currently in circulation.\"";
-    next;
-    mes "\"I heard that many a gambler wandered onto the Beach to the South West and through to the Snake Desert to the South East.  If you want to find coins already in circulation, you might find some on the monsters there.\"";
-    close;
-}
+001-2.gat,32,67,0|shop|MoneyChanger|124,CasinoCoins :-1
 
-001-2.gat,28,63,0|script|BlackJack|107,{
+001-2.gat,28,63,0|script|BlackJack|107,
+{
     mes "[Croupier]";
     mes "\"Would you like to play Black Jack?";
     mes "You will need 15 casino coins.\"";
@@ -118,7 +118,8 @@ L_Close:
     close;
 }
 
-001-2.gat,22,69,0|script|Roulette|107,{
+001-2.gat,22,69,0|script|Roulette|107,
+{
     mes "\"Good evening monsieur...";
     mes "How much would you like to bet?\"";
     next;
diff --git a/world/map/npc/001-2/dedication.txt b/world/map/npc/001-2/dedication.txt
index ec4e7e52..8533b28e 100644
--- a/world/map/npc/001-2/dedication.txt
+++ b/world/map/npc/001-2/dedication.txt
@@ -1,6 +1,7 @@
 // Dedication to Irene Christina
 
-001-2.gat,76,68,0|script|#IreneDedication|400,{
+001-2.gat,76,68,0|script|#IreneDedication|400,
+{
     mes "~ Irene Christina ~";
     mes "The song in this house is dedicated to Irene.";
     next;
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index 9b1eea8b..65f3e2d1 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -1,5 +1,6 @@
 //
-function|script|KadiyaSubquestConsts|{
+function|script|KadiyaSubquestConsts|,
+{
     set @Q_kadiya_status, (QUEST_MAGIC2 & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT;
 
     set @Q_STATUS_NONE, 0;
@@ -20,7 +21,8 @@ function|script|KadiyaSubquestConsts|{
     return;
 }
 
-001-2.gat,70,60,0|script|Omar|162,{
+001-2.gat,70,60,0|script|Omar|162,
+{
     callfunc "ElanoreFix";
     callfunc "KadiyaSubquestConsts";
 
@@ -174,7 +176,8 @@ S_update_var:
     return;
 }
 
-001-2.gat,76,59,0|script|Kadiya|174,{
+001-2.gat,76,59,0|script|Kadiya|174,
+{
     callfunc "ElanoreFix";
     set @Q_MASK, NIBBLE_3_MASK;
     set @Q_SHIFT, NIBBLE_3_SHIFT;
diff --git a/world/map/npc/001-2/phaet.txt b/world/map/npc/001-2/phaet.txt
index dfdf2ebe..36410c48 100644
--- a/world/map/npc/001-2/phaet.txt
+++ b/world/map/npc/001-2/phaet.txt
@@ -1,6 +1,7 @@
 //
 
-001-2.gat,24,23,0|script|Phaet|125,{
+001-2.gat,24,23,0|script|Phaet|125,
+{
     mes "[Phaet the Royal Guard]";
     mes "\"Hey, you seem tough enough! Would you like to prove your skills? I'll let you in the arena if you give me 50 gp. You can fight against other players there.\"";
     next;
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index 75753a4f..1857a5df 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -2,7 +2,8 @@
 
 001-2.gat,26,26,0|shop|InnKeeper|112,Beer :-1,Cake :-1,CherryCake :-1
 
-001-2.gat,103,26,0|script|Rebecca|118,{
+001-2.gat,103,26,0|script|Rebecca|118,
+{
     set @npcname$, "Rebecca the Inn Keeper";
     set @cost, 100;
     callfunc "Inn";
diff --git a/world/map/npc/001-2/troupe_leader.txt b/world/map/npc/001-2/troupe_leader.txt
index f69629a5..f48cd51a 100644
--- a/world/map/npc/001-2/troupe_leader.txt
+++ b/world/map/npc/001-2/troupe_leader.txt
@@ -1,6 +1,7 @@
 //
 
-001-2.gat,34,25,0|script|Troupe Leader|165,{
+001-2.gat,34,25,0|script|Troupe Leader|165,
+{
     callfunc "ClearVariables";
 
     set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);