--- deliantra/server/ext/rent.ext	2009/10/29 05:36:05	1.18
+++ deliantra/server/ext/rent.ext	2010/04/16 02:37:50	1.29
@@ -2,19 +2,20 @@
 
 use List::Util;
 
-my %apartment = (
+our %apartment = (
    "/scorn/apartment/apartments"                         => [    1, "scorn", "skorn"],
    "/santo_dominion/sdomino_appartment"                  => [   10, "santo dominion", "domino"],
    "/darcap/darcap/apartment"                            => [   30, "darcap", "thecap"],
    "/gotischerbereich/steinwandstadt/sapartment1"        => [  100, "steinwandstadt", "konkret"],
-   "/celvear_port/tower2/tower2"                         => [  150, "celvear port", "kevlar"],
    "/navar_city/apartments/apartment"                    => [  250, "navar", "navar"],
+   "/celvear_port/tower2/tower2"                         => [  300, "celvear port", "kevlar"],
    "/azumauindo/ranbounagisatoshi/apartments/sapartment" => [  100, "乱暴渚都市", "benjo"],
    "/azumauindo/suno-yamatoshi/apartments/lapartment1"   => [ 1000, "スノー大和島根", "sama"],
-   "/elmex/jeweler/jeweler_inn_upper"                    => [  500, "jeweler town", "jewelor"],
+   "/valleynoy/jewelertown/jeweler_inn_upper"            => [  500, "jeweler town", "jewelor"],
    "/pup_land/nurnberg/apartment/main"                   => [  300, "nürnberg", "sauerkraut"],
    "/lostwages/petapartment"                             => [ 5000, "lostwages", "losvegas"],
-   "/towerapartment/tower1"                              => [10000, "gotisch", "risen"],
+   "/gotischerbereich/towerapartment/tower1"             => [10000, "gotisch", "retreat"],
+   "/lake_country/Butakis/apartment"                     => [25000, "castle butakis", "expandor"],
    "/brest/apartments/brest_town_house"                  => [30000, "brest", "brecht"],
    "/pup_land/lone_town/apartment/groundfloor"           => [50000, "lone town", "looney"],
 );
@@ -165,6 +166,8 @@
    on_enter => sub {
       my ($map, $pl, $x, $y) = @_;
 
+      return if $pl->ob->flag (cf::FLAG_WIZ);
+
       my $pfx = sprintf "~%s/", $pl->ob->name;
 
       # only do something if entering ones own apartment
@@ -176,7 +179,7 @@
                if (check_balance $pl) {
                   $pl->ob->reply (undef, "Welcome to your apartment, your highness!");
                } else {
-                  $pl->ob->reply (undef, "We are sorry, your highness, you have to pay your rent first.");
+                  $pl->failmsg ("We are sorry, your highness, you have to pay your rent first.");
                   reject_entry $pl;
                }
 
@@ -184,7 +187,7 @@
             }
          }
 
-         $pl->ob->reply (undef, "Your highness, you have to rent this apartment in The Apartment Shop in Scorn or other apartment shops first!");
+         $pl->failmsg ("Your highness, you have to rent this apartment in The Apartment Shop in Scorn or other apartment shops first!");
          reject_entry $pl;
       }
    },