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

Conflicts:
	world/map/db/mob_db.txt

1 files changed, 15 insertions, 14 deletions

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;