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, 22 insertions, 0 deletions

diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt
new file mode 100644
index 00000000..d4a6821a
--- /dev/null
+++ b/npc/000-1/exit.txt
@@ -0,0 +1,22 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Special Soul Menhir which only allows leaving the map.
+
+000-1,22,22,0	script	Emergency Exit	NPC_NO_SPRITE,2,2,{
+OnTouch:
+OnTalk:
+OnTalkNearby:
+    if (LOCATION$ != "") goto L_ToLoc;
+    if (Sex)
+        warp "029-2", 25, 24;
+    else
+        warp "029-2", 22, 24;
+    end;
+L_ToLoc:
+    // Possibly could warp to "Save" as well?
+    ReturnTown();
+    end;
+}
+