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

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.1 by pippijn, Fri May 19 14:31:50 2006 UTC vs.
Revision 1.2 by pippijn, Fri May 19 14:54:55 2006 UTC

 # - exchange, will exchange between imperials and platinum coins
 # - balance, simply shows how much money one has on his/her account.
 #
 # TODO:
 # - Continue modularising
-#  * account()
+#  * transaction()
 # - Comment more steps
 # The units are being used in each sub so they are declared globally.
-my %units = (
+my %unit = (
    silver => 1,
    gold => 10,
    platina => 50,
    imperial => 10000,
 );
 # Subroutine just to calculate exchange rates, I purposefully left in the
 # exchange rates for imperial => imperial, platina => platina, etc.
-sub calc_exchange_rate(@) {
+sub calc_exchange_rate {
    my ($value, $from_cur, $to_cur) = @_;
-   if ($from_cur eq "imperial") {	# from imperial to
+   if ($unit{$from_cur} and $unit{$to_cur}) {
-      if ($to_cur eq "imperial") {	# imperial
+      return $value * $unit{$from_cur} / $unit{$to_cur};
-         return $value;
-      } elsif ($to_cur eq "platina") {	# platinum
-         return $value * (%units->{imperial} / %units->{platina});
-      } elsif ($to_cur eq "gold") {	# gold
-         return $value * (%units->{imperial} / %units->{gold});
-      } else {				# silver
-         return $value * %units->{imperial};
-      }
-   } elsif ($from_cur eq "platina") {	# from platina to
-      if ($to_cur eq "imperial") {	# imperial
-         return $value * (%units->{platina} / %units->{imperial});
-      } elsif ($to_cur eq "platina") {	# platinum
-         return $value;
-      } elsif ($to_cur eq "gold") {	# gold
-         return $value * (%units->{platina} / %units->{gold});
-      } else {				# silver
-         return $value * %units->{platina};
-      }
-   } elsif ($from_cur eq "gold") {	# from gold to
-      if ($to_cur eq "imperial") {	# imperial
-         return $value * (%units->{gold} / %units->{imperial});
-      } elsif ($to_cur eq "platina") {	# platinum
-         return $value * (%units->{gold} / %units->{platina});
-      } elsif ($to_cur eq "gold") {	# gold
-         return $value;
-      } else {				# silver
-         return $value * %units->{gold};
-      }
-   } else {				# from silver to
-      if ($to_cur eq "imperial") {	# imperial
-         return $value / %units->{imperial};
-      } elsif ($to_cur eq "platina") {	# platinum
-         return $value / %units->{platina};
-      } elsif ($to_cur eq "gold") {	# gold
-         return $value / %units->{gold};
-      } else {				# silver
-         return $value;
-      }
    }
 }
 # 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(@) {
+sub balance {
    my ($who) = @_;
    my $balance = $who->{bank_balance};
    if (!$balance or int($balance) == 0) {
       return "Sorry, you have no balance.";
       return "You have ".int($imperials)." imperials, ".int($platinum)." platinum, ".int($gold)." gold and about ".int($silver)." silver coins.";
    }
 }
-sub transaction(@) {
+sub transaction {
    my ($who, $action, $amount, $currency) = @_;
-   my $pay = $amount * %units->{$currency};
+   my $pay = $amount * %unit->{$currency};
    # First check for possible overflow and user stupidity
    if ($amount > 10000) {
       return "Sorry, we do not handle more than 10000 units for one ".$action.".";
    } elsif ($amount == 0) {
             $who->{bank_balance} += $pay;
             return "$amount $currency received.";
          } else {
             return "You don't have enough money with you.";
          }
       } elsif ($action eq "withdraw") {
          if ($who->{bank_balance} - $pay > 0) {
             $who->{bank_balance} -= $pay;
             if ($currency eq "imperial") {
                my $money = cf::object::new ("imperial");
 sub on_say {
    my ($event, $ob, $who, $msg) = @_;
    my ($cmd, $arguments) = split /\s+/, $msg, 2;
    my ($amount, $currency) = split /\s+/, $arguments, 2;
    my $service_charge = 5;
-   my @units = sort keys %units;
+   my @units = sort keys %unit;
    my $units = join ", ", @units;
    my $fees = - ($service_charge / 100) + 1;
    if ($cmd eq "balance") {
       $who->message ($ob->name." says: ".balance ($who), cf::NDI_WHITE);
    }
-   elsif ($cmd eq "deposit" and $currency ne "") {
+   elsif ($cmd eq "deposit" and $currency) {
       $who->message ($ob->name." says: ".transaction($who, "deposit", $amount, $currency), cf::NDI_WHITE);
       $who->message ($ob->name." says: ".balance ($who), cf::NDI_WHITE);
-   } elsif ($cmd eq "deposit" and $amount ne "" and $currency eq "") {
+   } elsif ($cmd eq "deposit" and $amount and $currency eq "") {
       $who->message ($ob->name." says: Deposit $amount of what: ".$units.".", cf::NDI_WHITE);
    } elsif ($cmd eq "deposit" and $amount eq "" and $currency eq "") {
       $who->message ($ob->name." says: How much do you want to deposit?", cf::NDI_WHITE);
    }
-   elsif ($cmd eq "withdraw" and $currency ne "") {
+   elsif ($cmd eq "withdraw" and $currency) {
       $who->message ($ob->name." says: ".transaction($who, "withdraw", $amount, $currency), cf::NDI_WHITE);
       $who->message ($ob->name." says: ".balance ($who), cf::NDI_WHITE);
-   } elsif ($cmd eq "withdraw" and $amount ne "" and $currency eq "") {
+   } elsif ($cmd eq "withdraw" and $amount and $currency eq "") {
       $who->message ($ob->name." says: Withdraw $amount of what: ".$units.".", cf::NDI_WHITE);
    } elsif ($cmd eq "withdraw" and $amount eq "" and $currency eq "") {
       $who->message ($ob->name." says: How much do you want to withdraw?", cf::NDI_WHITE);
    }
    elsif ($cmd eq "help" || "yes") {
       $who->message ($ob->name." says: ".help($arguments), cf::NDI_WHITE);
    }
 }
-sub help(@) {
+sub help {
    my ($command) = @_;
    if ($command eq "") {
       return "You can:
       deposit <amount> <currency>
       return "We exchange between imperial notes and platinum coins at a very low price. To change from platinum to imperials, say:
       exchange <amount> platina\nTo change from imperials to platinum, say:
       exchange <amount> imperial\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") {
-      return "Here is a list of exchange rates:
+      return "Here is a list of exchange rates:\n"
-      imperial => ".calc_exchange_rate(1, "imperial", "platina")." platina
+      ."imperial => ".calc_exchange_rate(1, "imperial", "platina")." platina\n"
-      imperial => ".calc_exchange_rate(1, "imperial", "gold")." gold
+      ."imperial => ".calc_exchange_rate(1, "imperial", "gold")." gold\n"
-      imperial => ".calc_exchange_rate(1, "imperial", "silver")." silver
+      ."imperial => ".calc_exchange_rate(1, "imperial", "silver")." silver\n"
-      platina => ".calc_exchange_rate(1, "platina", "gold")." gold
+      ."platina => ".calc_exchange_rate(1, "platina", "gold")." gold\n"
-      platina => ".calc_exchange_rate(1, "platina", "silver")." silver
+      ."platina => ".calc_exchange_rate(1, "platina", "silver")." silver\n"
-      gold => ".calc_exchange_rate(1, "gold", "silver")." silver\nThis may change a bit with the stock markets but don't expect it to be much.";
+      ."gold => ".calc_exchange_rate(1, "gold", "silver")." silver\nThis may change a bit with the stock markets but don't expect it to be much.";
    }
 }

Diff Legend

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

Comparing deliantra/maps/perl/bank.ext (file contents): Revision 1.1 by pippijn, Fri May 19 14:31:50 2006 UTC vs. Revision 1.2 by pippijn, Fri May 19 14:54:55 2006 UTC

Diff Legend

Comparing deliantra/maps/perl/bank.ext (file contents):
Revision 1.1 by pippijn, Fri May 19 14:31:50 2006 UTC vs.
Revision 1.2 by pippijn, Fri May 19 14:54:55 2006 UTC