nick/blackjack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

both having blackjack should be a tie

Browse source
This commit is contained in:
Nick Pegg 2025-07-11 16:59:09 -07:00
parent 673dc50ec6
commit bf5f289720
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game.rs
View file

@ -228,12 +228,12 @@ impl Table {
returns: 0, returns: 0,
}; };
#[allow(clippy::if_same_then_else)] #[allow(clippy::if_same_then_else)]
if self.dealer_hand.is_blackjack() { if turn.hand.is_blackjack() && !self.dealer_hand.is_blackjack() {
end_state.result = PlayResult::DealerBlackjack;
} else if turn.hand.is_blackjack() {
end_state.result = PlayResult::Blackjack; end_state.result = PlayResult::Blackjack;
let bj_winnings = (turn.bet as f32 * self.blackjack_returns) as u32; let winnings = (turn.bet as f32 * self.blackjack_returns) as u32;
end_state.returns = turn.bet + bj_winnings; end_state.returns = turn.bet + winnings;
} else if !turn.hand.is_blackjack() && self.dealer_hand.is_blackjack() {
end_state.result = PlayResult::DealerBlackjack;
} else if turn.hand.value() > 21 { } else if turn.hand.value() > 21 {
end_state.result = PlayResult::Bust; end_state.result = PlayResult::Bust;
} else if self.dealer_hand.value() > 21 { } else if self.dealer_hand.value() > 21 {
@ -494,8 +494,8 @@ mod tests {
Vec::from([("♣", "A"), ("♣", "10")]), Vec::from([("♣", "A"), ("♣", "10")]),
) )
.unwrap(); .unwrap();
assert_eq!(result.result, PlayResult::DealerBlackjack); assert_eq!(result.result, PlayResult::Push);
assert_eq!(result.returns, 0); assert_eq!(result.returns, 10);
} }
#[test] #[test]