Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 32 insertions, 0 deletions

diff --git a/npc/052-2/janitor.txt b/npc/052-2/janitor.txt
new file mode 100644
index 00000000..7583f4e4
--- /dev/null
+++ b/npc/052-2/janitor.txt
@@ -0,0 +1,32 @@
+052-2,1,1,0	script	#IlliaJanitor5	NPC32767,{
+end;
+
+OnCommandClean:
+    // For security, kill all.
+    killmonster "052-2", "All";
+    npcwarp 1, 1, "Luvia?";
+    end;
+
+}
+
+052-2,1,1,0	script	#IlliaJanitor6	NPC32767,{
+end;
+
+OnCommandClean:
+    killmonster "052-2", "#ItemsInvoker::OnDeath";
+    npcwarp 1, 1, "#ItemsInvoker";
+    end;
+
+}
+
+052-2,1,1,0	script	#IlliaJanitor7	NPC32767,{
+end;
+
+OnCommandClean:
+    killmonster "052-2", "#LuviaDaemon::OnDeath";
+    killmonster "052-2", "#LuviaDaemon::OnWGD";
+    npcwarp 93, 38, "#LuviaDaemon";
+    npcwarp 98, 25, "Luvia";
+    end;
+
+}