Merge pull request 'exp steal packet' (#21) from expsteal into master
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	continuous-integration/drone/push Build is passing
				
			Reviewed-on: #21
This commit is contained in:
		
						commit
						3cf9cf5392
					
				| @ -960,10 +960,12 @@ 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 { | ||||||
| @ -1222,7 +1224,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),
 | ||||||
| @ -1389,7 +1391,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)?)),
 | ||||||
| @ -1558,7 +1560,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(),
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user