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, 24 insertions, 8 deletions

diff --git a/npc/001-2-37/_savepoints.txt b/npc/001-2-37/_savepoints.txt
index 2568b51b..cd68fab2 100644
--- a/npc/001-2-37/_savepoints.txt
+++ b/npc/001-2-37/_savepoints.txt
@@ -1,38 +1,54 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-37: unnamed saves
-001-2-37,25,41,0	script	#save_001-2-37_25_41	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-37,25,41,0	script	#save_001-2-37_25_41	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-37,35,41,0	script	#save_001-2-37_35_41	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-37,35,41,0	script	#save_001-2-37_35_41	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-37,35,46,0	script	#save_001-2-37_35_46	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-37,35,46,0	script	#save_001-2-37_35_46	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-37,25,46,0	script	#save_001-2-37_25_46	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-37,25,46,0	script	#save_001-2-37_25_46	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }