?

2024-04-20 18:48:51 +07:00
parent 54db3b2408
commit 1e8e6f04c3
5 changed files with 78 additions and 108 deletions
@@ -263,16 +263,16 @@ impl Default for PlaneType {
 #[serde(rename_all = "camelCase")]
 pub struct MazeProp {
    #[serde(rename = "ID")]
-    pub id: i64,
+    pub id: u32,
    #[serde(rename = "PropType")]
    pub prop_type: String,
    #[serde(rename = "PropStateList")]
    pub prop_state_list: Vec<PropState>,
 }

-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, Default)]
 pub enum PropState {
-    Closed = 0,
+    #[default] Closed = 0,
    Open = 1,
    Locked = 2,
    BridgeState1 = 3,
@@ -309,12 +309,6 @@ pub enum PropState {
    CustomState09 = 109,
 }

-impl Default for PropState {
-    fn default() -> Self {
-        PropState::Closed
-    }
-}
-
 pub type IntMap<T> = HashMap<u32, T>;
 pub type StringMap<T> = HashMap<String, T>;