Merge branch 'master' into jesusalva/legion

34 files changed, 586 insertions, 176 deletions

diff --git a/conf/atcommand.conf b/conf/atcommand.conf
index ac4cee47..2241fa74 100644
--- a/conf/atcommand.conf
+++ b/conf/atcommand.conf
@@ -61,6 +61,7 @@ aliases: {
 	camerainfo: ["setcamera", "viewpointvalue"]
 	tee: ["t"]
 	log: ["l"]
+	request: ["wgm"]
 }
 
 /* List of commands that should not be logged at all */
diff --git a/db/constants.conf b/db/constants.conf
index c9fcf425..0451b262 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4086,6 +4086,7 @@ constants_db: {
     NPC_SABINE:             184
     NPC_MIKHAIL:            185
     NPC_TROUPE_LEADER:      186
+    NPC_SIMON:              187
 
     NPC_CONFUSED_TREE:      400
     NPC_ALIGE:              401
@@ -4194,7 +4195,7 @@ constants_db: {
     comment__: "INN enum"
     NO_INN:                 0
     REDPLUSH_INN:           1
-    CURRENT_INN:            2
+    RUSTYPICK_INN:          2
 
     comment__: "CRAFT enum"
     CRAFT_SANDWICH:         4
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0dd35a51..753dc25a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1294,8 +1294,8 @@ item_db: (
     AegisName: "SmallHealing"
     Name: "Small Healing Potion"
     Type: "IT_HEALING"
-    Buy: 2500
-    Sell: 300
+    Buy: 500
+    Sell: 45
     Weight: 32
     Atk: 0
     Matk: 0
@@ -1311,8 +1311,8 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 200;
-        @max = 300;
+        @min = 300;
+        @max = 500;
         @delay = 3;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1323,8 +1323,8 @@ item_db: (
     AegisName: "MediumHealing"
     Name: "Medium Healing Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 650
+    Buy: 850
+    Sell: 75
     Weight: 64
     Atk: 0
     Matk: 0
@@ -1340,8 +1340,8 @@ item_db: (
     Sprite: 0
     UseEffect: "EFFECT_HEAL"
     Script: <"
-        @min = 400;
-        @max = 600;
+        @min = 500;
+        @max = 800;
         @delay = 4;
         @type = 2;
         doevent "rand_sc_heal::OnUse";
@@ -1352,8 +1352,8 @@ item_db: (
     AegisName: "LargeHealing"
     Name: "Large Healing Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1250
+    Buy: 2480
+    Sell: 350
     Weight: 128
     Atk: 0
     Matk: 0
@@ -1381,8 +1381,8 @@ item_db: (
     AegisName: "SmallMana"
     Name: "Small Mana Potion"
     Type: "IT_HEALING"
-    Buy: 2000
-    Sell: 250
+    Buy: 750
+    Sell: 65
     Weight: 32
     Atk: 0
     Matk: 0
@@ -1406,8 +1406,8 @@ item_db: (
     AegisName: "MediumMana"
     Name: "Medium Mana Potion"
     Type: "IT_HEALING"
-    Buy: 5000
-    Sell: 600
+    Buy: 1650
+    Sell: 205
     Weight: 64
     Atk: 0
     Matk: 0
@@ -1431,8 +1431,8 @@ item_db: (
     AegisName: "LargeMana"
     Name: "Large Mana Potion"
     Type: "IT_HEALING"
-    Buy: 10000
-    Sell: 1500
+    Buy: 3240
+    Sell: 340
     Weight: 128
     Atk: 0
     Matk: 0
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;
 }
diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt
index 3aecb09a..da0ab629 100644
--- a/npc/001-1/koga.txt
+++ b/npc/001-1/koga.txt
@@ -16,5 +16,6 @@
 OnInit:
     .sex = G_MALE;
     .distance = 4;
+    .alwaysVisible = true;
     end;
 }
diff --git a/npc/001-2-1/_savepoints.txt b/npc/001-2-1/_savepoints.txt
index 4b3f1497..fa9c1ecc 100644
--- a/npc/001-2-1/_savepoints.txt
+++ b/npc/001-2-1/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-1: Noble House saves
-001-2-1,27,30,0	script	#save_001-2-1_27_30	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-1,27,30,0	script	#save_001-2-1_27_30	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/001-2-10/_savepoints.txt b/npc/001-2-10/_savepoints.txt
index c98aa450..91b14f37 100644
--- a/npc/001-2-10/_savepoints.txt
+++ b/npc/001-2-10/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-10: Noble House saves
-001-2-10,26,30,0	script	#save_001-2-10_26_30	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-10,26,30,0	script	#save_001-2-10_26_30	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/001-2-11/_savepoints.txt b/npc/001-2-11/_savepoints.txt
index fc0b47fb..00b8c05c 100644
--- a/npc/001-2-11/_savepoints.txt
+++ b/npc/001-2-11/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-11: Noble House saves
-001-2-11,26,31,0	script	#save_001-2-11_26_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-11,26,31,0	script	#save_001-2-11_26_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/001-2-13/_savepoints.txt b/npc/001-2-13/_savepoints.txt
index dd210526..fd073ac6 100644
--- a/npc/001-2-13/_savepoints.txt
+++ b/npc/001-2-13/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-13: First Floor saves
-001-2-13,41,31,0	script	#save_001-2-13_41_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-13,41,31,0	script	#save_001-2-13_41_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/001-2-15/_savepoints.txt b/npc/001-2-15/_savepoints.txt
index c8b82561..cd164505 100644
--- a/npc/001-2-15/_savepoints.txt
+++ b/npc/001-2-15/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-15: Noble House saves
-001-2-15,27,41,0	script	#save_001-2-15_27_41	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-15,27,41,0	script	#save_001-2-15_27_41	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/001-2-22/_savepoints.txt b/npc/001-2-22/_savepoints.txt
index a0bd9f89..b4a5c1ba 100644
--- a/npc/001-2-22/_savepoints.txt
+++ b/npc/001-2-22/_savepoints.txt
@@ -1,47 +1,67 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-22: Second Deck saves
-001-2-22,40,37,0	script	#save_001-2-22_40_37	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-22,40,37,0	script	#save_001-2-22_40_37	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-22,46,37,0	script	#save_001-2-22_46_37	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-22,46,37,0	script	#save_001-2-22_46_37	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-22,55,40,0	script	#save_001-2-22_55_40	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-22,55,40,0	script	#save_001-2-22_55_40	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-22,50,38,0	script	#save_001-2-22_50_38	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-22,50,38,0	script	#save_001-2-22_50_38	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-001-2-22,53,38,0	script	#save_001-2-22_53_38	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-22,53,38,0	script	#save_001-2-22_53_38	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
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;
-}
diff --git a/npc/001-2-3/_savepoints.txt b/npc/001-2-3/_savepoints.txt
index a3e08055..e835aaa1 100644
--- a/npc/001-2-3/_savepoints.txt
+++ b/npc/001-2-3/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 001-2-3: First Floor saves
-001-2-3,42,32,0	script	#save_001-2-3_42_32	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-3,42,32,0	script	#save_001-2-3_42_32	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
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;
 }
diff --git a/npc/001-2-38/_savepoints.txt b/npc/001-2-38/_savepoints.txt
index 8b89b8e5..d4e4db2c 100644
--- a/npc/001-2-38/_savepoints.txt
+++ b/npc/001-2-38/_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-38: unnamed saves
-001-2-38,25,41,0	script	#save_001-2-38_25_41	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-38,25,41,0	script	#save_001-2-38_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-38,35,41,0	script	#save_001-2-38_35_41	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-38,35,41,0	script	#save_001-2-38_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-38,35,46,0	script	#save_001-2-38_35_46	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-38,35,46,0	script	#save_001-2-38_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-38,25,46,0	script	#save_001-2-38_25_46	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+001-2-38,25,46,0	script	#save_001-2-38_25_46	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-1/soul-menhir.txt b/npc/008-1/soul-menhir.txt
index 3c295c92..2c57f0de 100644
--- a/npc/008-1/soul-menhir.txt
+++ b/npc/008-1/soul-menhir.txt
@@ -5,7 +5,11 @@
 //    place of power, mana refills faster when sitting nearby
 
 008-1,252,111,0	script	Soul Menhir#hurnscald	NPC_NO_SPRITE,{
-
+    if (!@menhir_meditation_message)
+    {
+        dispbottom(l("You feel a strong magic aura. You want to sit near it and meditate."));
+        @menhir_meditation_message=1;
+    }
     end;
 
 OnRefill:
diff --git a/npc/008-2-0/_savepoints.txt b/npc/008-2-0/_savepoints.txt
index 6da9c7b3..2c108fa8 100644
--- a/npc/008-2-0/_savepoints.txt
+++ b/npc/008-2-0/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-0: Chez Celestia saves
-008-2-0,38,27,0	script	#save_008-2-0_38_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-0,38,27,0	script	#save_008-2-0_38_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-1/_savepoints.txt b/npc/008-2-1/_savepoints.txt
index 66730940..19f0f307 100644
--- a/npc/008-2-1/_savepoints.txt
+++ b/npc/008-2-1/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-1: Merchant Guild saves
-008-2-1,42,27,0	script	#save_008-2-1_42_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-1,42,27,0	script	#save_008-2-1_42_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-11/_savepoints.txt b/npc/008-2-11/_savepoints.txt
index cccf4138..db593899 100644
--- a/npc/008-2-11/_savepoints.txt
+++ b/npc/008-2-11/_savepoints.txt
@@ -1,20 +1,28 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-11: Hurnscald City Hall saves
-008-2-11,26,27,0	script	#save_008-2-11_26_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-11,26,27,0	script	#save_008-2-11_26_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-11,45,27,0	script	#save_008-2-11_45_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-11,45,27,0	script	#save_008-2-11_45_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-13/_savepoints.txt b/npc/008-2-13/_savepoints.txt
index 5c8fc22d..b82ce152 100644
--- a/npc/008-2-13/_savepoints.txt
+++ b/npc/008-2-13/_savepoints.txt
@@ -1,38 +1,54 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-13: Hurnscald Clinic saves
-008-2-13,29,27,0	script	#save_008-2-13_29_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-13,29,27,0	script	#save_008-2-13_29_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-13,32,27,0	script	#save_008-2-13_32_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-13,32,27,0	script	#save_008-2-13_32_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-13,29,31,0	script	#save_008-2-13_29_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-13,29,31,0	script	#save_008-2-13_29_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-13,32,31,0	script	#save_008-2-13_32_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-13,32,31,0	script	#save_008-2-13_32_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-14/_savepoints.txt b/npc/008-2-14/_savepoints.txt
index cbb6fd12..9eb50488 100644
--- a/npc/008-2-14/_savepoints.txt
+++ b/npc/008-2-14/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-14: Hurnscald Clinic saves
-008-2-14,31,27,0	script	#save_008-2-14_31_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-14,31,27,0	script	#save_008-2-14_31_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-2/melania.txt b/npc/008-2-2/melania.txt
index 9d9473f2..bfd1e8be 100644
--- a/npc/008-2-2/melania.txt
+++ b/npc/008-2-2/melania.txt
@@ -3,19 +3,106 @@
 //    Micksha
 // Description:
 //    Receptionist of Rusty Pick.
-// THIS IS A PLACEHOLDER!
 
 008-2-2,28,27,0	script	Melania	NPC_AIRLIA,{
+    function accepted_room;
+    function register_room;
+    function lodge_check;
+
     speech
         lg("Hello Sir.","Hello Miss."),
-        l("Welcome to the Rusty Pick. Sorry, we have no room left today."),
+        l("Welcome to the Rusty Pick."),
         l("One advice: Don't take the things those drinkers say too serious. They are sitting here and drinking all day."),
-        l("I wish you a beautiful day.");
+        l("How can we serve you today?");
+
+    do
+    {
+        select
+            l("Could I lodge here for a while?"),
+            l("Nothing.");
+        mes "";
+
+        if (@menu == 1)
+            lodge_check();
 
+    } while (@menu != 2);
+    mesn;
+    l("I wish you a beautiful day.");
     close;
 
+    // Check if you are booked here or somewhere else
+    function lodge_check {
+        if (INN_REGISTER == NO_INN)
+        {
+            register_room();
+        }
+        else if (INN_REGISTER == .inn)
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                lg("You are already registered here."),
+                l("Go on the upper level if you want to change your room or to use it.");
+        }
+        else
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                lg("If you are registered somewhere else you will loose that reservation."),
+                l("Do you still want to lodge here?");
+
+            if (askyesno() == ASK_YES)
+            {
+                register_room();
+            }
+        }
+        return;
+    }
+
+    // Find out prices
+    function register_room {
+        .@price = lognbaselvl(100, 10);
+        .@price = .@price*12/10; // Make the price 20% higher by WildX request
+
+        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+            l("That will be @@ E to set your respawn point", .@price),
+            l("This will remain your respawn point until set elsewhere."),
+            l("Is that okay?");
+
+        if (askyesno() == ASK_YES)
+        {
+            accepted_room(.@price);
+        }
+        else
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                l("Come back later if you changed your mind!");
+        }
+
+        return;
+    }
+
+    // Book a room
+    function accepted_room {
+        .@price = getarg(0);
+        if (Zeny < .@price)
+        {
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@price);
+        }
+        else
+        {
+            emotion E_HAPPY;
+            Zeny = Zeny - .@price;
+            INN_REGISTER = .inn;
+            PC_IS_DEAD = false;
+
+            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+                lg("I registered you on a random bed on the upper level."),
+                l("You can go upstairs and choose a different room if you want.");
+            savepoint "008-2-3", any(49, 53, 57), any(31, 35);
+        }
+    }
+
 OnInit:
     .sex = G_FEMALE;
     .distance = 2;
+    .inn=RUSTYPICK_INN;
     end;
 }
diff --git a/npc/008-2-22/_savepoints.txt b/npc/008-2-22/_savepoints.txt
index 999032f6..1cc5c220 100644
--- a/npc/008-2-22/_savepoints.txt
+++ b/npc/008-2-22/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-22: Mages Hut saves
-008-2-22,26,31,0	script	#save_008-2-22_26_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-22,26,31,0	script	#save_008-2-22_26_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-3/_savepoints.txt b/npc/008-2-3/_savepoints.txt
index ab7e555d..4e70dc2e 100644
--- a/npc/008-2-3/_savepoints.txt
+++ b/npc/008-2-3/_savepoints.txt
@@ -1,74 +1,106 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-3: The Rusty Pick saves
-008-2-3,61,31,0	script	#save_008-2-3_61_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,61,31,0	script	#save_008-2-3_61_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,60,35,0	script	#save_008-2-3_60_35	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,60,35,0	script	#save_008-2-3_60_35	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,57,31,0	script	#save_008-2-3_57_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,57,31,0	script	#save_008-2-3_57_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,57,35,0	script	#save_008-2-3_57_35	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,57,35,0	script	#save_008-2-3_57_35	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,53,35,0	script	#save_008-2-3_53_35	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,53,35,0	script	#save_008-2-3_53_35	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,53,31,0	script	#save_008-2-3_53_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,53,31,0	script	#save_008-2-3_53_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,49,31,0	script	#save_008-2-3_49_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,49,31,0	script	#save_008-2-3_49_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
-008-2-3,49,35,0	script	#save_008-2-3_49_35	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-3,49,35,0	script	#save_008-2-3_49_35	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, RUSTYPICK_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-4/_savepoints.txt b/npc/008-2-4/_savepoints.txt
index 103787d1..0129971e 100644
--- a/npc/008-2-4/_savepoints.txt
+++ b/npc/008-2-4/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-4: The Rusty Pick saves
-008-2-4,25,27,0	script	#save_008-2-4_25_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-4,25,27,0	script	#save_008-2-4_25_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-7/_savepoints.txt b/npc/008-2-7/_savepoints.txt
index f3faa80f..ab8ddbb4 100644
--- a/npc/008-2-7/_savepoints.txt
+++ b/npc/008-2-7/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-7: Hurnscald Apothecary saves
-008-2-7,25,27,0	script	#save_008-2-7_25_27	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-7,25,27,0	script	#save_008-2-7_25_27	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/008-2-7/shop.txt b/npc/008-2-7/shop.txt
new file mode 100644
index 00000000..30989eb3
--- /dev/null
+++ b/npc/008-2-7/shop.txt
@@ -0,0 +1,36 @@
+// Evol scripts.
+// Authors:
+//    4144
+//    Micksha
+//    Reid
+//    toams
+// Description:
+//    Simons Potion Shop.
+
+008-2-7,30,26,0	trader	#Invisible008-2-7	NPC_HIDDEN,{
+
+OnInit:
+    tradertype(NST_MARKET);
+
+    sellitem SmallHealing, -1, 10;
+    sellitem MediumHealing, -1, 5;
+    sellitem SmallMana, -1, 10;
+    sellitem MediumMana, -1, 5;
+    sellitem ConcPotion, -1, 3;
+    sellitem IronPotion, -1, 3;
+
+    .sex = G_OTHER;
+    .distance = 2;
+    end;
+
+OnClock0000:
+OnClock0800:
+OnClock1600:
+    restoreshopitem SmallHealing, 10;
+    restoreshopitem MediumHealing, 5;
+    restoreshopitem SmallMana, 10;
+    restoreshopitem MediumMana, 5;
+    restoreshopitem ConcPotion, 3;
+    restoreshopitem IronPotion, 3;
+    end;
+}
diff --git a/npc/008-2-7/simon.txt b/npc/008-2-7/simon.txt
new file mode 100644
index 00000000..1b4ae071
--- /dev/null
+++ b/npc/008-2-7/simon.txt
@@ -0,0 +1,39 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    Simon, Wyaras Apprentice.
+// THIS IS A PLACEHOLDER!
+
+008-2-7,30,26,0	script	Simon	NPC_SIMON,{
+    speech
+        l("Hi, I am Simon."),
+        l("I am Wyaras apprentice, helping her with selling her potions."),
+        l("I would prefer becoming a real Sorcerer one time. *sighs*");
+
+    switch (select(l("Potions? That sounds useful. What do you have?"),
+                   l("Thats your problem, really."),
+                   l("Becoming a Sorcerer? I want that too!")))
+    {
+    case 1:
+        closeclientdialog;
+        shop "#Invisible008-2-7";
+        close;
+    case 2:
+        speech S_FIRST_BLANK_LINE,
+        l("Leave me alone.");
+        close;
+    case 3:
+        speech S_FIRST_BLANK_LINE,
+        l("It needs so much training, but Wyara only leaves me here, standing and selling something instead of teaching me.");
+        close;
+    }
+
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 2;
+    end;
+}
diff --git a/npc/008-2-7/wyara.txt b/npc/008-2-7/wyara.txt
index a875544a..502a5409 100644
--- a/npc/008-2-7/wyara.txt
+++ b/npc/008-2-7/wyara.txt
@@ -3,16 +3,79 @@
 //    Micksha
 // Description:
 //    Wyara the witch.
