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

Compare commits

base: jake:3cf9cf5392c61a7a790f5fe101e0bfe75a1b753a
Branches Tags
jake:master
jake:cleanuppery
jake:somecleaning
jake:stabilized_features
..
compare: jake:b3beb878742944131ab185cde1003ec392302e05
Branches Tags
jake:cleanuppery
jake:master
jake:somecleaning
jake:stabilized_features

No commits in common. "3cf9cf5392c61a7a790f5fe101e0bfe75a1b753a" and "b3beb878742944131ab185cde1003ec392302e05" have entirely different histories.
3cf9cf5392 ... b3beb87874

1 changed files with 7 additions and 9 deletions
Show Stats Expand all files Collapse all files

16
src/packet/messages.rs
View File

@ -960,12 +960,10 @@ pub struct PlayerUsedMedicalCenter {
} }
#[pso_message(0xC6)] //#[pso_message(0xC6)]
pub struct ExperienceSteal { //pub struct ExperienceSteal {
client2: u8,
target2: u8, //}
enemy_id: u16,
}
#[pso_message(0xC7)] #[pso_message(0xC7)]
pub struct ChargeAttack { pub struct ChargeAttack {
@ -1224,7 +1222,7 @@ pub enum GameMessage {
DropCoordinates(DropCoordinates), DropCoordinates(DropCoordinates),
SortItems(SortItems), SortItems(SortItems),
PlayerUsedMedicalCenter(PlayerUsedMedicalCenter), PlayerUsedMedicalCenter(PlayerUsedMedicalCenter),
ExperienceSteal(ExperienceSteal), //ExperienceSteal(ExperienceSteal),
ChargeAttack(ChargeAttack), ChargeAttack(ChargeAttack),
RequestExp(RequestExp), RequestExp(RequestExp),
//QuestRewardMeseta(QuestRewardMeseta), //QuestRewardMeseta(QuestRewardMeseta),
@ -1391,7 +1389,7 @@ impl PSOPacketData for GameMessage {
DropCoordinates::CMD => Ok(GameMessage::DropCoordinates(DropCoordinates::from_bytes(&mut cur)?)), DropCoordinates::CMD => Ok(GameMessage::DropCoordinates(DropCoordinates::from_bytes(&mut cur)?)),
SortItems::CMD => Ok(GameMessage::SortItems(SortItems::from_bytes(&mut cur)?)), SortItems::CMD => Ok(GameMessage::SortItems(SortItems::from_bytes(&mut cur)?)),
PlayerUsedMedicalCenter::CMD => Ok(GameMessage::PlayerUsedMedicalCenter(PlayerUsedMedicalCenter::from_bytes(&mut cur)?)), PlayerUsedMedicalCenter::CMD => Ok(GameMessage::PlayerUsedMedicalCenter(PlayerUsedMedicalCenter::from_bytes(&mut cur)?)),
ExperienceSteal::CMD => Ok(GameMessage::ExperienceSteal(ExperienceSteal::from_bytes(&mut cur)?)), //ExperienceSteal::CMD => Ok(GameMessage::ExperienceSteal(ExperienceSteal::from_bytes(&mut cur)?)),
ChargeAttack::CMD => Ok(GameMessage::ChargeAttack(ChargeAttack::from_bytes(&mut cur)?)), ChargeAttack::CMD => Ok(GameMessage::ChargeAttack(ChargeAttack::from_bytes(&mut cur)?)),
RequestExp::CMD => Ok(GameMessage::RequestExp(RequestExp::from_bytes(&mut cur)?)), RequestExp::CMD => Ok(GameMessage::RequestExp(RequestExp::from_bytes(&mut cur)?)),
//QuestRewardMeseta::CMD => Ok(GameMessage::QuestRewardMeseta(QuestRewardMeseta::from_bytes(&mut cur)?)), //QuestRewardMeseta::CMD => Ok(GameMessage::QuestRewardMeseta(QuestRewardMeseta::from_bytes(&mut cur)?)),
@ -1560,7 +1558,7 @@ impl PSOPacketData for GameMessage {
GameMessage::DropCoordinates(data) => data.as_bytes(), GameMessage::DropCoordinates(data) => data.as_bytes(),
GameMessage::SortItems(data) => data.as_bytes(), GameMessage::SortItems(data) => data.as_bytes(),
GameMessage::PlayerUsedMedicalCenter(data) => data.as_bytes(), GameMessage::PlayerUsedMedicalCenter(data) => data.as_bytes(),
GameMessage::ExperienceSteal(data) => data.as_bytes(), //GameMessage::ExperienceSteal(data) => data.as_bytes(),
GameMessage::ChargeAttack(data) => data.as_bytes(), GameMessage::ChargeAttack(data) => data.as_bytes(),
GameMessage::RequestExp(data) => data.as_bytes(), GameMessage::RequestExp(data) => data.as_bytes(),
//GameMessage::QuestRewardMeseta(data) => data.as_bytes(), //GameMessage::QuestRewardMeseta(data) => data.as_bytes(),