From 7d233dc61428bcc2842b4263214f93e50821c839 Mon Sep 17 00:00:00 2001 From: amizing25 Date: Sun, 9 Mar 2025 05:07:06 +0700 Subject: [PATCH] chore: remove unused fields --- common/src/sr_tools.rs | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/common/src/sr_tools.rs b/common/src/sr_tools.rs index cf1e0b3..6bf2c96 100644 --- a/common/src/sr_tools.rs +++ b/common/src/sr_tools.rs @@ -5,8 +5,8 @@ use std::collections::{BTreeMap, HashMap}; // AVATAR #[derive(Serialize, Deserialize, Debug, Clone)] pub struct AvatarJson { - #[serde(alias = "ownerUid")] - pub owner_uid: u32, + // #[serde(alias = "ownerUid")] + // pub owner_uid: u32, #[serde(alias = "avatarId")] pub avatar_id: u32, pub data: AvatarData, @@ -232,8 +232,8 @@ pub struct Relic { pub level: u32, #[serde(alias = "relicId")] pub relic_id: u32, - #[serde(alias = "relicSetId")] - pub relic_set_id: u32, + // #[serde(alias = "relicSetId")] + // pub relic_set_id: u32, #[serde(alias = "mainAffixId")] pub main_affix_id: u32, #[serde(alias = "subAffixes")] @@ -473,15 +473,15 @@ pub struct Scene { impl Default for Scene { fn default() -> Self { Self { - entry_id: 2032101, - plane_id: 20321, - floor_id: 20321001, + plane_id: 20411, + floor_id: 20411001, + entry_id: 2041101, } } } // Position -#[derive(Debug, Serialize, Deserialize, Clone, Default)] +#[derive(Debug, Serialize, Deserialize, Clone)] pub struct Position { pub x: i32, pub y: i32, @@ -489,6 +489,17 @@ pub struct Position { pub rot_y: i32, } +impl Default for Position { + fn default() -> Self { + Position { + x: -26968, + y: 78953, + z: 14457, + rot_y: 11858, + } + } +} + impl Position { #[allow(unused)] pub fn is_empty(&self) -> bool { @@ -547,14 +558,8 @@ pub struct Persistent { impl Default for Persistent { fn default() -> Self { - let mut lineups = BTreeMap::::new(); - lineups.insert(0, 8001); - lineups.insert(1, 0); - lineups.insert(2, 0); - lineups.insert(3, 0); - Self { - lineups, + lineups: BTreeMap::from([(0, 1313), (1, 1006), (2, 8001), (3, 1405)]), position: Default::default(), main_character: MultiPathAvatar::FemaleRememberance, scene: Default::default(),