From e60acbd936b189fedc0d8669ee968c40b5787d89 Mon Sep 17 00:00:00 2001 From: Geoffrey Allott Date: Mon, 5 Jun 2023 01:01:01 +0100 Subject: [PATCH] rename to fifty_two_card_deck --- src/card.rs | 2 +- src/game/cribbage/mod.rs | 4 ++-- src/game/poker/holdem.rs | 4 ++-- src/game/whist.rs | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/card.rs b/src/card.rs index 673c864..1c6940f 100644 --- a/src/card.rs +++ b/src/card.rs @@ -135,7 +135,7 @@ impl CardSet { CardSet { repr: 0 } } - pub fn complete_deck() -> CardSet { + pub fn fifty_two_card_deck() -> CardSet { CardSet { repr: 0b1111111111111_1111111111111_1111111111111_1111111111111 } } diff --git a/src/game/cribbage/mod.rs b/src/game/cribbage/mod.rs index 7d041cc..4c93851 100644 --- a/src/game/cribbage/mod.rs +++ b/src/game/cribbage/mod.rs @@ -74,7 +74,7 @@ impl Cribbage { seats: Seats::new(), dealer: None, receiver: None, - deck: CardSet::complete_deck(), + deck: CardSet::fifty_two_card_deck(), hands: HashMap::new(), turn_up: None, box_cards: CardSet::new(), @@ -258,7 +258,7 @@ impl Game for Cribbage { (State::NotStarted, Action::Leave) => self.seats.remove_player(username), (_, Action::NextToDeal) => { self.dealer = Some(username); - self.deck = CardSet::complete_deck(); + self.deck = CardSet::fifty_two_card_deck(); self.turn_up = None; self.hands.clear(); self.receiver = self.seats.player_after(username); diff --git a/src/game/poker/holdem.rs b/src/game/poker/holdem.rs index a55a9ba..771becd 100644 --- a/src/game/poker/holdem.rs +++ b/src/game/poker/holdem.rs @@ -130,7 +130,7 @@ impl TexasHoldEm { state: State::NotStarted, seats: Seats::new(), stacks: HashMap::new(), - deck: CardSet::complete_deck(), + deck: CardSet::fifty_two_card_deck(), hands: HashMap::new(), community: CardSet::new(), dealer: None, @@ -378,7 +378,7 @@ impl Game for TexasHoldEm { } self.remove_ghosts()?; self.dealer = Some(username); - self.deck = CardSet::complete_deck(); + self.deck = CardSet::fifty_two_card_deck(); self.hands.clear(); self.community.clear(); self.active = None; diff --git a/src/game/whist.rs b/src/game/whist.rs index 38d77b9..6d0d39e 100644 --- a/src/game/whist.rs +++ b/src/game/whist.rs @@ -68,7 +68,7 @@ impl KnockOutWhist { dealer: None, receiver: None, call: None, - deck: CardSet::complete_deck(), + deck: CardSet::fifty_two_card_deck(), hands: HashMap::new(), trick: HashMap::new(), active: None, @@ -182,7 +182,7 @@ impl Game for KnockOutWhist { (State::NotStarted, Action::Leave) => self.seats.remove_player(username), (_, Action::NextToDeal) => { self.dealer = Some(username); - self.deck = CardSet::complete_deck(); + self.deck = CardSet::fifty_two_card_deck(); self.hands.clear(); self.receiver = self.seats.player_after(username); self.trump_card = None; @@ -251,7 +251,7 @@ impl Game for KnockOutWhist { self.call = self.winners.iter().next().cloned(); } else { self.receiver = self.dealer.and_then(|dealer| self.seats.player_after_where(dealer, |username| self.winners.contains(&username))); - self.deck = CardSet::complete_deck(); + self.deck = CardSet::fifty_two_card_deck(); self.hands.clear(); self.trump_card = None; self.state = State::CutForCall; -- 2.34.1