[ViewVC] Diff of: cvs/deliantra/maps/perl/bank.ext

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.18 by elmex, Wed May 31 20:39:48 2006 UTC vs.
Revision 1.22 by elmex, Mon Aug 14 07:11:10 2006 UTC

    my ($value, $from_cur, $to_cur) = @_;
    $value * $unit{$from_cur} / $unit{$to_cur}
 }
+sub amount_str {
+   my $amount = shift;
+   my $royalties = calc_exchange_rate $amount, "silver", "royalty";
+   my $platinum  = calc_exchange_rate $royalties - (int $royalties), "royalty", "platina";
+   my $gold      = calc_exchange_rate $platinum - (int $platinum), "platina", "gold";
+   my $silver    = calc_exchange_rate $gold - (int $gold), "gold", "silver";
+      (int $royalties) . " royalties, "
+    . (int $platinum) . " platinum, "
+    . (int $gold) . " gold and about "
+    . (int $silver) ." silver coins.";
+}
 # Calculates and returns how much money someone has starting with the
 # highest value currency going down. Think of it like having the date
 # and time in the format of 2006-05-19 03:21:31 UTC instead of 1148001691
 # seconds since 1970-01-01 00:00:00 UTC.
 sub balance {
    } else {
       return $who->name." has no balance."
          unless $balance >= 1;
    }
-   my $royalties = calc_exchange_rate $balance, "silver", "royalty";
+   my $account_info = amount_str ($balance);
-   my $platinum  = calc_exchange_rate $royalties - (int $royalties), "royalty", "platina";
-   my $gold      = calc_exchange_rate $platinum - (int $platinum), "platina", "gold";
-   my $silver    = calc_exchange_rate $gold - (int $gold), "gold", "silver";
-   my $account_info =
-            (int $royalties) . " royalties, "
-          . (int $platinum) . " platinum, "
-          . (int $gold) . " gold and about "
-          . (int $silver) ." silver coins.";
    return "You have $account_info"
       unless $is_wiz;
    return $who->name." has $account_info";
       } else {
          return "You don't have enough money with you.";
       }
    } elsif ($action eq "withdraw") {
       if ($pay <= $who->{bank_balance}) {
+         my $paid = $who->pay_player_arch (
+            $currency eq 'royalty' ? 'royalty' : $currency . "coin",
+            $amount
+         );
+         if ($paid) {
-         $who->{bank_balance} -= $pay;
+            $who->{bank_balance} -= $pay;
-         if ($currency eq "royalty") {
-            my $money = cf::object::new "royalty";
-            $money->set_property (1, 24, $amount);
-            $money->take ($who);
          } else {
-            my $money = cf::object::new $currency . "coin";
+            $amount = 0;
-            $money->set_property (1, 24, $amount);
-            $money->take ($who);
          }
          return "Withdrew $amount $currency";
       } else {
          return "You don't have that much money on your bank account.";
       }
       }
       return $exchange_rates."This may change a bit with the stock markets but don't expect it to be much.";
    }
 }
-sub on_say {
+cf::register_script_function "bank::command" => sub {
-   my ($event, $ob, $who, $msg) = @_;
+   my ($who, $msg, $npc) = @_;
    my ($cmd, $arguments) = split /\s+/, $msg, 2;
    my ($amount, $currency) = split /\s+/, $arguments, 2;
-   my $name = $ob->name;
    my $service_charge = 5;
    my @units = sort keys %unit;
    my $units = join ", ", @units;
    my $fees = - ($service_charge / 100) + 1;
    }
    if ($cmd eq "balance") {
       if ($who->flag (cf::FLAG_WIZ)) {
          if (my $player = cf::player::find $arguments) {
-            $who->message ("$name says: ".balance ($player->ob, 1), cf::NDI_WHITE);
+            $who->reply ($npc, balance $player->ob, 1);
          }
       } else {
-         $who->message ("$name says: ".balance ($who, 0), cf::NDI_WHITE);
+         $who->reply ($npc, balance $who, 0);
       }
    } elsif ($cmd eq "balance" and !$arguments) {
-      $who->message ("$name says: Balance of whom?", cf::NDI_WHITE);
+      $who->reply ($npc, "Balance of whom?");
    } elsif ($cmd eq "deposit" and $currency) {
-      $who->message ("$name says: " . (transaction $who, "deposit", $amount, $currency), cf::NDI_WHITE);
+      $who->reply ($npc, transaction $who, "deposit", $amount, $currency);
-      $who->message ("$name says: " . (balance $who), cf::NDI_WHITE);
+      $who->reply ($npc, balance $who);
    } elsif ($cmd eq "deposit" and $amount and $currency eq "") {
-      $who->message ("$name says: Deposit $amount of what: $units", cf::NDI_WHITE);
+      $who->reply ($npc, "deposit $amount of what: $units");
    } elsif ($cmd eq "deposit" and $amount eq "" and $currency eq "") {
-      $who->message ("$name says: How much do you want to deposit?", cf::NDI_WHITE);
+      $who->reply ($npc, "How much do you want to deposit?");
    } elsif ($cmd eq "withdraw" and $currency) {
-      $who->message ("$name says: " . (transaction $who, "withdraw", $amount, $currency), cf::NDI_WHITE);
+      $who->reply ($npc, transaction $who, "withdraw", $amount, $currency);
-      $who->message ("$name says: " . (balance $who), cf::NDI_WHITE);
+      $who->reply ($npc, balance $who);
    } elsif ($cmd eq "withdraw" and $amount and $currency eq "") {
-      $who->message ("$name says: Withdraw $amount of what: $units", cf::NDI_WHITE);
+      $who->reply ($npc, "Withdraw $amount of what: $units");
    } elsif ($cmd eq "withdraw" and $amount eq "" and $currency eq "") {
-      $who->message ("$name says: How much do you want to withdraw?", cf::NDI_WHITE);
+      $who->reply ($npc, "How much do you want to withdraw?");
    } elsif ($cmd eq "exchange") {
-      $who->message ("$name says: This function is not yet implemented. Ask me again later.", cf::NDI_WHITE);
+      $who->reply ($npc, "This function is not yet implemented. Ask me again later.");
    } elsif ($cmd eq "help" or $cmd eq "yes" and $arguments eq "") {
-      $who->message ("$name says: " . (help $arguments), cf::NDI_WHITE);
+      $who->reply ($npc, help $arguments);
    } elsif ($cmd eq "help" or $cmd eq "yes" and $arguments ne "") {
-      $who->message ("$name says: " . (help), cf::NDI_WHITE);
+      $who->reply ($npc, help);
    } else {
-      $who->message ("$name says: Do you need help?", cf::NDI_WHITE);
+      $who->reply ($npc, "Do you need help?");
    }
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/maps/perl/bank.ext (file contents): Revision 1.18 by elmex, Wed May 31 20:39:48 2006 UTC vs. Revision 1.22 by elmex, Mon Aug 14 07:11:10 2006 UTC

Diff Legend

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.18 by elmex, Wed May 31 20:39:48 2006 UTC vs.
Revision 1.22 by elmex, Mon Aug 14 07:11:10 2006 UTC