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

Conflicts:
	world/map/db/mob_db.txt

6 files changed, 40 insertions, 23 deletions

diff --git a/world/map/npc/010-2/_mobs.txt b/world/map/npc/010-2/_mobs.txt
index 8f167635..46950616 100644
--- a/world/map/npc/010-2/_mobs.txt
+++ b/world/map/npc/010-2/_mobs.txt
@@ -3,6 +3,7 @@
 
 
 
-010-2.gat,0,0,0|script|Mob010-2|-1,{
+010-2.gat,0,0,0|script|Mob010-2|-1,
+{
     end;
 }
diff --git a/world/map/npc/010-2/chef.txt b/world/map/npc/010-2/chef.txt
index f0b391a0..6343e517 100644
--- a/world/map/npc/010-2/chef.txt
+++ b/world/map/npc/010-2/chef.txt
@@ -1,5 +1,5 @@
-010-2.gat,33,25,0|script|Chef|148,{
-
+010-2.gat,33,25,0|script|Chef|148,
+{
 // lines belong to Easter 2011:
 // set @month, 4;
 // set @start_day, 15;
@@ -337,7 +337,8 @@ L_Close:
     close;
 }
 
-//010-2.gat,28,31,0|script|#chefproposition|32767,0,0{
+//010-2.gat,28,31,0|script|#chefproposition|32767,0,0
+//{
 //OnTouch:
 //    if (gettime(7) != $@easter2012_year || QUEST_Easter12 != 8 || !((gettime(6) == 4 && gettime(5) >= $@easter2012_reward_start_day) && (gettime(6) == 4 && gettime(5) <= $@easter2012_reward_end_day)))
 //        end;
diff --git a/world/map/npc/010-2/dimonds.txt b/world/map/npc/010-2/dimonds.txt
index 97b6fe90..8fe8cbc5 100644
--- a/world/map/npc/010-2/dimonds.txt
+++ b/world/map/npc/010-2/dimonds.txt
@@ -1,6 +1,7 @@
 //
 
-010-2.gat,34,38,0|script|Dimond|165,{
+010-2.gat,34,38,0|script|Dimond|165,
+{
     mes "[Dimond]";
     mes "\"Welcome to Dimond's Cove!\"";
     mes "";
@@ -11,7 +12,8 @@
     close;
 }
 
-010-2.gat,40,35,0|script|Phil|157,{
+010-2.gat,40,35,0|script|Phil|157,
+{
     mes "[Phil]";
     mes "\"We're having problems with our equipment!\"";
     next;
@@ -20,7 +22,8 @@
     close;
 }
 
-010-2.gat,40,37,0|script|Jerry|160,{
+010-2.gat,40,37,0|script|Jerry|160,
+{
     mes "[Jerry]";
     mes "\"I don't know what's wrong.\"";
     next;
@@ -29,7 +32,8 @@
     close;
 }
 
-010-2.gat,42,36,0|script|Robert|162,{
+010-2.gat,42,36,0|script|Robert|162,
+{
     mes "[Robert]";
     mes "\"I hope we can figure something out!\"";
     next;
@@ -38,7 +42,8 @@
     close;
 }
 
-010-2.gat,35,35,0|script|Shannon|193,{
+010-2.gat,35,35,0|script|Shannon|193,
+{
     set @month, 1;
     set @start_day, 24;
     set @end_day, 26;
@@ -476,7 +481,8 @@ leave:
     close;
 }
 
-010-2.gat,27,30,0|script|Bar Rules|400,{
+010-2.gat,27,30,0|script|Bar Rules|400,
+{
     mes "Dimonds Cove Bar Rules";
     next;
     mes "No excessive drinking!";
@@ -495,25 +501,29 @@ leave:
     close;
 }
 
-010-2.gat,71,38,0|script|Store Policy|400,{
+010-2.gat,71,38,0|script|Store Policy|400,
+{
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,77,38,0|script|Store Policy|400,{
+010-2.gat,77,38,0|script|Store Policy|400,
+{
     mes "All sales are final.";
     mes "Returns are subject to a 50% re-stocking fee.";
     close;
 }
 
-010-2.gat,36,30,0|script|Directions|400,{
+010-2.gat,36,30,0|script|Directions|400,
+{
     mes "This way to the Dimonds Cove Inn.";
     mes "Five star accommodation for the weary traveler!";
     close;
 }
 
-010-2.gat,80,32,0|script|Dimonds Cove 1|400,{
+010-2.gat,80,32,0|script|Dimonds Cove 1|400,
+{
     mes "The Story of Dimonds Cove";
     next;
     mes "One day Dimond D. Stone dreamed of her own restaurant.";
@@ -532,14 +542,16 @@ leave:
     close;
 }
 
-010-2.gat,85,32,0|script|Dimonds Cove 2|400,{
+010-2.gat,85,32,0|script|Dimonds Cove 2|400,
+{
     mes "List of Events at Dimonds Cove";
     mes "January 2008 - Construction of Dimonds Cove.";
     close;
 }
 
 
-010-2.gat,71,30,0|script|Inn|400,{
+010-2.gat,71,30,0|script|Inn|400,
+{
     mes "Welcome to the Dimonds Cove Inn";
     mes "Rooms are 200 gp a night.";
     mes "Plese check in with Basil.";
@@ -555,7 +567,8 @@ leave:
 
 010-2.gat,65,41,0|shop|General Store|137,CottonShorts :-1,FancyHat :-1,SilkHeadband :-1,CottonSkirt :-1,Boots :-1,CottonBoots :-1
 
-010-2.gat,75,68,0|script|Basil|107,{
+010-2.gat,75,68,0|script|Basil|107,
+{
     set @npcname$, "Basil the Inn Keeper";
     set @cost, 200;
     callfunc "Inn";
diff --git a/world/map/npc/010-2/doug.txt b/world/map/npc/010-2/doug.txt
index 1d2cf4e4..4b5598d7 100644
--- a/world/map/npc/010-2/doug.txt
+++ b/world/map/npc/010-2/doug.txt
@@ -1,7 +1,7 @@
 //
 
-010-2.gat,68,87,0|script|Doug|113,{
-
+010-2.gat,68,87,0|script|Doug|113,
+{
     mes "[Doug]";
     mes "\"This room is too dark. I want to brighten it up.\"";
     next;
diff --git a/world/map/npc/010-2/loratay.txt b/world/map/npc/010-2/loratay.txt
index f34d9c57..436f7f09 100644
--- a/world/map/npc/010-2/loratay.txt
+++ b/world/map/npc/010-2/loratay.txt
@@ -1,5 +1,5 @@
-010-2.gat,85,85,0|script|Lora Tay|151,{
-
+010-2.gat,85,85,0|script|Lora Tay|151,
+{
     set @ROBE_COCOONS_NR, 150; // must be multiple of ten
     set @ROBE_ZENY, 10000;
     set @ROBE_SHEETS_NR, 6;      // number of silk sheets required for the silk robe. Must be less than 10.
diff --git a/world/map/npc/010-2/workers.txt b/world/map/npc/010-2/workers.txt
index ab2e6d5d..3dc6e928 100644
--- a/world/map/npc/010-2/workers.txt
+++ b/world/map/npc/010-2/workers.txt
@@ -1,12 +1,14 @@
 //
 
-010-2.gat,23,70,0|script|Josh|155,{
+010-2.gat,23,70,0|script|Josh|155,
+{
     mes "[Josh]";
     mes "\"We're working on getting the cellar pass open.\"";
     close;
 }
 
-010-2.gat,39,75,0|script|Zack|155,{
+010-2.gat,39,75,0|script|Zack|155,
+{
     set @hw2011_npc_id, $@hw2011_npc_zack;
     if (gettime(7) == $@hw2011_year && gettime(6) == 10 && gettime(5) >= $@hw2011_start_day)
         goto L_TrickOrTreat;