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

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.13 by pippijn, Tue May 23 11:12:21 2006 UTC vs.
Revision 1.20 by root, Wed Jul 19 08:52:57 2006 UTC

 # give the banker in-game:
 # - help, will show the usage information
 # - deposit, can deposit a certain amount of a given currency unit
 # - withdraw, can give out a certain amount of a given currency unit
 #      provided, the bank account has this amount of money
-# - exchange, will exchange between imperials and platinum coins
+# - exchange, will exchange between royalties and platinum coins
 # - balance, simply shows how much money one has on his/her account.
 #
 # TODO:
 # - Comment more steps
 # - Implement exchange()
 # The units are being used in each sub so they are declared globally.
 my %unit = (
    silver   => 1,
    gold     => 10,
    platina  => 50,
-   imperial => 10000,
+   royalty  => 5000,
 );
 # Subroutine just to calculate exchange rates.
 sub calc_exchange_rate {
    my ($value, $from_cur, $to_cur) = @_;
    my ($who, $is_wiz) = @_;
    my $balance = $who->{bank_balance};
    unless ($is_wiz) {
       return "Sorry, you have no balance."
-         unless $balance;
+         unless $balance >= 1;
    } else {
       return $who->name." has no balance."
-         unless $balance;
+         unless $balance >= 1;
    }
-   my $imperials = calc_exchange_rate $balance, "silver", "imperial";
+   my $royalties = calc_exchange_rate $balance, "silver", "royalty";
-   my $platinum  = calc_exchange_rate $imperials - (int $imperials), "imperial", "platina";
+   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 $imperials) . " imperials, "
+            (int $royalties) . " royalties, "
           . (int $platinum) . " platinum, "
           . (int $gold) . " gold and about "
           . (int $silver) ." silver coins.";
    return "You have $account_info"
    return "You can not $action fractions."
       unless $amount =~ /^\d+$/;
    # First check for possible overflow and user stupidity
-   if ($amount > 100000) {
+   if ($amount > 2**31) {
-      return "Sorry, we do not handle more than 100000 units for one ".$action.".";
+      return "Sorry, we do not handle that kind of money for one ".$action.".";
    } elsif ($amount == 0) {
       return "You can not ".$action." nothing.";
    } elsif ($amount < 0) {
       return "You can not ".$action." negative values.";
    }
          return "$amount $currency received.";
       } else {
          return "You don't have enough money with you.";
       }
    } elsif ($action eq "withdraw") {
-      if ($who->{bank_balance} - $pay > 0) {
+      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 "imperial") {
-            my $money = cf::object::new "imperial";
-            $money->set_property (1, 24, $amount);
-            $money->insert_in_ob ($who);
          } else {
-            my $money = cf::object::new $currency . "coin";
+            $amount = 0;
-            $money->set_property (1, 24, $amount);
-            $money->insert_in_ob ($who);
          }
          return "Withdrew $amount $currency";
+      } else {
+         return "You don't have that much money on your bank account.";
       }
    }
 }
 sub help {
       return "To get the money you stored in our system back, just say:
       withdraw <amount> <currency>";
    } elsif ($command eq "balance") {
       return "I can tell you how much money you are saving in our bank, just ask me about your balance.";
    } elsif ($command eq "exchange") {
-      return "We exchange between imperial notes and platinum coins at a very low price. To change from platinum to imperials, say:
+      return "We exchange between royalties and platina coins at a very low price. To change from platina to royalties, say:
-      exchange <amount> platina\nTo change from imperials to platinum, say:
+      exchange <amount> platina royalty\nTo change from royalties to platina, say:
-      exchange <amount> imperial\nWe currently only exchange between these two currencies. If you want to know more about exchange rates, ask me:
+      exchange <amount> royalty platina\nWe currently only exchange between these two currencies. If you want to know more about exchange rates, ask me:
       help exchange rates\nThanks for using our bank.";
    } elsif ($command eq "exchange rates") {
       my @units = sort { $unit{$b} <=> $unit{$a} } keys %unit;
       my $exchange_rates = "Here is a list of exchange rates:\n";
    my $service_charge = 5;
    my @units = sort keys %unit;
    my $units = join ", ", @units;
    my $fees = - ($service_charge / 100) + 1;
+   # Have some aliases for currencies
+   if ($currency eq "platinum") {
+      $currency = "platina";
+   } elsif ($currency eq "royalties") {
+      $currency = "royalty";
+   }
    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 ("$name says: " . balance ($player->ob, 1));
          }
       } else {
-         $who->message ("$name says: ".balance ($who, 0), cf::NDI_WHITE);
+         $who->reply ("$name says: " . balance ($who, 0));
       }
    } elsif ($cmd eq "balance" and !$arguments) {
-      $who->message ("$name says: Balance of whom?", cf::NDI_WHITE);
+      $who->reply ("$name says: Balance of whom?");
    } elsif ($cmd eq "deposit" and $currency) {
-      $who->message ("$name says: " . (transaction $who, "deposit", $amount, $currency), cf::NDI_WHITE);
+      $who->reply ("$name says: " . (transaction $who, "deposit", $amount, $currency));
-      $who->message ("$name says: " . (balance $who), cf::NDI_WHITE);
+      $who->reply ("$name says: " . (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 ("$name says: 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 ("$name says: 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 ("$name says: " . (transaction $who, "withdraw", $amount, $currency));
-      $who->message ("$name says: " . (balance $who), cf::NDI_WHITE);
+      $who->reply ("$name says: " . (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 ("$name says: 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 ("$name says: How much do you want to withdraw?");
+   } elsif ($cmd eq "exchange") {
+      $who->reply ("$name says: 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 ("$name says: " . (help $arguments));
    } elsif ($cmd eq "help" or $cmd eq "yes" and $arguments ne "") {
-      $who->message ("$name says: " . (help), cf::NDI_WHITE);
+      $who->reply ("$name says: " . (help));
    } else {
-      $who->message ("$name says: Do you need help?", cf::NDI_WHITE);
+      $who->reply ("$name says: Do you need help?");
    }
 }

Diff Legend

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

Comparing deliantra/maps/perl/bank.ext (file contents): Revision 1.13 by pippijn, Tue May 23 11:12:21 2006 UTC vs. Revision 1.20 by root, Wed Jul 19 08:52:57 2006 UTC

Diff Legend

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.13 by pippijn, Tue May 23 11:12:21 2006 UTC vs.
Revision 1.20 by root, Wed Jul 19 08:52:57 2006 UTC