diff options
| author | salmonik <salmonik@tuta.io> | 2026-10-29 22:16:15 +0100 |
|---|---|---|
| committer | salmonik <salmonik@tuta.io> | 2026-10-29 22:16:15 +0100 |
| commit | bc0de9955c375cf27d52c9934403964205afc182 (patch) | |
| tree | 42799fb426fb0ec164f44c92a63525003c582f35 /src/client/games | |
| parent | initial connection timeout set to 10s (diff) | |
| download | zagan-bet-bc0de9955c375cf27d52c9934403964205afc182.tar.gz zagan-bet-bc0de9955c375cf27d52c9934403964205afc182.zip | |
formatting
Diffstat (limited to '')
| -rw-r--r-- | src/client/games/blackjack.rs | 11 | ||||
| -rw-r--r-- | src/client/games/manager.rs | 8 | ||||
| -rw-r--r-- | src/client/games/response.rs | 4 | ||||
| -rw-r--r-- | src/client/games/roulette.rs | 12 | ||||
| -rw-r--r-- | src/client/games/slots.rs | 6 |
5 files changed, 14 insertions, 27 deletions
diff --git a/src/client/games/blackjack.rs b/src/client/games/blackjack.rs index bad1781..d5f45b3 100644 --- a/src/client/games/blackjack.rs +++ b/src/client/games/blackjack.rs | |||
| @@ -56,15 +56,14 @@ impl Game for BlackjackGame { | |||
| 56 | .get("status") | 56 | .get("status") |
| 57 | .map(String::as_str) | 57 | .map(String::as_str) |
| 58 | .unwrap_or("ready"); | 58 | .unwrap_or("ready"); |
| 59 | let balance = state | 59 | let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); |
| 60 | .data | ||
| 61 | .get("balance") | ||
| 62 | .map(String::as_str) | ||
| 63 | .unwrap_or("?"); | ||
| 64 | let hand = Self::state(state); | 60 | let hand = Self::state(state); |
| 65 | 61 | ||
| 66 | if let Some(error) = state.data.get("error") { | 62 | if let Some(error) = state.data.get("error") { |
| 67 | let bet = hand.as_ref().map(|hand| hand.bet).unwrap_or(state.bet_amount); | 63 | let bet = hand |
| 64 | .as_ref() | ||
| 65 | .map(|hand| hand.bet) | ||
| 66 | .unwrap_or(state.bet_amount); | ||
| 68 | return format!( | 67 | return format!( |
| 69 | "=== BLACKJACK ===\r\nBalance: {balance} PLN Bet: {bet} PLN\r\n\r\n\r\nERROR: {error}\r\n[Q] Quit" | 68 | "=== BLACKJACK ===\r\nBalance: {balance} PLN Bet: {bet} PLN\r\n\r\n\r\nERROR: {error}\r\n[Q] Quit" |
| 70 | ); | 69 | ); |
diff --git a/src/client/games/manager.rs b/src/client/games/manager.rs index 4d9e6a8..b20ff44 100644 --- a/src/client/games/manager.rs +++ b/src/client/games/manager.rs | |||
| @@ -138,9 +138,7 @@ impl GameManager { | |||
| 138 | session.bet_amount = result.bet_amount; | 138 | session.bet_amount = result.bet_amount; |
| 139 | session.data.remove("error"); | 139 | session.data.remove("error"); |
| 140 | session.data.insert("reels".to_string(), result.reels); | 140 | session.data.insert("reels".to_string(), result.reels); |
| 141 | session | 141 | session.data.insert("win_type".to_string(), result.win_type); |
| 142 | .data | ||
| 143 | .insert("win_type".to_string(), result.win_type); | ||
| 144 | session.data.insert( | 142 | session.data.insert( |
| 145 | "win_lines".to_string(), | 143 | "win_lines".to_string(), |
| 146 | result | 144 | result |
| @@ -339,7 +337,9 @@ impl GameManager { | |||
| 339 | for key in ["crash_point", "payout"] { | 337 | for key in ["crash_point", "payout"] { |
| 340 | session.data.remove(key); | 338 | session.data.remove(key); |
| 341 | } | 339 | } |
| 342 | session.data.insert("status".to_string(), state.phase.clone()); | 340 | session |
| 341 | .data | ||
| 342 | .insert("status".to_string(), state.phase.clone()); | ||
| 343 | session | 343 | session |
| 344 | .data | 344 | .data |
| 345 | .insert("session_id".to_string(), state.session_id); | 345 | .insert("session_id".to_string(), state.session_id); |
diff --git a/src/client/games/response.rs b/src/client/games/response.rs index 71e1fed..88df459 100644 --- a/src/client/games/response.rs +++ b/src/client/games/response.rs | |||
| @@ -128,8 +128,8 @@ pub fn parse_roulette_response(response: &str) -> Result<RouletteResult, String> | |||
| 128 | return Err(format!("Invalid roulette color: {color}")); | 128 | return Err(format!("Invalid roulette color: {color}")); |
| 129 | } | 129 | } |
| 130 | let bets = parts[7].to_string(); | 130 | let bets = parts[7].to_string(); |
| 131 | let _: crate::roulette::Bets = serde_json::from_str(&bets) | 131 | let _: crate::roulette::Bets = |
| 132 | .map_err(|error| format!("Invalid roulette bets: {error}"))?; | 132 | serde_json::from_str(&bets).map_err(|error| format!("Invalid roulette bets: {error}"))?; |
| 133 | 133 | ||
| 134 | Ok(RouletteResult { | 134 | Ok(RouletteResult { |
| 135 | session_id: parts[1].to_string(), | 135 | session_id: parts[1].to_string(), |
diff --git a/src/client/games/roulette.rs b/src/client/games/roulette.rs index 3379317..e80eca8 100644 --- a/src/client/games/roulette.rs +++ b/src/client/games/roulette.rs | |||
| @@ -53,11 +53,7 @@ impl RouletteGame { | |||
| 53 | 53 | ||
| 54 | match state.data.get("status").map(String::as_str) { | 54 | match state.data.get("status").map(String::as_str) { |
| 55 | Some("result") => { | 55 | Some("result") => { |
| 56 | let number = state | 56 | let number = state.data.get("number").map(String::as_str).unwrap_or("?"); |
| 57 | .data | ||
| 58 | .get("number") | ||
| 59 | .map(String::as_str) | ||
| 60 | .unwrap_or("?"); | ||
| 61 | let color = state | 57 | let color = state |
| 62 | .data | 58 | .data |
| 63 | .get("color") | 59 | .get("color") |
| @@ -102,11 +98,7 @@ impl Game for RouletteGame { | |||
| 102 | fn render(&self, state: &GameState) -> String { | 98 | fn render(&self, state: &GameState) -> String { |
| 103 | let bets = Self::bets(state); | 99 | let bets = Self::bets(state); |
| 104 | let chip = state.data.get("chip").map(String::as_str).unwrap_or("10"); | 100 | let chip = state.data.get("chip").map(String::as_str).unwrap_or("10"); |
| 105 | let balance = state | 101 | let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); |
| 106 | .data | ||
| 107 | .get("balance") | ||
| 108 | .map(String::as_str) | ||
| 109 | .unwrap_or("?"); | ||
| 110 | let input = state | 102 | let input = state |
| 111 | .data | 103 | .data |
| 112 | .get("number_input") | 104 | .get("number_input") |
diff --git a/src/client/games/slots.rs b/src/client/games/slots.rs index d34bf49..2ec354e 100644 --- a/src/client/games/slots.rs +++ b/src/client/games/slots.rs | |||
| @@ -109,11 +109,7 @@ impl Game for SlotsGame { | |||
| 109 | 109 | ||
| 110 | fn render(&self, state: &GameState) -> String { | 110 | fn render(&self, state: &GameState) -> String { |
| 111 | let reels = state.data.get("reels").cloned().unwrap_or_default(); | 111 | let reels = state.data.get("reels").cloned().unwrap_or_default(); |
| 112 | let balance = state | 112 | let balance = state.data.get("balance").map(String::as_str).unwrap_or("?"); |
| 113 | .data | ||
| 114 | .get("balance") | ||
| 115 | .map(String::as_str) | ||
| 116 | .unwrap_or("?"); | ||
| 117 | let winning = Self::highlighted_cells(state); | 113 | let winning = Self::highlighted_cells(state); |
| 118 | let grid = self.render_grid(&reels, &winning); | 114 | let grid = self.render_grid(&reels, &winning); |
| 119 | let paytable = paytable_lines(); | 115 | let paytable = paytable_lines(); |
