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

1 files changed, 20 insertions, 4 deletions

diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt
index 14b79c7e..da074f25 100644
--- a/npc/000-2-1/_savepoints.txt
+++ b/npc/000-2-1/_savepoints.txt
@@ -1,6 +1,6 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 000-2-1: Second Deck saves
-000-2-1,40,37,0	script	#save_000-2-1_40_37	NPC_SAVE_POINT,{
+000-2-1,40,37,0	script	#save_000-2-1_40_37	NPC_SAVE_POINT,0,0,{
     savepointparticle .map$, .x, .y, NO_INN;
     close;
 
@@ -8,8 +8,12 @@ OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-000-2-1,46,37,0	script	#save_000-2-1_46_37	NPC_SAVE_POINT,{
+000-2-1,46,37,0	script	#save_000-2-1_46_37	NPC_SAVE_POINT,0,0,{
     savepointparticle .map$, .x, .y, NO_INN;
     close;
 
@@ -17,8 +21,12 @@ OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-000-2-1,50,38,0	script	#save_000-2-1_50_38	NPC_SAVE_POINT,{
+000-2-1,50,38,0	script	#save_000-2-1_50_38	NPC_SAVE_POINT,0,0,{
     savepointparticle .map$, .x, .y, NO_INN;
     close;
 
@@ -26,8 +34,12 @@ OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-000-2-1,55,40,0	script	#save_000-2-1_55_40	NPC_SAVE_POINT,{
+000-2-1,55,40,0	script	#save_000-2-1_55_40	NPC_SAVE_POINT,0,0,{
     savepointparticle .map$, .x, .y, NO_INN;
     close;
 
@@ -35,4 +47,8 @@ OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }