Merge pull request #121 from wushin/move-utilities-from-botcheck

Moving GM/Dev utilities off of botcheck

10 files changed, 9 insertions, 8 deletions

diff --git a/world/map/npc/017-9/_import.txt b/world/map/npc/017-9/_import.txt
index 69c67d6f..4e650df8 100644
--- a/world/map/npc/017-9/_import.txt
+++ b/world/map/npc/017-9/_import.txt
@@ -3,4 +3,5 @@
 map: 017-9.gat
 npc: npc/017-9/_mobs.txt
 npc: npc/017-9/_warps.txt
+npc: npc/017-9/announcements.txt
 npc: npc/017-9/mapflags.txt
diff --git a/world/map/npc/botcheck/announcements.txt b/world/map/npc/017-9/announcements.txt
index cb7a5f8f..585fbc28 100644
--- a/world/map/npc/botcheck/announcements.txt
+++ b/world/map/npc/017-9/announcements.txt
@@ -13,7 +13,7 @@
 // $@GMSA_TICK: broadcast the message every $@GMSA_TICK hours
 // $@GMSA_CURRENT_TICK: internal counter incremented every hour
 
-botcheck.gat,49,29,0|script|Stone Board|348,
+017-9.gat,26,24,0|script|Stone Board|145,
 {
     if (getgmlevel() < 60)
         goto L_Close;
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index bedf23f6..40af55ff 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -1,7 +1,7 @@
 // Annual Timer
 // One timer to check to enable all holiday events
 
-botcheck.gat,26,28,0|script|#HolidayConfig|-1,
+017-9.gat,26,28,0|script|#HolidayConfig|-1,
 {
     end;
 
diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt
index d51f57ac..38bbdf15 100644
--- a/world/map/npc/annuals/xmas/debug.txt
+++ b/world/map/npc/annuals/xmas/debug.txt
@@ -228,7 +228,7 @@ L_End:
 }
 
 
-botcheck.gat,26,28,0|script|XmasDebug#5|105,
+017-9.gat,31,24,0|script|XmasDebug#5|105,
 {
     if(getgmlevel() < 40)
         goto L_End;
diff --git a/world/map/npc/botcheck/_import.txt b/world/map/npc/botcheck/_import.txt
index affc86ce..d2a6a9e1 100644
--- a/world/map/npc/botcheck/_import.txt
+++ b/world/map/npc/botcheck/_import.txt
@@ -3,5 +3,4 @@
 map: botcheck.gat
 npc: npc/botcheck/_mobs.txt
 npc: npc/botcheck/_warps.txt
-npc: npc/botcheck/announcements.txt
 npc: npc/botcheck/mapflags.txt
diff --git a/world/map/npc/botcheck/mapflags.txt b/world/map/npc/botcheck/mapflags.txt
index b4dbac8a..cce971d6 100644
--- a/world/map/npc/botcheck/mapflags.txt
+++ b/world/map/npc/botcheck/mapflags.txt
@@ -1 +1,2 @@
 botcheck.gat|mapflag|resave|botcheck.gat,37,37
+botcheck.gat|mapflag|nosave|botcheck.gat,37,37
diff --git a/world/map/npc/functions/debug.txt b/world/map/npc/functions/debug.txt
index 9918cbaf..b4a66314 100755
--- a/world/map/npc/functions/debug.txt
+++ b/world/map/npc/functions/debug.txt
@@ -956,7 +956,7 @@ OnInit:
     end;
 }
 
-botcheck.gat,50,28,0|script|Debug4|154,
+017-9.gat,21,24,0|script|Debug4|154,
 {
     callfunc "Debug";
     end;
diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 271a2e39..c2e92271 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -1,6 +1,6 @@
 // The ferry system
 
-botcheck.gat,27,28,0|script|#FerryConfig|-1,
+017-9.gat,27,28,0|script|#FerryConfig|-1,
 {
     end;
 
diff --git a/world/map/npc/functions/travelers.txt b/world/map/npc/functions/travelers.txt
index 7aa0d4b1..e455eb74 100644
--- a/world/map/npc/functions/travelers.txt
+++ b/world/map/npc/functions/travelers.txt
@@ -6,7 +6,7 @@
 // Costs Zeny
 
 // Contains all warp points to find
-botcheck.gat,27,28,0|script|#TravelConfig|-1,
+017-9.gat,27,28,0|script|#TravelConfig|-1,
 {
     end;
 
diff --git a/world/map/npc/items/unequipcb.txt b/world/map/npc/items/unequipcb.txt
index 10080990..5db24bd4 100644
--- a/world/map/npc/items/unequipcb.txt
+++ b/world/map/npc/items/unequipcb.txt
@@ -2,7 +2,7 @@
 // on any map because of the -1s at the end.
 // Note: the client (I think) has a display bug if this is called
 // during the intial connection's equip hook
-botcheck.gat,0,0,0|script|UnequipCB|-1,-1,-1
+017-9.gat,0,0,0|script|UnequipCB|-1,-1,-1
 {
     end;