From dbfb396643eb8bff0a2de9c253b8cdc78733d0fb Mon Sep 17 00:00:00 2001 From: andy Date: Sun, 30 May 2021 05:41:53 +0000 Subject: [PATCH 1/2] trap trigger packet --- src/packet/messages.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/packet/messages.rs b/src/packet/messages.rs index 062af3c..5a4c02c 100644 --- a/src/packet/messages.rs +++ b/src/packet/messages.rs @@ -561,6 +561,11 @@ pub struct KillMonster { //} +#[pso_message(0x80)] +pub struct PlayerTrapActivate { + data: [u8; 4], +} + #[pso_message(0x83)] pub struct PlayerTrapSet { trap_type: u16, @@ -572,11 +577,6 @@ pub struct PlayerTrapSet { //} -//#[pso_message(0x80)] -//pub struct PlayerTrapActivate { - -//} - //#[pso_message(0x87)] //pub struct PlayerShrink { @@ -1042,7 +1042,7 @@ pub enum GameMessage { //BmodeData(BmodeData), PlayerTrapSet(PlayerTrapSet), //Unknown84(Unknown84), - //PlayerTrapActivate(PlayerTrapActivate), + PlayerTrapActivate(PlayerTrapActivate), //PlayerShrink(PlayerShrink), //PlayerUnshrink(PlayerUnshrink), PlayerKilledByMonster(PlayerKilledByMonster), @@ -1207,7 +1207,7 @@ impl PSOPacketData for GameMessage { //BmodeData::CMD => Ok(GameMessage::BmodeData(BmodeData::from_bytes(&mut cur)?)), PlayerTrapSet::CMD => Ok(GameMessage::PlayerTrapSet(PlayerTrapSet::from_bytes(&mut cur)?)), //Unknown84::CMD => Ok(GameMessage::Unknown84(Unknown84::from_bytes(&mut cur)?)), - //PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)), + PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)), //PlayerShrink::CMD => Ok(GameMessage::PlayerShrink(PlayerShrink::from_bytes(&mut cur)?)), //PlayerUnshrink::CMD => Ok(GameMessage::PlayerUnshrink(PlayerUnshrink::from_bytes(&mut cur)?)), PlayerKilledByMonster::CMD => Ok(GameMessage::PlayerKilledByMonster(PlayerKilledByMonster::from_bytes(&mut cur)?)), @@ -1374,7 +1374,7 @@ impl PSOPacketData for GameMessage { //GameMessage::BmodeData(data) => data.as_bytes(), GameMessage::PlayerTrapSet(data) => data.as_bytes(), //GameMessage::Unknown84(data) => data.as_bytes(), - //GameMessage::PlayerTrapActivate(data) => data.as_bytes(), + GameMessage::PlayerTrapActivate(data) => data.as_bytes(), //GameMessage::PlayerShrink(data) => data.as_bytes(), //GameMessage::PlayerUnshrink(data) => data.as_bytes(), GameMessage::PlayerKilledByMonster(data) => data.as_bytes(), From 43b37e985c5ba486b0712f18cf79f94d2e28e451 Mon Sep 17 00:00:00 2001 From: andy Date: Sun, 30 May 2021 05:41:53 +0000 Subject: [PATCH 2/2] rebase - trap trigger packet --- src/packet/messages.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/packet/messages.rs b/src/packet/messages.rs index d655b25..1f591c9 100644 --- a/src/packet/messages.rs +++ b/src/packet/messages.rs @@ -584,10 +584,10 @@ pub struct KillMonster { //} -//#[pso_message(0x80)] -//pub struct PlayerTrapActivate { - -//} +#[pso_message(0x80)] +pub struct PlayerTrapActivate { + data: [u8; 4], +} #[pso_message(0x83)] pub struct PlayerTrapSet { @@ -1069,7 +1069,7 @@ pub enum GameMessage { //BmodeData(BmodeData), PlayerTrapSet(PlayerTrapSet), //Unknown84(Unknown84), - //PlayerTrapActivate(PlayerTrapActivate), + PlayerTrapActivate(PlayerTrapActivate), //PlayerShrink(PlayerShrink), //PlayerUnshrink(PlayerUnshrink), PlayerKilledByMonster(PlayerKilledByMonster), @@ -1236,7 +1236,7 @@ impl PSOPacketData for GameMessage { //BmodeData::CMD => Ok(GameMessage::BmodeData(BmodeData::from_bytes(&mut cur)?)), PlayerTrapSet::CMD => Ok(GameMessage::PlayerTrapSet(PlayerTrapSet::from_bytes(&mut cur)?)), //Unknown84::CMD => Ok(GameMessage::Unknown84(Unknown84::from_bytes(&mut cur)?)), - //PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)), + PlayerTrapActivate::CMD => Ok(GameMessage::PlayerTrapActivate(PlayerTrapActivate::from_bytes(&mut cur)?)), //PlayerShrink::CMD => Ok(GameMessage::PlayerShrink(PlayerShrink::from_bytes(&mut cur)?)), //PlayerUnshrink::CMD => Ok(GameMessage::PlayerUnshrink(PlayerUnshrink::from_bytes(&mut cur)?)), PlayerKilledByMonster::CMD => Ok(GameMessage::PlayerKilledByMonster(PlayerKilledByMonster::from_bytes(&mut cur)?)), @@ -1405,7 +1405,7 @@ impl PSOPacketData for GameMessage { //GameMessage::BmodeData(data) => data.as_bytes(), GameMessage::PlayerTrapSet(data) => data.as_bytes(), //GameMessage::Unknown84(data) => data.as_bytes(), - //GameMessage::PlayerTrapActivate(data) => data.as_bytes(), + GameMessage::PlayerTrapActivate(data) => data.as_bytes(), //GameMessage::PlayerShrink(data) => data.as_bytes(), //GameMessage::PlayerUnshrink(data) => data.as_bytes(), GameMessage::PlayerKilledByMonster(data) => data.as_bytes(),