From f56da9a082e98587077fcb5e0938511094b87f80 Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Mon, 28 Oct 2024 21:57:22 +0100 Subject: [PATCH] Add newer charts --- shimmering/config/charts.csv | 5 +++++ src/arcaea/jacket.rs | 2 +- src/bin/cli/commands/prepare_jackets.rs | 8 +++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/shimmering/config/charts.csv b/shimmering/config/charts.csv index c0a3f3f..7043923 100644 --- a/shimmering/config/charts.csv +++ b/shimmering/config/charts.csv @@ -633,3 +633,8 @@ Saint or Sinner,crayvxn,Adverse Prelude,小終点,PST 3,3.0,447,小終点,PRS 6, FURETE-MITAI,みきとP,World Extend 3: Illusions,nora::neko,PST 2,2.5,447,nora::neko,PRS 6,6.0,523,nora::neko,FTR 8,8.4,763,nora::neko,ETR 9,9.4,841,Light,155,5.10.4,24/9/26,5.10.4,24/9/26, Hailstone,Kazki Misora,World Extend 3: Illusions,raycast,PST 3,3.5,534,raycast,PRS 7,7.0,651,raycast,FTR 9+,9.7,"1,002",N/A,,,,Light,180,5.10.4,24/9/26,N/A,, Gensou no Satellite,豚乙女,Memory Archive: Pop/Recommended,Luxance,PST 2,2.5,721,Luxance,PRS 6,6.5,783,Luxance,FTR 8+,8.7,992,Luxance,ETR 10,10.1,"1,139",Conflict,230,5.10.4,24/9/26,5.10.4,24/9/26, +Prayer,"qfeileadh & レゾナンスもえこ",World Extend 3: Illusions,nora::neko,PST 2,2.5,419,nora::neko,PRS 5,5.5,479,nora::neko,FTR 8,8.2,591,nora::neko,ETR 9,9.1,714,Light,132,5.10.6,24/10/24,5.10.6,24/10/24, +Crimson Quartz,DiGiTAL WiNG with 空音,Memory Archive: Pop/Recommended,raycast,PST 3,3.0,569,raycast,PRS 6,6.0,615,raycast,FTR 8+,8.8,861,raycast,ETR 9+,9.8,"1,200",Conflict,145,5.10.6,24/10/24,5.10.6,24/10/24, +Dies irae,お月さま交響曲,Memory Archive: Original,M理論,PST 4,4.5,632,M理論,PRS 7,7.5,802,M理論,FTR 9,9.5,"1,052",M理論,ETR 10,10.6,"1,263",Conflict,172,5.10.6,24/10/24,5.10.6,24/10/24,✓ +Third Sun,Ash Astral,Memory Archive: Music Game,NEO NITRO,PST 3,3.5,532,NEO NITRO,PRS 7,7.0,702,NEO NITRO,FTR 9,9.4,811,NEO NITRO,ETR 10,10.0,"1,043",Conflict,75-225,5.10.6,24/10/24,5.10.6,24/10/24, +Spirit of the Dauntless,KO3 & Relect,Memory Archive: Original,絶滅,PST 4,4.5,693,絶滅,PRS 7+,7.8,957,絶滅,FTR 10,10.5,"1,207",N/A,,,,Conflict,180,5.10.6,24/10/24,N/A,,✓ diff --git a/src/arcaea/jacket.rs b/src/arcaea/jacket.rs index 16d84bc..336244e 100644 --- a/src/arcaea/jacket.rs +++ b/src/arcaea/jacket.rs @@ -16,7 +16,7 @@ use crate::context::Error; pub const SPLIT_FACTOR: u32 = 8; pub const IMAGE_VEC_DIM: usize = (SPLIT_FACTOR * SPLIT_FACTOR * 3) as usize; pub const BITMAP_IMAGE_SIZE: u32 = 174; -pub const JACKET_RECOGNITITION_DIMENSIONS: usize = 10; +pub const JACKET_RECOGNITITION_DIMENSIONS: usize = 20; // {{{ (Image => vector) encoding #[allow(clippy::identity_op)] diff --git a/src/bin/cli/commands/prepare_jackets.rs b/src/bin/cli/commands/prepare_jackets.rs index d05f80a..6d9506e 100644 --- a/src/bin/cli/commands/prepare_jackets.rs +++ b/src/bin/cli/commands/prepare_jackets.rs @@ -61,7 +61,7 @@ pub fn run() -> Result<(), Error> { let entries = fs::read_dir(dir.path()) .with_context(|| "Couldn't read song directory")? .map(|f| f.unwrap()) - .filter(|f| f.file_name().to_str().unwrap().ends_with("_256.jpg")) + .filter(|f| !f.file_name().to_str().unwrap().ends_with("_256.jpg")) .collect::>(); for file in &entries { @@ -69,10 +69,8 @@ pub fn run() -> Result<(), Error> { let name = raw_name .to_str() .unwrap() - .strip_suffix("_256.jpg") - .ok_or_else(|| { - anyhow!("No '_256.jpg' suffix to remove from filename {raw_name:?}") - })?; + .strip_suffix(".jpg") + .ok_or_else(|| anyhow!("No '.jpg' suffix to remove from filename {raw_name:?}"))?; let difficulty = match name { "0" => Some(Difficulty::PST),