--- deliantra/server/ext/ipo.ext 2008/04/24 11:05:51 1.14 +++ deliantra/server/ext/ipo.ext 2009/10/11 21:39:08 1.16 @@ -1,7 +1,5 @@ #! perl -my $price_fact = 50; - sub set_package { my ($pkg, $from, $to, $bagname, $weight) = @_; @@ -10,18 +8,18 @@ $pkg->stats->Str (0); } -# prices in plat. +# prices [in silver] my %prices = ( pen => [ - 40, 'stylus', + 10000, 'stylus', sub { $_[0]->name ('IPO Writing Pen'); $_[0]->value (0); } ], literacy => [ - 1000, 'scroll_literacy', + 10000, 'scroll_literacy', sub { $_[0]->value (0) } ], mailscroll => [ - 1, 'mailscroll_empty', + 50, 'mailscroll_empty', sub { $_[0]->name ("mailscroll T: $_[2] F: $_[1]"); $_[0]->name_pl ("mailscrolls T: $_[2] F: $_[1]"); @@ -29,9 +27,9 @@ }, 'plarg' ], - bag => [ 1, 'r_sack', sub { set_package (@_, bag => 5000) }, 'plarg' ], - package => [ 5, 'r_sack', sub { set_package (@_, package => 50000) }, 'plarg' ], - carton => [10, 'r_sack', sub { set_package (@_, carton => 100000) }, 'plarg' ], + bag => [ 100, 'r_sack', sub { set_package (@_, bag => 5000) }, 'plarg' ], + package => [ 1000, 'r_sack', sub { set_package (@_, package => 50000) }, 'plarg' ], + carton => [ 2000, 'r_sack', sub { set_package (@_, carton => 100000) }, 'plarg' ], mailwarning => [ 0, 'diploma', sub { @@ -177,7 +175,7 @@ return 1; } - if ($who->pay_amount ($pr->[0] * $price_fact)) { + if ($who->pay_amount ($pr->[0])) { cf::async { if ($pr->[3] && not cf::player::exists $arguments) { $who->reply ($npc, "Sorry, there is no '$arguments'"); @@ -255,16 +253,21 @@ $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 (%s platinum)\n" - . "- bag (%s platinum)\n" - . "- package (%s platinum)\n" - . "- carton (%s platinum)\n" - . "- send (send bags/packages/cartons)\n" - . "- receive (to receive packages for you)\n" - . ($who->flag (cf::FLAG_WIZ) ? "- mailwarning " : ""), - 40, 1000, 1, 1, 5, 10 + . " - pen (%s)\n" + . " - literacy (%s)\n" + . " - mailscroll (%s)\n" + . " - bag (%s)\n" + . " - package (%s)\n" + . " - carton (%s)\n" + . " - send (send bags/packages/cartons)\n" + . " - receive (to receive packages for you)\n" + . ($who->flag (cf::FLAG_WIZ) ? " - mailwarning \n" : ""), + cf::cost_string_from_value($prices{'pen'}[0]), + cf::cost_string_from_value($prices{'literacy'}[0]), + cf::cost_string_from_value($prices{'mailscroll'}[0]), + cf::cost_string_from_value($prices{'bag'}[0]), + cf::cost_string_from_value($prices{'package'}[0]), + cf::cost_string_from_value($prices{'carton'}[0]) ); } 1 @@ -297,8 +300,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; +