Update handling of grouped entries and drop use of optional numbers /…

… bools

Cargo.toml

@@ -20,9 +20,6 @@ parking_lot = "0.12.1"
 serde_yaml = "0.8.26"
 tracing = "0.1.40"
 
-egui = "0.26.2"
-catppuccin-egui = { git = "https://github.com/catppuccin/egui", rev = "eeebcd3" }
-
 syn = "2.0.13"
 darling = "0.20.1"
 quote = "^1.0.23"

astra-core/Cargo.toml

@@ -17,4 +17,4 @@ astra_formats = { path = "../astra-formats" }
 glob = "0.3.1"
 normpath = "1.1.0"
 walkdir = "2.3.2"
-chrono = "0.4.26"
+chrono = "0.4.38"

astra-types/src/achieve.rs

@@ -15,17 +15,17 @@ pub struct AchieveData {
     #[astra(key = "@Name")]
     pub name: String,
     #[astra(key = "@Category")]
-    pub category: Option<i8>,
+    pub category: i8,
     #[astra(key = "@Kind")]
-    pub kind: Option<i16>,
+    pub kind: i16,
     #[astra(key = "@Count")]
-    pub count: Option<i32>,
+    pub count: i32,
     #[astra(key = "@Arg")]
     pub arg: String,
     #[astra(key = "@CountUnit")]
     pub count_unit: String,
     #[astra(key = "@KizunaReward")]
-    pub kizuna_reward: Option<i32>,
+    pub kizuna_reward: i32,
     #[astra(key = "@Chapter")]
     pub chapter: String,
 }
@@ -37,5 +37,5 @@ pub struct BelongData {
     #[astra(key = "@Name")]
     pub name: String,
     #[astra(key = "@DefeatAchieve")]
-    pub defeat_achieve: Option<i8>,
+    pub defeat_achieve: i8,
 }

astra-types/src/ai.rs

@@ -12,15 +12,15 @@ pub struct AiData {
     #[astra(key = "@Group", public_array)]
     pub group: String,
     #[astra(key = "@Active")]
-    pub active: Option<i8>,
+    pub active: i8,
     #[astra(key = "@Code")]
-    pub code: Option<i8>,
+    pub code: i8,
     #[astra(key = "@Mind")]
-    pub mind: Option<i8>,
+    pub mind: i8,
     #[astra(key = "@StrValue0")]
     pub str_value_0: String,
     #[astra(key = "@StrValue1")]
     pub str_value_1: String,
     #[astra(key = "@Trans")]
-    pub trans: Option<i8>,
+    pub trans: i8,
 }

astra-types/src/amiibo.rs

@@ -18,7 +18,7 @@ pub struct AmiiboData {
     #[astra(key = "@BGM")]
     pub bgm: String,
     #[astra(key = "@TicketNum")]
-    pub ticket_num: Option<i32>,
+    pub ticket_num: i32,
     #[astra(key = "@KizunaNum")]
-    pub kizuna_num: Option<i32>,
+    pub kizuna_num: i32,
 }

astra-types/src/animal.rs

