From a726d9f5fb56e1fd7983c5ac806d408ad78daa86 Mon Sep 17 00:00:00 2001 From: srdusr <99972264+srdusr@users.noreply.github.com> Date: Thu, 11 Sep 2025 21:53:00 +0200 Subject: Add multiplayer bots, typing languages, and rework the UI layout Multiplayer - Quick match: POST /api/multiplayer/quickmatch returns whichever room is still filling, or opens one. Players never see a room code; joining by code stays for racing specific people. - Bots fill quick-match rooms after a short wait so a new game is never an empty lobby. They only ever join quick-match rooms, never a room opened by code. One or two per room, drawn from separate ~40 and ~80 WPM tiers so two bots are never near each other's pace, and they stall to correct mistakes rather than typing a clean straight line. - Live player count via GET /api/multiplayer/online, shown on the Multiplayer control and under the main menu's Multiplayer button. - Per-racer colours: you are the theme accent, opponents take distinct hues that stay the same from lobby to race. - The countdown no longer holds the room lock for its full three seconds, which is what reset clients mid-countdown. Typing languages - 16 languages for the generated-word modes, each with its own high-frequency vocabulary rather than a translation of the English list. - Picker in the top-right rail; non-English uses its own list at every difficulty tier instead of falling back to English words. Fix UTF-8 accuracy in the game core - update_game_state mixed byte and character counts: total_characters_typed accumulated byte-length deltas while total_correct_characters compared a char index against that byte count. Equal on ASCII, so it went unnoticed; a correctly typed Spanish passage scored 6%. The old byte slicing would also have panicked if an index landed inside a multi-byte character. Rewritten char-based, with regression tests. Programming mode - Replaced prose about programming with real code: 26 syntax-highlighted snippets across JavaScript, Python, Rust, C/Go/Java and shell. Single-line by necessity, since the typing input is a single-line field. Layout and readability - One icon rail arrangement on every screen: Settings/Store under the wordmark, Language/Theme/Friends/Account top-right, Stats/Leaderboard/ Multiplayer bottom-right. - Main menu: mode picker moved out of the Single Player button, which it was notching a divider through and pushing the label off-centre. - Escape returns to the menu, closing any open popover first, and confirms before abandoning a live race. - Split --text-color and --sub-color per theme; they shared one value that measured 3.65:1 against the background, below the 4.5:1 body-text floor. - Semantic colours used in exactly one place each: gold for a personal best, amber for the race countdown and the mobile-result badge. - Passage now sits in the same place on the typing and end screens, and its column is a whole number of characters wide so wrapping cannot leave a permanent gap on the right. - End screen: keystrokes and a correct/wrong/extra/missed split, attribution carried over from the typing screen, and a graph with a separate error axis, axis titles including seconds, and smoothed lines. --- Cargo.toml | 77 ++++++++++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 60 insertions(+), 17 deletions(-) mode change 100644 => 100755 Cargo.toml (limited to 'Cargo.toml') diff --git a/Cargo.toml b/Cargo.toml old mode 100644 new mode 100755 index b2209a5..15205f9 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,21 +1,64 @@ -[package] -name = "typerpunk" +[workspace] +members = [ + "crates/core", + "crates/tui", + "crates/wasm", + "crates/steam", + "crates/server" +] +resolver = "2" + +[workspace.package] version = "0.1.0" edition = "2021" +authors = ["Your Name "] +license = "MIT" +description = "A modern typing test application with TUI and web interfaces" + +[workspace.dependencies] +# Core dependencies +tokio = { version = "1.0", features = ["full"] } +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +anyhow = "1.0" +thiserror = "1.0" +config = "0.13" +dirs = "5.0" +rlua = "0.19" +rand = "0.8" + +# Terminal UI +crossterm = "0.27" +ratatui = "0.24" + +# Web/WASM +wasm-bindgen = "0.2" +js-sys = "0.3" +web-sys = "0.3" +wasm-bindgen-futures = "0.4" +wasm-timer = "0.2" + +# Networking +tokio-tungstenite = { version = "0.20", features = ["native-tls"] } +futures-util = "0.3" -[dependencies] -crossterm = "0.27.0" -tui = { version = "0.19.0", features = ["crossterm"], default-features = false } -termion = "3.0.0" -rand = "0.8.5" -paragraph = "0.0.2" -console = "0.15.8" -ansi_term = "0.12.1" -serde_json = "1.0.114" -regex = "1.6.1" -ureq = "2.9.6" -tokio = { version = "1.36.0", features = ["full"] } +# Backend server +axum = { version = "0.7", features = ["ws"] } +axum-extra = { version = "0.9", features = ["cookie"] } +tower = "0.4" +tower-http = { version = "0.5", features = ["cors", "trace"] } +sqlx = { version = "0.7", features = ["runtime-tokio-rustls", "sqlite", "time", "uuid"] } +argon2 = "0.5" +reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] } +uuid = { version = "1.10", features = ["v4", "serde"] } +time = { version = "0.3", features = ["serde"] } +dashmap = "6.1" +dotenvy = "0.15" +tracing = "0.1" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } -[[bin]] -name = "typerpunk" -path = "src/main.rs" +# Steam desktop client +# Using full default features for now (guarantees DefaultPlugins resolves). +# Trimming to a minimal feature set is a later optimization once this builds +# cleanly - don't fight feature-flag mismatches without a compiler to check against. +bevy = "0.19" -- cgit v1.2.3