-// THIS IS A PLACEHOLDER!
+// TODO: Buy or make plushroom potions
+// TODO: Should she ask for a money comission when resetting status?
 
 008-2-7,27,28,0	script	Wyara#008-2-7	NPC_DARK_DRUID,{
+    function confirmStatusReset;
+    function doStatusReset;
     speech
         l("What? Is there someone?"),
         l("Please, leave me alone. I have to pixel potions."),
-        lg("I will sell some when you return a bit later.");
-
+        lg("I will sell some when you return a bit later."),
+        l("Unless you are interested in a status reset?");
+    next;
+    do
+    {
+        select
+            l("I'm fine, thanks."),
+            l("I actually could use a status reset!");
+        switch (@menu) {
+            case 2:
+                @plush_count = lognbaselvl(1, 10);
+                @plush_count = @plush_count*12/10;
+                if (confirmStatusReset())
+                    doStatusReset();
+                break;
+        }
+    } while (@menu != 1);
+    // Note: There is some dark magic here, because confirmStatusReset() overrides @menu.
     close;
 
+function confirmStatusReset {
+    mesn;
+    mesq l("Let me just have a quick look at you. Hm... I will need @@ @@s to reset your stats.", @plush_count, getitemlink(Plushroom));
+    next;
+    mesn;
+    mesq l("Also, status point reset can't be undone. Do you really want this?");
+    next;
+    if (askyesno() == ASK_YES)
+    {
+        if (countitem(Plushroom) >= @plush_count)
+            return 1;
+        mesn;
+        mesq l("Alright, but... You only have @@ @@, and I need @@ to do the status reset for you!", countitem(Plushroom), getitemlink(Plushroom), @plush_count);
+    }
+    return 0;
+}
+
+function doStatusReset {
+    delitem Plushroom, @plush_count;
+
+    .@wasSP = StatusPoint;
+    resetstatus;
+
+    // Everything was done before dialog in case of forced disconnection
+    speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
+        l("Thank you."),
+        l("Now stand still... It should not take much time...");
+    if (StatusPoint == .@wasSP)
+    {
+        speech
+            l("It seems that you have no status points to reset!"),
+            l("I'll return the plushroom to you, but please, do not waste my time.");
+        getitem Plushroom, @plush_count;
+    }
+    else
+    {
+        speech
+            l("Let's see... @@ of your status points have just been reset!", StatusPoint - .@wasSP),
+            l("Spend it wisely this time."),
+            lg("But you are welcome to reset your stats again if you bring me some more plushrooms!");
+    }
+    return;
+}
+
 OnInit:
     .sex = G_FEMALE;
     .distance = 2;
