--- deliantra/server/ext/ipo.ext	2007/09/19 21:56:30	1.9
+++ deliantra/server/ext/ipo.ext	2008/09/22 01:33:09	1.15
@@ -14,18 +14,18 @@
 my %prices = (
    pen => [
       40,  'stylus',
-      sub { $_[0]->name ('IPO Writing Pen'); $_[0]->value (40 * $price_fact); }
+      sub { $_[0]->name ('IPO Writing Pen'); $_[0]->value (0); }
    ],
    literacy => [
       1000, 'scroll_literacy',
-      sub { $_[0]->value (1000 * $price_fact) }
+      sub { $_[0]->value (0) }
    ],
    mailscroll => [
       1, 'mailscroll_empty',
       sub {
          $_[0]->name    ("mailscroll T: $_[2] F: $_[1]");
          $_[0]->name_pl ("mailscrolls T: $_[2] F: $_[1]");
-         $_[0]->value   (1 * $price_fact);
+         $_[0]->value   (0);
       },
       'plarg'
    ],
@@ -70,7 +70,7 @@
    my ($name, $map, $x, $y, $cb, @a) = @_;
    my $o = cf::object::new $name;
    my $r = $cb->($o, @a);
-   $map->insert_object ($o, $x, $y);
+   $map->insert ($o, $x, $y);
    $r
 }
 
@@ -177,12 +177,17 @@
          return 1;
       }
 
-      $who->pay_amount ($pr->[0] * $price_fact);
-      if ($pr->[3] && not cf::player::exists $arguments) {
-         $who->reply ($npc, "Sorry, there is no '$arguments'");
+      if ($who->pay_amount ($pr->[0] * $price_fact)) {
+         cf::async {
+            if ($pr->[3] && not cf::player::exists $arguments) {
+               $who->reply ($npc, "Sorry, there is no '$arguments'");
+            } else {
+               create_object ($pr->[1], $who->map, $x, $y, $pr->[2], $who->name, $arguments);
+               $who->reply ($npc, "Here is your $cmd");
+            }
+         }
       } else {
-         create_object ($pr->[1], $who->map, $x, $y, $pr->[2], $who->name, $arguments);
-         $who->reply ($npc, "Here is your $cmd");
+         $who->reply ($npc, "Sorry, you don't have enough money.");
       }
 
    } elsif ($cmd eq 'receive') {
@@ -194,6 +199,7 @@
             $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
             return 1;
          }
+         $storage->load;
 
          my $plname = $who->name;
          my $cnt;
@@ -225,12 +231,13 @@
             $who->reply ($npc, "Sorry, our package delivery service is currently in strike. Please come back later.");
             return 1;
          }
+         $storage->load;
 
          my $cnt;
          for ($who->inv) {
             if ($_->name () =~ /^(bag|package|carton) T: \Q$arguments\E F: (\S+)$/) {
                $_->name ("$1 F: $2 T: $arguments");
-               $_->teleport ($storage, 2, 2);
+               $storage->insert ($_, 2, 2);
                $cnt++;
             }
          }
@@ -248,15 +255,15 @@
       $who->reply ($npc,
          sprintf "How can I help you?\n"
           . "Here is a quick list of commands I understand:\n\n"
-          . "- pen                 (%s platinum)\n"
-          . "- literacy            (%s platinum)\n"
-          . "- mailscroll <friend> (%s platinum)\n"
-          . "- bag <friend>        (%s platinum)\n"
-          . "- package <friend>    (%s platinum)\n"
-          . "- carton <friend>     (%s platinum)\n"
-          . "- send <friend>       (send bags/packages/cartons)\n"
-          . "- receive             (to receive packages for you)\n"
-          . ($who->flag (cf::FLAG_WIZ) ? "- mailwarning <player>" : ""),
+          . " - pen                 (%s platinum)\n"
+          . " - literacy            (%s platinum)\n"
+          . " - mailscroll <friend> (%s platinum)\n"
+          . " - bag <friend>        (%s platinum)\n"
+          . " - package <friend>    (%s platinum)\n"
+          . " - carton <friend>     (%s platinum)\n"
+          . " - send <friend>       (send bags/packages/cartons)\n"
+          . " - receive             (to receive packages for you)\n"
+          . ($who->flag (cf::FLAG_WIZ) ? " - mailwarning <player>\n" : ""),
             40, 1000, 1, 1, 5, 10
       );
    }
@@ -290,8 +297,9 @@
 sub send_mail {
    my ($type, $toname, $fromname, $message) = @_;
    my $time = strftime ("%a, %d %b %Y %H:%M:%S CEST", localtime (time));
-   my $msg = "From: $fromname\nTo: $toname\nDate: $time\n\n$message\n";
+   my $msg = "From: $fromname\rTo: $toname\rDate: $time\n\n$message\n";
    store_mail ($type, $toname, $fromname, $msg);
 }
 
 1;
+