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

Merge pull request 'add charge attack packets' (#36) from charge_weap into master

Browse Source 
Reviewed-by: jake <jake@sharnoth.com>
This commit is contained in:
jake 2020-06-08 10:46:53 -04:00
commit cbda4e5892
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/packet/messages.rs
View File

@ -811,10 +811,10 @@ pub struct PlayerUsedMedicalCenter {
//} //}
//#[pso_message(0xC7)] #[pso_message(0xC7)]
//pub struct ChargeAttack { pub struct ChargeAttack {
meseta: u32,
//} }
#[pso_message(0xC8)] #[pso_message(0xC8)]
pub struct RequestExp { pub struct RequestExp {
@ -1066,7 +1066,7 @@ pub enum GameMessage {
SortItems(SortItems), SortItems(SortItems),
PlayerUsedMedicalCenter(PlayerUsedMedicalCenter), PlayerUsedMedicalCenter(PlayerUsedMedicalCenter),
//ExperienceSteal(ExperienceSteal), //ExperienceSteal(ExperienceSteal),
//ChargeAttack(ChargeAttack), ChargeAttack(ChargeAttack),
RequestExp(RequestExp), RequestExp(RequestExp),
//QuestRewardMeseta(QuestRewardMeseta), //QuestRewardMeseta(QuestRewardMeseta),
//QuestRewardItem(QuestRewardItem), //QuestRewardItem(QuestRewardItem),
@ -1230,7 +1230,7 @@ impl PSOPacketData for GameMessage {
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)?)),
//QuestRewardItem::CMD => Ok(GameMessage::QuestRewardItem(QuestRewardItem::from_bytes(&mut cur)?)), //QuestRewardItem::CMD => Ok(GameMessage::QuestRewardItem(QuestRewardItem::from_bytes(&mut cur)?)),
@ -1396,7 +1396,7 @@ impl PSOPacketData for GameMessage {
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(),
//GameMessage::QuestRewardItem(data) => data.as_bytes(), //GameMessage::QuestRewardItem(data) => data.as_bytes(),