diff options
| author |  jesopo | 2018-10-23 13:36:33 +0100 |
|---|---|---|
| committer | jesopo | 2018-10-23 13:36:33 +0100 |
| commit | e9fcd0c5e2629a1d5427bb8dd1fd3df33811c345 (patch) | |
| tree | be2478846c79fc1a26ff47f23f56098e904d1f22 /modules | |
| parent | Switch back to only taking losses when they're losses, instead of taking payin (diff) | |
| signature | ||
Re-move taking payin to before payout, better logic around win/odds to show it
correctly but still give back your bet amount
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/coins.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/coins.py b/modules/coins.py index 51a18d41..8d72ecc7 100644 --- a/modules/coins.py +++ b/modules/coins.py @@ -551,6 +551,8 @@ class Module(ModuleManager.BaseModule): raise utils.EventError("%s: You don't have enough coins to bet" % event["user"].nickname) + self._take(event["server"], event["user"], bet_amount_total, wallet_in) + # black, red, odds, evens, low (1-18), high (19-36) # 1dozen (1-12), 2dozen (13-24), 3dozen (25-36) # 1column (1,4..34), 2column (2,5..35), 3column (3,6..36) @@ -560,7 +562,7 @@ class Module(ModuleManager.BaseModule): if choice == 0: event["stdout"].write("Roulette spin lands on 0, " "the house wins, %s loses %s" % ( - event["user"].nickname, payin)) + event["user"].nickname, amount_amount_total)) return colour = "red" if choice in RED else "black" @@ -621,18 +623,20 @@ class Module(ModuleManager.BaseModule): else: winnings[bet] = [odds, bet_amounts[i]] - winnings_str = ["%s for %s (%d to 1)" % (winnings[bet][1], bet, + winnings_str = ["%s for %s (%d to 1)" % ( + winnings[bet][1]*winnings[bet][0], + bet, winnings[bet][0]) for bet in winnings.keys()] - coin_winnings = sum(bet[1] for bet in winnings.values()) + coin_winnings = DECIMAL_ZERO + for odds, amount in winnings.items(): + coin_winnings += amount # give back bet + coin_winnings += amount*odds # give winnings coin_losses = sum(loss for loss in losses.values()) if coin_winnings: self._give(event["server"], event["user"], coin_winnings, wallet_out) - if coin_losses: - self._take(event["server"], event["user"], coin_losses, - wallet_in) total_winnings_str = " (%s total)" % coin_winnings if len( winnings.keys()) > 1 else "" |