--- deliantra/server/ext/rent.ext	2007/06/26 04:56:10	1.10
+++ deliantra/server/ext/rent.ext	2010/03/19 21:37:42	1.25
@@ -2,16 +2,21 @@
 
 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"],
    "/navar_city/apartments/apartment"                    => [  250, "navar", "navar"],
    "/azumauindo/ranbounagisatoshi/apartments/sapartment" => [  100, "乱暴渚都市", "benjo"],
    "/azumauindo/suno-yamatoshi/apartments/lapartment1"   => [ 1000, "スノー大和島根", "sama"],
+   "/elmex/jeweler/jeweler_inn_upper"                    => [  500, "jeweler town", "jewelor"],
    "/pup_land/nurnberg/apartment/main"                   => [  300, "nürnberg", "sauerkraut"],
-   "/pup_land/lone_town/apartment/groundfloor"           => [50000, "lone town", "looney"],
+   "/lostwages/petapartment"                             => [ 5000, "lostwages", "losvegas"],
+   "/gotischerbereich/steinwandstadt/sapartment1"        => [  100, "steinwandstadt", "konkret"],
+   "/celvear_port/tower2/tower2"                         => [  300, "celvear", "kevlar"],
+   "/gotischerbereich/towerapartment/tower1"             => [10000, "gotisch", "retreat"],
    "/brest/apartments/brest_town_house"                  => [30000, "brest", "brecht"],
+   "/pup_land/lone_town/apartment/groundfloor"           => [50000, "lone town", "looney"],
 );
 
 # we have to special case some special cases :)
@@ -47,6 +52,8 @@
 sub pay_balance {
    my ($pl) = @_;
 
+   cf::cede_to_tick;
+
    update_balance $pl;
 
    return unless $pl->{rent}{balance} > 0;
@@ -91,7 +98,7 @@
    while (my ($k, $v) = each %apartment) {
       my $type = exists $pl->{rent}{apartment}{$k} ? 1 : 2;
 
-      $pl->ob->reply (undef, "model \"$v->[2]\", situated in $v->[1] ("
+      $pl->ob->reply (undef, "model \"$v->[2]\", located in $v->[1] ("
                       . (cf::cost_string_from_value $v->[0]) . "/hr)\n")
          if $type & $types;
    }
@@ -145,7 +152,7 @@
       if ($pl->{rent}{last_online_check}) {
          $pl->{rent}{last_online_check} = time
             - List::Util::min 3600,
-                 $pl->ob->get_ob_key_value ("schmorplog_last_save") - $pl->{rent}{last_online_check};
+                 $pl->ob->kv_get ("schmorplog_last_save") - $pl->{rent}{last_online_check};
       } else {
          $pl->{rent}{last_online_check} = time;
       }
@@ -158,6 +165,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
@@ -177,19 +186,13 @@
             }
          }
 
-         $pl->ob->reply (undef, "Your highness, you have to rent this apartment in The Apartment Shop in Scorn first!");
+         $pl->ob->reply (undef, "Your highness, you have to rent this apartment in The Apartment Shop in Scorn or other apartment shops first!");
          reject_entry $pl;
       }
    },
 ;
 
-our $RENT_TIMER = Event->timer (
-   reentrant => 0,
-   after     => 60,
-   interval  => 3600,
-   data      => cf::WF_AUTOCANCEL,
-   cb        => sub {
-      pay_balance $_ for cf::player::list;
-   },
-);
+our $RENT_TIMER = cf::periodic 3600, Coro::unblock_sub {
+   pay_balance $_ for cf::player::list;
+};