@@ -22,119 +22,119 @@ pub struct AnimalData {
     #[astra(key = "@Category")]
     pub category: String,
     #[astra(key = "@Radius")]
-    pub radius: Option<f32>,
+    pub radius: f32,
     #[astra(key = "@NID")]
     pub nid: String,
     #[astra(key = "@PID")]
     pub pid: String,
     #[astra(key = "@Item")]
     pub item: String,
     #[astra(key = "@Rare")]
-    pub rare: Option<bool>,
+    pub rare: bool,
     #[astra(key = "@M001")]
-    pub m_001: Option<bool>,
+    pub m_001: bool,
     #[astra(key = "@M002")]
-    pub m_002: Option<bool>,
+    pub m_002: bool,
     #[astra(key = "@M003")]
-    pub m_003: Option<bool>,
+    pub m_003: bool,
     #[astra(key = "@M004")]
-    pub m_004: Option<bool>,
+    pub m_004: bool,
     #[astra(key = "@M005")]
-    pub m_005: Option<bool>,
+    pub m_005: bool,
     #[astra(key = "@M006")]
-    pub m_006: Option<bool>,
+    pub m_006: bool,
     #[astra(key = "@M007")]
-    pub m_007: Option<bool>,
+    pub m_007: bool,
     #[astra(key = "@M008")]
-    pub m_008: Option<bool>,
+    pub m_008: bool,
     #[astra(key = "@M009")]
-    pub m_009: Option<bool>,
+    pub m_009: bool,
     #[astra(key = "@M010")]
-    pub m_010: Option<bool>,
+    pub m_010: bool,
     #[astra(key = "@M011")]
-    pub m_011: Option<bool>,
+    pub m_011: bool,
     #[astra(key = "@M012")]
-    pub m_012: Option<bool>,
+    pub m_012: bool,
     #[astra(key = "@M013")]
-    pub m_013: Option<bool>,
+    pub m_013: bool,
     #[astra(key = "@M014")]
-    pub m_014: Option<bool>,
+    pub m_014: bool,
     #[astra(key = "@M015")]
-    pub m_015: Option<bool>,
+    pub m_015: bool,
     #[astra(key = "@M016")]
-    pub m_016: Option<bool>,
+    pub m_016: bool,
     #[astra(key = "@M017")]
-    pub m_017: Option<bool>,
+    pub m_017: bool,
     #[astra(key = "@M018")]
-    pub m_018: Option<bool>,
+    pub m_018: bool,
     #[astra(key = "@M019")]
-    pub m_019: Option<bool>,
+    pub m_019: bool,
     #[astra(key = "@M020")]
-    pub m_020: Option<bool>,
+    pub m_020: bool,
     #[astra(key = "@M021")]
-    pub m_021: Option<bool>,
+    pub m_021: bool,
     #[astra(key = "@M022")]
-    pub m_022: Option<bool>,
+    pub m_022: bool,
     #[astra(key = "@M023")]
-    pub m_023: Option<bool>,
+    pub m_023: bool,
     #[astra(key = "@M024")]
-    pub m_024: Option<bool>,
+    pub m_024: bool,
     #[astra(key = "@M025")]
-    pub m_025: Option<bool>,
+    pub m_025: bool,
     #[astra(key = "@M026")]
-    pub m_026: Option<bool>,
+    pub m_026: bool,
     #[astra(key = "@S001")]
-    pub s_001: Option<bool>,
+    pub s_001: bool,
     #[astra(key = "@S002")]
-    pub s_002: Option<bool>,
+    pub s_002: bool,
     #[astra(key = "@S003")]
-    pub s_003: Option<bool>,
+    pub s_003: bool,
     #[astra(key = "@S004")]
-    pub s_004: Option<bool>,
+    pub s_004: bool,
     #[astra(key = "@S005")]
-    pub s_005: Option<bool>,
+    pub s_005: bool,
     #[astra(key = "@S006")]
-    pub s_006: Option<bool>,
+    pub s_006: bool,
     #[astra(key = "@S007")]
-    pub s_007: Option<bool>,
+    pub s_007: bool,
     #[astra(key = "@S008")]
-    pub s_008: Option<bool>,
+    pub s_008: bool,
     #[astra(key = "@S009")]
-    pub s_009: Option<bool>,
+    pub s_009: bool,
     #[astra(key = "@S010")]
-    pub s_010: Option<bool>,
+    pub s_010: bool,
     #[astra(key = "@S011")]
-    pub s_011: Option<bool>,
+    pub s_011: bool,
     #[astra(key = "@S012")]
-    pub s_012: Option<bool>,
+    pub s_012: bool,
     #[astra(key = "@S013")]
-    pub s_013: Option<bool>,
+    pub s_013: bool,
     #[astra(key = "@S014")]
-    pub s_014: Option<bool>,
+    pub s_014: bool,
     #[astra(key = "@S015")]
-    pub s_015: Option<bool>,
+    pub s_015: bool,
     #[astra(key = "@G001")]
-    pub g_001: Option<bool>,
+    pub g_001: bool,
     #[astra(key = "@G002")]
-    pub g_002: Option<bool>,
+    pub g_002: bool,
     #[astra(key = "@G003")]
-    pub g_003: Option<bool>,
+    pub g_003: bool,
     #[astra(key = "@G004")]
-    pub g_004: Option<bool>,
+    pub g_004: bool,
     #[astra(key = "@G005")]
-    pub g_005: Option<bool>,
+    pub g_005: bool,
     #[astra(key = "@G006")]
-    pub g_006: Option<bool>,
+    pub g_006: bool,
     #[astra(key = "@E001")]
-    pub e_001: Option<bool>,
+    pub e_001: bool,
     #[astra(key = "@E002")]
-    pub e_002: Option<bool>,
+    pub e_002: bool,
     #[astra(key = "@E003")]
-    pub e_003: Option<bool>,
+    pub e_003: bool,
     #[astra(key = "@E004")]
-    pub e_004: Option<bool>,
+    pub e_004: bool,
     #[astra(key = "@E005")]
-    pub e_005: Option<bool>,
+    pub e_005: bool,
     #[astra(key = "@E006")]
-    pub e_006: Option<bool>,
+    pub e_006: bool,
 }

astra-types/src/arena.rs

@@ -12,7 +12,7 @@ pub struct ArenaData {
     #[astra(key = "@Name", public_array)]
     pub name: String,
     #[astra(key = "@Rate")]
-    pub rate: Option<i32>,
+    pub rate: i32,
     #[astra(key = "@Pid")]
     pub pid: String,
     #[astra(key = "@Iid")]