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

Conflicts:
	world/map/db/mob_db.txt

4 files changed, 32 insertions, 17 deletions

diff --git a/world/map/npc/027-1/_mobs.txt b/world/map/npc/027-1/_mobs.txt
index ba3024ac..4aef122d 100644
--- a/world/map/npc/027-1/_mobs.txt
+++ b/world/map/npc/027-1/_mobs.txt
@@ -21,7 +21,8 @@
 027-1.gat,28,67,2,1|monster|JackO|1022,1,265000,200000,Mob027-1::On1022
 
 
-027-1.gat,0,0,0|script|Mob027-1|-1,{
+027-1.gat,0,0,0|script|Mob027-1|-1,
+{
 On1022:
     set @mobID, 1022;
     callfunc "MobPoints";
diff --git a/world/map/npc/027-1/golbenez.txt b/world/map/npc/027-1/golbenez.txt
index bc44e850..d560f953 100644
--- a/world/map/npc/027-1/golbenez.txt
+++ b/world/map/npc/027-1/golbenez.txt
@@ -1,5 +1,5 @@
-027-1.gat,68,89,0|script|#Golbenez#_M|204,{
-
+027-1.gat,68,89,0|script|#Golbenez#_M|204,
+{
     set @fee, 666;
 
     mes "[Golbenez]";
diff --git a/world/map/npc/027-1/graves.txt b/world/map/npc/027-1/graves.txt
index 7f54d8c1..b33ad67e 100644
--- a/world/map/npc/027-1/graves.txt
+++ b/world/map/npc/027-1/graves.txt
@@ -1,90 +1,103 @@
 // Easter egg graves
 
-function|script|GraveTooFar|{
+function|script|GraveTooFar|,
+{
     if (isin("027-1.gat",89,54,122,76))
         return;
     mes "You are too far away to read the grave.";
     close;
 }
 
-027-1.gat,89,62,0|script|Grave|400,{
+027-1.gat,89,62,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ FotherJ ~";
     mes "The mad sprite making genius who made all the creepy undead monster graphics.";
     close;
 }
 
-027-1.gat,118,54,0|script|Grave|400,{
+027-1.gat,118,54,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Yosuhara ~";
     mes "Contributed some of the tombstones.";
     close;
 }
 
-027-1.gat,111,62,0|script|Grave|400,{
+027-1.gat,111,62,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Feline Monstrosity ~";
     mes "Made the background music you are hearing.";
     close;
 }
 
-027-1.gat,112,76,0|script|Grave|400,{
+027-1.gat,112,76,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Superkoop ~";
     mes "Mapped the swamp to the south.";
     close;
 }
 
-027-1.gat,120,76,0|script|Grave|400,{
+027-1.gat,120,76,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Aroleon ~";
     mes "Mapped the swamp to the southeast.";
     close;
 }
 
-027-1.gat,100,68,0|script|Grave|400,{
+027-1.gat,100,68,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ John P ~";
     mes "Wrote the graveyard backstory and the dialog for the caretaker quest.";
     close;
 }
 
-027-1.gat,94,70,0|script|Grave|400,{
+027-1.gat,94,70,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Spit23 ~";
     mes "Made those freakin awesome cemetery gates.";
     close;
 }
 
-027-1.gat,106,60,0|script|Grave|400,{
+027-1.gat,106,60,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Black Don ~";
     mes "Contributed those cool gargoyle statues.";
     close;
 }
 
-027-1.gat,92,54,0|script|Grave|400,{
+027-1.gat,92,54,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Jaxad0127 ~";
     mes "Did all the scripting work for the graveyard. Made Caretaker's house.";
     close;
 }
 
-027-1.gat,122,64,0|script|Grave|400,{
+027-1.gat,122,64,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Ces Vargavind ~";
     mes "Scripted caretaker's daughter.";
     close;
 }
 
-027-1.gat,102,62,0|script|Grave|400,{
+027-1.gat,102,62,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Crush ~";
     mes "Organizer of the whole graveyard project, graveyard fence graphics, mapping of the graveyard itself.";
     close;
 }
 
-027-1.gat,104,76,0|script|Grave|400,{
+027-1.gat,104,76,0|script|Grave|400,
+{
     callfunc "GraveTooFar";
     mes "~ Freeyorp ~";
     mes "Planned out monster stats and placements.";
diff --git a/world/map/npc/027-1/monsters.txt b/world/map/npc/027-1/monsters.txt
index 9f49e673..8daed98c 100644
--- a/world/map/npc/027-1/monsters.txt
+++ b/world/map/npc/027-1/monsters.txt
@@ -6,7 +6,8 @@
 027-1.gat,37,65,33,22|monster|Zombie|1036,3,140000,30000,specialMob027-1::On1036
 027-1.gat,37,65,33,22|monster|Fallen|1045,3,120000,30000,specialMob027-1::On1045
 
-027-1.gat,0,0,0|script|specialMob027-1|-1,{
+027-1.gat,0,0,0|script|specialMob027-1|-1,
+{
 On1036:
     set @mobID, 1036;
     callsub _MOBCOUNT_ZOMBIES;