Taiko Game Improvements (v0.1.0)

.gitignore

@@ -25,3 +25,5 @@ Cargo.lock
 
 #/target
 .DS_Store
+
+taiko-game/profile.csv

Cargo.toml

@@ -5,6 +5,7 @@ members = [
     "tja",
     "taiko-core",
     "taiko-game",
+    "taiko-streaming",
 ]
 
 [profile.release]

taiko-core/src/taiko.rs

@@ -13,6 +13,11 @@ pub enum Hit {
     Kat,
 }
 
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Hash, Debug, Serialize, Deserialize)]
+pub struct Personalization {
+    pub course: u8,
+}
+
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize, Deserialize)]
 pub enum Judgement {
     Great,
@@ -156,6 +161,24 @@ pub struct OutputState {
 
     /// Display state
     pub display: Vec<CalculatedNote>,
+
+    // Current drumroll state
+    pub drumroll: Option<u32>,
+}
+
+impl Default for OutputState {
+    fn default() -> Self {
+        Self {
+            finished: false,
+            score: 0,
+            current_combo: 0,
+            max_combo: 0,
+            gauge: 0.0,
+            judgement: None,
+            display: vec![],
+            drumroll: None,
+        }
+    }
 }
 
 #[derive(Clone, PartialEq, PartialOrd, Debug, Serialize, Deserialize)]
@@ -176,6 +199,7 @@ pub trait TaikoEngine<H> {
     fn finalize(&self) -> Final;
 }
 
+#[derive(Clone)]
 pub struct DefaultTaikoEngine {
     rhythm: Rhythm<CalculatedNote>,
 
@@ -380,6 +404,20 @@ impl TaikoEngine<Hit> for DefaultTaikoEngine {
             .cloned()
             .collect::<Vec<_>>();
 
+        let drumroll = available_display.first().and_then(|note| {
+            if note.variant() == TaikoNoteVariant::Both {
+                let (head, _) = note.position(input.time).unwrap();
+                // if can be hit
+                if head < 0.1 && note.inner.volume < 1000 && note.inner.volume > 0 {
+                    Some(note.inner.volume as u32)
+                } else {
+                    None
+                }
+            } else {
+                None
+            }
+        });
+
         let mut display = self.passed_display.clone();
         display.extend(available_display);
 
@@ -391,6 +429,7 @@ impl TaikoEngine<Hit> for DefaultTaikoEngine {
             gauge: self.gauge,
             judgement,
             display,
+            drumroll,
         }
     }
 

taiko-game/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "taiko-game"
 description = "A taiko game written in Rust."
-version = "0.0.8"
+version = "0.1.0"
 license = "MIT"
 authors = ["JacobLinCool <jacob@csie.cool>"]
 homepage = "https://github.com/JacobLinCool/rhythm-rs"
@@ -18,15 +18,21 @@ rhythm-core = { path = "../rhythm-core", version = "0.2.0" }
 tja = { path = "../tja", version = "0.2.3" }
 taiko-core = { path = "../taiko-core", version = "0.0.2" }
 better-panic = "0.3.0"
-clap = { version = "4.5.4", features = ["derive", "cargo", "wrap_help", "unicode", "string", "unstable-styles"] }
+clap = { version = "4.5.4", features = [
+    "derive",
+    "cargo",
+    "wrap_help",
+    "unicode",
+    "string",
+    "unstable-styles",
+] }
 color-eyre = "0.6.3"
 config = "0.14.0"
-crossterm = { version = "0.27.0", features = ["serde", "event-stream"] }
+crossterm = { version = "0.28.1", features = ["serde", "event-stream"] }
 derive_deref = "1.1.1"
 directories = "5.0.1"
 futures = "0.3.30"
 human-panic = "2.0.0"
-lazy_static = "1.4.0"
 log = "0.4.21"
 pretty_assertions = "1.4.0"
 ratatui = { version = "=0.26.1", features = ["serde", "macros"] }
@@ -44,6 +50,11 @@ anyhow = "1.0.82"
 encoding_rs = "0.8.34"
 kira = "0.8.7"
 glob = "0.3.1"
+bore-cli = "0.5.1"
+taiko-streaming = { version = "0.0.0", path = "../taiko-streaming" }
+sha2 = "0.10.8"
+once_cell = "1.19.0"
+csv = "1.3.0"
 
 [build-dependencies]
-vergen = { version = "8.3.1", features = [ "build", "git", "gitoxide", "cargo" ]}
+vergen = { version = "8.3.1", features = ["build", "git", "gitoxide", "cargo"] }

taiko-game/README.md

@@ -7,3 +7,23 @@ A taiko game written in Rust.
 - `DON`: `' ' | 'f' | 'g' | 'h' | 'j' | 'c' | 'v' | 'b' | 'n' | 'm'`
 - `KAT`: `'d' | 's' | 'a' | 't' | 'r' | 'e' | 'w' | 'q' | 'x' | 'z' | 'k' | 'l' | ';' | '\'' | 'y' | 'u' | 'i' | 'o' | 'p' | ',' | '.' | '/'`
 - `CANCEL`: `ESC`
+
+```mermaid
+graph TD
+    LocalInput[Local Input Device]
+    RemoteInput[Remote Input Device]
+    InputMixer[Input Mixer]
+    GameEngine[Game Engine]
+    UI[UI]
+    LocalOutput[Local Output Device]
+    LocalPeer[Local Peer]
+    RemotePeer[Remote Peer]
+
+    LocalInput --> |Key Event| InputMixer
+    RemoteInput --> |Key Event| RemotePeer
+    RemotePeer --> |Data| LocalPeer
+    LocalPeer --> |Key Event| InputMixer
+    InputMixer --> |Key Event| GameEngine
+    GameEngine --> |State| UI
+    UI --> |Frame| LocalOutput
+```

taiko-game/src/action.rs

@@ -1,23 +1,10 @@
-use std::{fmt, string::ToString};
+use crate::uix::Page;
 
-use serde::{
-    de::{self, Deserializer, Visitor},
-    Deserialize, Serialize,
-};
-use strum::Display;
-
-use crate::app::Page;
-
-#[derive(Debug, Clone, PartialEq, Eq, Display)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Action {
     Tick,
     Render,
     Resize(u16, u16),
-    Suspend,
-    Resume,
     Quit,
-    Refresh,
-    Error(String),
-    Help,
     Switch(Page),
 }