diff --git a/common/src/sr_tools.rs b/common/src/sr_tools.rs index a3cc949..7b46395 100644 --- a/common/src/sr_tools.rs +++ b/common/src/sr_tools.rs @@ -86,7 +86,7 @@ impl FreesrData { } // remove unequipped relics - if freesr_data.relics.len() > 2000 { + if freesr_data.relics.len() > 3000 { freesr_data.relics.retain(|v| v.equip_avatar != 0); } diff --git a/common/src/structs/mod.rs b/common/src/structs/mod.rs index d0b0c50..aab470b 100644 --- a/common/src/structs/mod.rs +++ b/common/src/structs/mod.rs @@ -16,10 +16,11 @@ pub use persistent::*; pub use scene::*; pub fn get_item_unique_id(internal_uid: u32, item_type: ItemType) -> u32 { + // srtools start internal_uid from 1 if item_type == ItemType::ItemEquipment { - 2000 + internal_uid // 2000.3500 + 3000 + internal_uid // 3001..3500 } else { - 1 + internal_uid // 1..2000 + internal_uid // 1..2000 -> } } diff --git a/gameserver/src/net/session.rs b/gameserver/src/net/session.rs index b0b7fd0..2e7d9ec 100644 --- a/gameserver/src/net/session.rs +++ b/gameserver/src/net/session.rs @@ -124,8 +124,8 @@ impl PlayerSession { // clear relics & lightcones self.send(PlayerSyncScNotify { - del_equipment_list: (2000..=3500).collect(), - del_relic_list: (1..=2000).collect(), + del_relic_list: (1..=3000).collect(), + del_equipment_list: (3001..=3500).collect(), ..Default::default() }) .await diff --git a/proto/out/_.rs b/proto/out/_.rs index 828825b..82b1559 100644 --- a/proto/out/_.rs +++ b/proto/out/_.rs @@ -53949,7 +53949,7 @@ pub struct PlayerSyncScNotify { pub fdmaafifgok: ::prost::alloc::vec::Vec, /// offset: 152 #[prost(uint32, repeated, tag = "2")] - pub del_equipment_list: ::prost::alloc::vec::Vec, + pub del_relic_list: ::prost::alloc::vec::Vec, /// offset: 16 #[prost(uint32, repeated, tag = "1901")] pub new_item_hint_list: ::prost::alloc::vec::Vec, @@ -53961,7 +53961,7 @@ pub struct PlayerSyncScNotify { pub aiifdkedgil: ::prost::alloc::vec::Vec, /// offset: 104 #[prost(uint32, repeated, tag = "9")] - pub del_relic_list: ::prost::alloc::vec::Vec, + pub del_equipment_list: ::prost::alloc::vec::Vec, /// offset: 48 #[prost(message, repeated, tag = "1682")] pub ndinaemjmjb: ::prost::alloc::vec::Vec,