Fix: Recotte studioに対応

sevenc-nanashi · May 31, 2024 · e08e021 · e08e021
1 parent 45640dc
commit e08e021
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/crates/cantari/src/main.rs b/crates/cantari/src/main.rs
@@ -118,7 +118,7 @@ async fn main_impl(args: Cli) -> Result<()> {
     {
         let ongens = ONGEN.get().unwrap().read().await;
         for ongen in ongens.values() {
-            info!("- {} ({})", ongen.name(), ongen.uuid);
+            info!("- {} ({}, {})", ongen.name(), ongen.uuid, ongen.id());
         }
     }
 

diff --git a/crates/cantari/src/ongen.rs b/crates/cantari/src/ongen.rs
@@ -112,7 +112,7 @@ impl Ongen {
     pub fn id(&self) -> u32 {
         let uuid_string = self.uuid.to_string();
         let uuid_first_section = uuid_string.split('-').next().unwrap();
-        u32::from_str_radix(uuid_first_section, 16).unwrap() & !(0xffu32)
+        (u32::from_str_radix(uuid_first_section, 16).unwrap() >> 1) & !(0xffu32)
     }
 
     pub async fn read_image(&self) -> Option<Vec<u8>> {