From 89d1489f86f9ca45d62b4fecf6ef948165ec1040 Mon Sep 17 00:00:00 2001
From: temitchell <temitchell@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Mon, 27 Oct 2003 06:41:12 +0000
Subject: [PATCH] - change the inns to use a marker good for 5040 seconds (~one
 game day AFAIK)

git-svn-id: svn://svn.code.sf.net/p/crossfire/code/trunk/maps@2428 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 inn_and_outpost/hermes_inn | 35 ++++++++++++++++++--------
 marksel/grumms_inn         | 51 ++++++++++++++++++++++----------------
 2 files changed, 54 insertions(+), 32 deletions(-)

diff --git a/inn_and_outpost/hermes_inn b/inn_and_outpost/hermes_inn
index 5ee6cc426..066ef02f5 100644
--- a/inn_and_outpost/hermes_inn
+++ b/inn_and_outpost/hermes_inn
@@ -314,8 +314,7 @@ msg
 Greetings, welcome to my inn.
 You must be cold and tired.
 @match room|Room|bed|Bed
-Need a room eh? Upstairs, cost ya 50 gold.
-If you leave you pay again.
+Need a room eh? Upstairs, cost ya 50 gold for one day.
 @match 50|fifty|Fifty
 Not much else around friend.
 @match ripoff|cheat|robbery
@@ -324,6 +323,8 @@ You could always go sleep with the bears...
 Ya Billy has been with me for 10 years.
 He's a little slow on the uptake,
 but he's a good kid.
+@match Aza|aza
+Who?  Never heard of him.
 @match *
 What can I gettcha?
 endmsg
@@ -1357,6 +1358,11 @@ arch woodfloor2
 x 14
 y 1
 end
+arch clock
+no_pick 1
+x 14
+y 1
+end
 arch woodfloor2
 x 14
 y 2
@@ -1985,18 +1991,18 @@ name drop 50 gold for a room
 type 31
 slaying goldcoin
 food 50
-connected 1
+connected 3
 last_sp 1
 x 20
 y 7
 end
-arch teleporter
-invisible 1
-slaying hermes_inn2
-hp 20
-sp 8
-connected 1
-speed 0.0
+arch trigger_marker
+msg
+You may access the inn facilities for one day.
+endmsg
+slaying hermes_inn_pass
+connected 3
+food 504
 x 20
 y 7
 end
@@ -2005,6 +2011,15 @@ x 20
 y 8
 end
 arch stair_up_2
+slaying hermes_inn2
+hp 20
+sp 8
+x 20
+y 8
+end
+arch check_floor
+slaying hermes_inn_pass
+no_pass 1
 x 20
 y 8
 end
diff --git a/marksel/grumms_inn b/marksel/grumms_inn
index e12c83245..9b0c3c15c 100644
--- a/marksel/grumms_inn
+++ b/marksel/grumms_inn
@@ -768,6 +768,11 @@ arch woodfloor2
 x 7
 y 3
 end
+arch clock
+no_pick 1
+x 7
+y 3
+end
 arch woodfloor2
 x 7
 y 4
@@ -1148,8 +1153,8 @@ His chickens are always in my garden!
 Veratin, the priest of the small church next door.
 @match *
 Greetings I am Grumm, welcome to my inn.
-Rooms and worship facilities for Mostrai are available upstairs for a modest price.
-Please remember if you leave you will have to pay again.
+Rooms and worship facilities for Mostrai are available upstairs for a modest price of 50 gold.
+You get a full 28 hours for that by the way.
 endmsg
 unaggressive 0
 friendly 1
@@ -2064,38 +2069,40 @@ arch woodfloor2
 x 20
 y 3
 end
+arch check_floor
+slaying grumms_inn_pass
+no_pass 1
+x 20
+y 3
+end
+arch stair_up_2
+slaying grumms_inn2
+hp 20
+sp 3
+x 20
+y 3
+end
+arch woodfloor2
+x 20
+y 4
+end
 arch altar
 name drop 50 gold for a room
 type 31
-invisible 1
 slaying goldcoin
 food 50
 connected 5
 last_sp 1
 x 20
-y 3
+y 4
 end
-arch stair_up_2
-name drop 50 gold for a room
+arch trigger_marker
 msg
-Please drop 50 gold for a room.
-Try to use exact change...
+You can use the facilities for one day.
 endmsg
-type 98
-x 20
-y 3
-end
-arch teleporter
-slaying grumms_inn2
-hp 20
-sp 3
-invisible 1
+slaying grumms_inn_pass
 connected 5
-speed 0.0
-x 20
-y 3
-end
-arch woodfloor2
+food 504
 x 20
 y 4
 end