Merge branch 'jesusalva/inns' into 'master'galimatia

Reimplement INN system and add Rusty Pick Inn

Closes evol-all#8

See merge request evol/serverdata!170

3 files changed, 55 insertions, 54 deletions

diff --git a/npc/001-2-29/_import.txt b/npc/001-2-29/_import.txt
index 39bb3601..ebcab6d1 100644
--- a/npc/001-2-29/_import.txt
+++ b/npc/001-2-29/_import.txt
@@ -1,5 +1,5 @@
 // Map 001-2-29: First Floor
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/001-2-29/_savepoints.txt",
 "npc/001-2-29/_warps.txt",
 "npc/001-2-29/mapflags.txt",
-"npc/001-2-29/savepoint.txt",
diff --git a/npc/001-2-29/_savepoints.txt b/npc/001-2-29/_savepoints.txt
new file mode 100644
index 00000000..c2176e4c
--- /dev/null
+++ b/npc/001-2-29/_savepoints.txt
@@ -0,0 +1,54 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 001-2-29: First Floor saves
+001-2-29,29,28,0	script	#save_001-2-29_29_28	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, REDPLUSH_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+
+OnTouch:
+    bedTouch();
+    end;
+}
+001-2-29,29,35,0	script	#save_001-2-29_29_35	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, REDPLUSH_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+
+OnTouch:
+    bedTouch();
+    end;
+}
+001-2-29,29,42,0	script	#save_001-2-29_29_42	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, REDPLUSH_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+
+OnTouch:
+    bedTouch();
+    end;
+}
+001-2-29,29,49,0	script	#save_001-2-29_29_49	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, REDPLUSH_INN;
+    close;
+
+OnInit:
+    .distance = 2;
+    .sex = G_OTHER;
+    end;
+
+OnTouch:
+    bedTouch();
+    end;
+}
diff --git a/npc/001-2-29/savepoint.txt b/npc/001-2-29/savepoint.txt
deleted file mode 100644
index 4694e31e..00000000
--- a/npc/001-2-29/savepoint.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-// Evol scripts.
-// Author:
-//    Reid
-// Description:
-//    Saves locations in 001-2-29 map.
-
-001-2-29,29,28,0	script	#001-2-29-1	NPC_SAVE_POINT,0,0,{
-    bedClic("001-2-29", 29, 28, REDPLUSH_INN);
-
-OnInit:
-    .distance = 2;
-    end;
-
-OnTouch:
-    bedTouch;
-
-OnPCDieEvent:
-    PC_IS_DEAD = 1;
-    close;
-}
-
-001-2-29,29,35,0	script	#001-2-29-2	NPC_SAVE_POINT,0,0,{
-    bedClic("001-2-29", 29, 35, REDPLUSH_INN);
-
-OnInit:
-    .distance = 2;
-    end;
-
-OnTouch:
-    bedTouch;
-}
-
-001-2-29,29,42,0	script	#001-2-29-3	NPC_SAVE_POINT,0,0,{
-    bedClic("001-2-29", 29, 42, REDPLUSH_INN);
-
-OnInit:
-    .distance = 2;
-    end;
-
-OnTouch:
-    bedTouch;
-}
-
-001-2-29,29,49,0	script	#001-2-29-4	NPC_SAVE_POINT,0,0,{
-    bedClic("001-2-29", 29, 49, REDPLUSH_INN);
-
-OnInit:
-    .distance = 2;
-    end;
-
-OnTouch:
-    bedTouch;
-}