MarseyWorld
/
MarseyWorld
10
10
Fork 0
Code Issues 2 Pull Requests Packages Releases Wiki Activity

Added doubledown and insurance functionality (#235) 

* Added doubledown functionality

* Add insurance
remotes/1693045480750635534/spooky-22
outruncolors 2022-05-01 13:24:01 -05:00 committed by GitHub
parent c34dae37a2
commit 0ff7bdc28a
3 changed files with 96 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
files/classes/comment.py
View File

@ -480,11 +480,43 @@ class Comment(Base):
except: kind = "coins"
currency_kind = "Coins" if kind == "coins" else "Marseybucks"
try: is_insured = split_result[6]
except: is_insured = "0"
body = f"<span id='blackjack-{self.id}' class='ml-2'><em>{player_hand} vs. {dealer_hand}</em>"
if blackjack_status == 'active' and v and v.id == self.author_id:
body += f'''<button class="action-{self.id} btn btn-success small" style="text-transform: uppercase; padding: 2px"onclick="handle_action('blackjack','{self.id}','hit')">Hit</button>
<button class="action-{self.id} btn btn-danger small" style="text-transform: uppercase; padding: 2px"onclick="handle_action('blackjack','{self.id}','stay')">Stay</button>'''
body += f'''
<button
class="action-{self.id} btn btn-success small"
style="text-transform: uppercase; padding: 2px"
onclick="handle_action('blackjack','{self.id}','hit')">
Hit
</button>
<button
class="action-{self.id} btn btn-danger small"
style="text-transform: uppercase; padding: 2px"
onclick="handle_action('blackjack','{self.id}','stay')">
Stay
</button>
<button
class="action-{self.id} btn btn-secondary small"
style="text-transform: uppercase; padding: 2px"
onclick="handle_action('blackjack','{self.id}','doubledown')">
Double Down
</button>
'''
if dealer_hand[0][0] == 'A' and not is_insured == "1":
body += f'''
<button
class="action-{self.id} btn btn-secondary small"
style="text-transform: uppercase; padding: 2px"
onclick="handle_action('blackjack','{self.id}','insurance')">
Insure
</button>
'''
elif blackjack_status == 'push':
body += f"<strong class='ml-2'>Pushed. Refunded {wager} {currency_kind}.</strong>"
elif blackjack_status == 'bust':
@ -496,5 +528,8 @@ class Comment(Base):
elif blackjack_status == 'blackjack':
body += f"<strong class='ml-2'>Blackjack! Won {floor(wager * 3/2)} {currency_kind}.</strong>"
if is_insured == "1":
body += f" <em class='text-success'>Insured.</em>"
body += '</span>'
return body

73
files/helpers/blackjack.py
View File

@ -42,12 +42,12 @@ def format_cards(hand):
return map(lambda x: "".join(x), hand)
def format_all(player_hand, dealer_hand, deck, status, wager, kind):
def format_all(player_hand, dealer_hand, deck, status, wager, kind, is_insured=0):
formatted_player_hand = format_cards(player_hand)
formatted_dealer_hand = format_cards(dealer_hand)
formatted_deck = format_cards(deck)
return f'{"/".join(formatted_player_hand)}_{"/".join(formatted_dealer_hand)}_{"/".join(formatted_deck)}_{status}_{wager}_{kind}'
return f'{"/".join(formatted_player_hand)}_{"/".join(formatted_dealer_hand)}_{"/".join(formatted_deck)}_{status}_{wager}_{kind}_{str(is_insured)}'
def check_for_blackjack_commands(in_text, from_user, from_comment):
@ -66,7 +66,6 @@ def check_for_blackjack_commands(in_text, from_user, from_comment):
if (wager_value < minimum_bet): break
elif (wager_value > maximum_bet): break
elif (wager_value <= currency_value):
setattr(from_user, currency_prop, currency_value - wager_value)
player_hand, dealer_hand, rest_of_deck = deal_initial_cards()
@ -80,14 +79,11 @@ def check_for_blackjack_commands(in_text, from_user, from_comment):
elif player_value == 21:
status = 'blackjack'
apply_game_result(from_comment, wager, status, currency_prop)
elif dealer_value == 21:
status = 'lost'
apply_game_result(from_comment, wager, status, currency_prop)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, rest_of_deck, status, wager, currency_prop)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, rest_of_deck, status, wager, currency_prop, 0)
def player_hit(from_comment):
player_hand, dealer_hand, deck, status, wager, kind = from_comment.blackjack_result.split("_")
def player_hit(from_comment, did_double_down=False):
player_hand, dealer_hand, deck, status, wager, kind, is_insured = from_comment.blackjack_result.split("_")
player_hand = player_hand.split("/")
dealer_hand = dealer_hand.split("/")
deck = deck.split("/")
@ -98,31 +94,74 @@ def player_hit(from_comment):
status = 'bust'
apply_game_result(from_comment, wager, status, kind)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, wager, kind)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, wager, kind, int(is_insured))
if (player_value == 21): player_stayed(from_comment)
if (did_double_down or player_value == 21): player_stayed(from_comment)
def player_stayed(from_comment):
player_hand, dealer_hand, deck, status, wager, kind = from_comment.blackjack_result.split("_")
player_hand, dealer_hand, deck, status, wager, kind, is_insured = from_comment.blackjack_result.split("_")
player_hand = player_hand.split("/")
player_value = get_hand_value(player_hand)
dealer_hand = dealer_hand.split("/")
dealer_value = get_hand_value(dealer_hand)
deck = deck.split("/")
while dealer_value < 17 and dealer_value != -1:
next = deck.pop(0)
dealer_hand.append(next)
dealer_value = get_hand_value(dealer_hand)
if dealer_value == 21 and is_insured == "1":
from_comment.author.coins += int(wager)
else:
while dealer_value < 17 and dealer_value != -1:
next = deck.pop(0)
dealer_hand.append(next)
dealer_value = get_hand_value(dealer_hand)
if player_value > dealer_value or dealer_value == -1: status = 'won'
elif dealer_value > player_value: status = 'lost'
else: status = 'push'
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, wager, kind)
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, wager, kind, int(is_insured))
apply_game_result(from_comment, wager, status, kind)
def player_doubled_down(from_comment):
# When doubling down, the player receives one additional card (a "hit") and their initial bet is doubled.
player_hand, dealer_hand, deck, status, wager, kind, is_insured = from_comment.blackjack_result.split("_")
wager_value = int(wager)
# Gotsta have enough coins
if (from_comment.author.coins < wager_value): return
# Double the initial wager
from_comment.author.coins -= wager_value
wager_value *= 2
# Apply the changes to the stored hand.
player_hand = player_hand.split("/")
dealer_hand = dealer_hand.split("/")
deck = deck.split("/")
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, str(wager_value), kind, int(is_insured))
player_hit(from_comment, True)
def player_bought_insurance(from_comment):
# When buying insurance, the player pays a side bet equal to 1/2 the original bet.
# In the event the dealer actually had a blackjack, they receive a 2:1 payout limiting the negative effect.
player_hand, dealer_hand, deck, status, wager, kind, is_insured = from_comment.blackjack_result.split("_")
wager_value = int(wager)
insurance_cost = wager_value / 2
# Gotsta have enough coins
if (from_comment.author.coins < insurance_cost): return
# Charge for (and grant) insurance
from_comment.author.coins -= insurance_cost
is_insured = 1
# Apply the changes to the stored hand.
player_hand = player_hand.split("/")
dealer_hand = dealer_hand.split("/")
deck = deck.split("/")
from_comment.blackjack_result = format_all(player_hand, dealer_hand, deck, status, str(wager_value), kind, int(is_insured))
def apply_game_result(from_comment, wager, result, kind):
wager_value = int(wager)
user = from_comment.author

4
files/routes/comments.py
View File

@ -1014,7 +1014,9 @@ def handle_blackjack_action(cid, v):
if action == 'hit': player_hit(comment)
elif action == 'stay': player_stayed(comment)
elif action == 'doubledown': player_doubled_down(comment)
elif action == 'insurance': player_bought_insurance(comment)
g.db.add(comment)
g.db.add(v)
g.db.commit()