diff --git a/npc/008-2-9/_savepoints.txt b/npc/008-2-9/_savepoints.txt
index e2aae529..b606d73c 100644
--- a/npc/008-2-9/_savepoints.txt
+++ b/npc/008-2-9/_savepoints.txt
@@ -1,11 +1,15 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-2-9: Jack's Abode saves
-008-2-9,26,31,0	script	#save_008-2-9_26_31	NPC_SAVE_POINT,{
-    savepointparticle .map$, .x, .y, CURRENT_INN;
+008-2-9,26,31,0	script	#save_008-2-9_26_31	NPC_SAVE_POINT,0,0,{
+    savepointparticle .map$, .x, .y, NO_INN;
     close;
 
 OnInit:
     .distance = 2;
     .sex = G_OTHER;
     end;
+
+OnTouch:
+    bedTouch();
+    end;
 }
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt
index 9c871a44..a4301891 100644
--- a/npc/functions/beds.txt
+++ b/npc/functions/beds.txt
@@ -2,14 +2,16 @@
 // Authors:
 //    4144
 //    Reid
+//    Jesusalva
 // Description:
 //    Beds utility functions
 
+// bedTouch({inn})
 function	script	bedTouch	{
     if (PC_IS_DEAD)
     {
         PC_IS_DEAD = 0;
-        if (INN_REGISTER == REDPLUSH_INN)
+        if (INN_REGISTER != NO_INN)
         {
             INN_REGISTER = NO_INN;
             percentheal 100,100;
@@ -18,13 +20,3 @@ function	script	bedTouch	{
     close;
 }
 
-function	script	bedClic	{
-    narrator S_LAST_NEXT, l("Do you want to use this place as save point?");
-
-    if (askyesno() == ASK_YES)
-    {
-        savepointparticle getarg(0, ""), getarg(1, -1), getarg(2, -1), getarg(3, NO_INN);
-    }
-    closeclientdialog;
-    close;
-}
diff --git a/npc/functions/savepoint.txt b/npc/functions/savepoint.txt
index 0e0b6f90..46ef73e8 100644
--- a/npc/functions/savepoint.txt
+++ b/npc/functions/savepoint.txt
@@ -34,12 +34,21 @@ function	script	savepointparticle	{
         .@i = 0;
     }
 
-    message strcharinfo(0), l("Your position has been saved.");
-
-    if (getarg(.@i, NO_INN) == NO_INN)
+    // If this will override your current inn, a confirmation is required.
+    // Unless you already don't have a booked place, then, confirmation is never shown.
+    if (getarg(.@i, NO_INN) != INN_REGISTER && INN_REGISTER != NO_INN)
     {
+        mesc l("Do you want to use this place as save point?");
+        mesc b(l("Warning: ")) + l("Previous Inn reservation will be lost!");
+
+        if (askyesno() != ASK_YES)
+            close;
+
         INN_REGISTER = NO_INN;
     }
+
+    message strcharinfo(0), l("Your position has been saved.");
+
     savepoint .@mapname$, .@mapx, .@mapy;
     specialeffect(4, SELF, getcharid(3));
     @lastSave = gettimetick(2);