Improve Plush and the savepoint functions.

Add bed functions into a different file and prevent the use of unlimited heal by disallowing the feature to switch of savepoint while keeping the reservation on the INN.

1 files changed, 9 insertions, 69 deletions

diff --git a/npc/001-2-29/savepoint.txt b/npc/001-2-29/savepoint.txt
index 3977b473..62e84015 100644
--- a/npc/001-2-29/savepoint.txt
+++ b/npc/001-2-29/savepoint.txt
@@ -4,30 +4,15 @@
 // Description:
 //    Saves locations in 001-2-29 map.
 
-001-2-29,29,28,0	script	#001-2-29-1	NPC_SAVE_POINT,0,0,0,0,{
-    narrator 4,
-        l("Do you want to use this place as save point?");
-
-    if (select (l("[Yes]"), l("[No]")) == 1)
-    {
-        savepointparticle "001-2-29.gat", 29, 28;
-    }
-    closedialog;
-    close;
+001-2-29,29,28,0	script	#001-2-29-1	NPC_SAVE_POINT,0,0,{
+    bedClic ("001-2-29.gat", 29, 28, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
     end;
 
 OnTouch:
-    if (PC_Is_Dead && INN_Register == REDPLUSH_INN)
-    {
-        INN_Register = NO_INN;
-        percentheal 100,100;
-
-        PC_Is_Dead = 0;
-    }
-    close;
+    bedTouch;
 
 OnPCDieEvent:
     PC_Is_Dead = 1;
@@ -35,79 +20,34 @@ OnPCDieEvent:
 }
 
 001-2-29,29,35,0	script	#001-2-29-2	NPC_SAVE_POINT,0,0,{
-    narrator 4,
-        l("Do you want to use this place as save point?");
-
-    if (select (l("[Yes]"), l("[No]")) == 1)
-    {
-        savepointparticle "001-2-29.gat", 29, 35;
-    }
-    closedialog;
-    close;
+    bedClic ("001-2-29.gat", 29, 35, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
     end;
 
 OnTouch:
-    if (PC_Is_Dead && INN_Register == REDPLUSH_INN)
-    {
-        INN_Register = NO_INN;
-        percentheal 100,100;
-
-        PC_Is_Dead = 0;
-    }
-    close;
+    bedTouch;
 }
 
 001-2-29,29,42,0	script	#001-2-29-3	NPC_SAVE_POINT,0,0,{
-    narrator 4,
-        l("Do you want to use this place as save point?");
-
-    if (select (l("[Yes]"), l("[No]")) == 1)
-    {
-        savepointparticle "001-2-29.gat", 29, 42;
-    }
-    closedialog;
-    close;
+    bedClic ("001-2-29.gat", 29, 42, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
     end;
 
 OnTouch:
-    if (PC_Is_Dead && INN_Register == REDPLUSH_INN)
-    {
-        INN_Register = NO_INN;
-        percentheal 100,100;
-
-        PC_Is_Dead = 0;
-    }
-    close;
+    bedTouch;
 }
 
 001-2-29,29,49,0	script	#001-2-29-4	NPC_SAVE_POINT,0,0,{
-    narrator 4,
-        l("Do you want to use this place as save point?");
-
-    if (select (l("[Yes]"), l("[No]")) == 1)
-    {
-        savepointparticle "001-2-29.gat", 29, 49;
-    }
-    closedialog;
-    close;
+    bedClic ("001-2-29.gat", 29, 49, REDPLUSH_INN);
 
 OnInit:
     .distance = 2;
     end;
 
 OnTouch:
-    if (PC_Is_Dead && INN_Register == REDPLUSH_INN)
-    {
-        INN_Register = NO_INN;
-        percentheal 100,100;
-
-        PC_Is_Dead = 0;
-    }
-    close;
+    bedTouch;
 }