Merge pull request 'add charge attack packets' (#36) from charge_weap into master
Reviewed-by: jake <jake@sharnoth.com>
This commit is contained in:
		
						commit
						cbda4e5892
					
				| @ -811,10 +811,10 @@ pub struct PlayerUsedMedicalCenter { | ||||
| 
 | ||||
| //}
 | ||||
| 
 | ||||
| //#[pso_message(0xC7)]
 | ||||
| //pub struct ChargeAttack {
 | ||||
| 
 | ||||
| //}
 | ||||
| #[pso_message(0xC7)] | ||||
| pub struct ChargeAttack { | ||||
|     meseta: u32, | ||||
| } | ||||
| 
 | ||||
| #[pso_message(0xC8)] | ||||
| pub struct RequestExp { | ||||
| @ -1066,7 +1066,7 @@ pub enum GameMessage { | ||||
|     SortItems(SortItems), | ||||
|     PlayerUsedMedicalCenter(PlayerUsedMedicalCenter), | ||||
|     //ExperienceSteal(ExperienceSteal),
 | ||||
|     //ChargeAttack(ChargeAttack),
 | ||||
|     ChargeAttack(ChargeAttack), | ||||
|     RequestExp(RequestExp), | ||||
|     //QuestRewardMeseta(QuestRewardMeseta),
 | ||||
|     //QuestRewardItem(QuestRewardItem),
 | ||||
| @ -1230,7 +1230,7 @@ impl PSOPacketData for GameMessage { | ||||
|             SortItems::CMD => Ok(GameMessage::SortItems(SortItems::from_bytes(&mut cur)?)), | ||||
|             PlayerUsedMedicalCenter::CMD => Ok(GameMessage::PlayerUsedMedicalCenter(PlayerUsedMedicalCenter::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)?)), | ||||
|             //QuestRewardMeseta::CMD => Ok(GameMessage::QuestRewardMeseta(QuestRewardMeseta::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::PlayerUsedMedicalCenter(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::QuestRewardMeseta(data) => data.as_bytes(),
 | ||||
|             //GameMessage::QuestRewardItem(data) => data.as_bytes(),
 | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user