jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request 'andy/floor-limit' (#29) from andy/floor-limit into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #29
This commit is contained in:
jake 2023-02-15 19:59:43 -05:00
commit e1a8ad7fc5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/packet/messages.rs
View File

@ -501,12 +501,11 @@ pub struct MagAnimation {
unknown1: u16, unknown1: u16,
} }
//#[pso_message(0x63)] #[pso_message(0x63)]
//pub struct FloorItemLimitItemDeletion { pub struct FloorItemLimitItemDeletion {
// client_id: u16, item_id: u32,
// item_id: u8, map_area: u16,
// amount: u8, }
//}
#[pso_message(0x66)] #[pso_message(0x66)]
pub struct PlayerUsedStarAtomizer { pub struct PlayerUsedStarAtomizer {
@ -954,6 +953,7 @@ pub struct DropCoordinates {
x: f32, x: f32,
z: f32, z: f32,
item_id: u32, item_id: u32,
amount: u32,
} }
#[pso_message(0xC4)] #[pso_message(0xC4)]
@ -1172,7 +1172,7 @@ pub enum GameMessage {
ItemDrop(ItemDrop), ItemDrop(ItemDrop),
RequestItem(RequestItem), RequestItem(RequestItem),
MagAnimation(MagAnimation), MagAnimation(MagAnimation),
//FloorItemLimitItemDeletion(FloorItemLimitItemDeletion), FloorItemLimitItemDeletion(FloorItemLimitItemDeletion),
PlayerUsedStarAtomizer(PlayerUsedStarAtomizer), PlayerUsedStarAtomizer(PlayerUsedStarAtomizer),
SpawningMonsters(SpawningMonsters), SpawningMonsters(SpawningMonsters),
PlayerTelepipe(PlayerTelepipe), PlayerTelepipe(PlayerTelepipe),
@ -1340,7 +1340,7 @@ impl PSOPacketData for GameMessage {
ItemDrop::CMD => Ok(GameMessage::ItemDrop(ItemDrop::from_bytes(&mut cur)?)), ItemDrop::CMD => Ok(GameMessage::ItemDrop(ItemDrop::from_bytes(&mut cur)?)),
RequestItem::CMD => Ok(GameMessage::RequestItem(RequestItem::from_bytes(&mut cur)?)), RequestItem::CMD => Ok(GameMessage::RequestItem(RequestItem::from_bytes(&mut cur)?)),
MagAnimation::CMD => Ok(GameMessage::MagAnimation(MagAnimation::from_bytes(&mut cur)?)), MagAnimation::CMD => Ok(GameMessage::MagAnimation(MagAnimation::from_bytes(&mut cur)?)),
//FloorItemLimitItemDeletion::CMD => Ok(GameMessage::FloorItemLimitItemDeletion(FloorItemLimitItemDeletion::from_bytes(&mut cur)?)), FloorItemLimitItemDeletion::CMD => Ok(GameMessage::FloorItemLimitItemDeletion(FloorItemLimitItemDeletion::from_bytes(&mut cur)?)),
PlayerUsedStarAtomizer::CMD => Ok(GameMessage::PlayerUsedStarAtomizer(PlayerUsedStarAtomizer::from_bytes(&mut cur)?)), PlayerUsedStarAtomizer::CMD => Ok(GameMessage::PlayerUsedStarAtomizer(PlayerUsedStarAtomizer::from_bytes(&mut cur)?)),
SpawningMonsters::CMD => Ok(GameMessage::SpawningMonsters(SpawningMonsters::from_bytes(&mut cur)?)), SpawningMonsters::CMD => Ok(GameMessage::SpawningMonsters(SpawningMonsters::from_bytes(&mut cur)?)),
PlayerTelepipe::CMD => Ok(GameMessage::PlayerTelepipe(PlayerTelepipe::from_bytes(&mut cur)?)), PlayerTelepipe::CMD => Ok(GameMessage::PlayerTelepipe(PlayerTelepipe::from_bytes(&mut cur)?)),
@ -1510,7 +1510,7 @@ impl PSOPacketData for GameMessage {
GameMessage::ItemDrop(data) => data.as_bytes(), GameMessage::ItemDrop(data) => data.as_bytes(),
GameMessage::RequestItem(data) => data.as_bytes(), GameMessage::RequestItem(data) => data.as_bytes(),
GameMessage::MagAnimation(data) => data.as_bytes(), GameMessage::MagAnimation(data) => data.as_bytes(),
//GameMessage::FloorItemLimitItemDeletion(data) => data.as_bytes(), GameMessage::FloorItemLimitItemDeletion(data) => data.as_bytes(),
GameMessage::PlayerUsedStarAtomizer(data) => data.as_bytes(), GameMessage::PlayerUsedStarAtomizer(data) => data.as_bytes(),
GameMessage::SpawningMonsters(data) => data.as_bytes(), GameMessage::SpawningMonsters(data) => data.as_bytes(),
GameMessage::PlayerTelepipe(data) => data.as_bytes(), GameMessage::PlayerTelepipe(data) => data.as_bytes(),