Merge pull request 'tek' (#34) from tek into master
This commit is contained in:
		
						commit
						ebca229851
					
				@ -722,13 +722,23 @@ pub struct PhotonChairMove {
 | 
			
		||||
//    unknown3: u8,
 | 
			
		||||
//}
 | 
			
		||||
 | 
			
		||||
//#[pso_message(0xB8)]
 | 
			
		||||
//pub struct TechItem {
 | 
			
		||||
    
 | 
			
		||||
//}
 | 
			
		||||
#[pso_message(0xB8)]
 | 
			
		||||
pub struct TekRequest {
 | 
			
		||||
    item_index: u8,
 | 
			
		||||
    _unknown1: u8,
 | 
			
		||||
    _unknown2: u8,
 | 
			
		||||
    _unknown3: u8,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[pso_message(0xB9)]
 | 
			
		||||
pub struct TekPreview {
 | 
			
		||||
    pub item_bytes: [u8; 12],
 | 
			
		||||
    pub item_id: u32,
 | 
			
		||||
    pub item_bytes2: [u8; 4],
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//#[pso_message(0xBA)]
 | 
			
		||||
//pub struct TechWeaponAccept {
 | 
			
		||||
//pub struct TekAccept {
 | 
			
		||||
    
 | 
			
		||||
//}
 | 
			
		||||
 | 
			
		||||
@ -1037,8 +1047,9 @@ pub enum GameMessage {
 | 
			
		||||
    PhotonChairMove(PhotonChairMove),
 | 
			
		||||
    //ShopRequest(ShopRequest),
 | 
			
		||||
    //BuyItem(BuyItem),
 | 
			
		||||
    //TechItem(TechItem),
 | 
			
		||||
    //TechWeaponAccept(TechWeaponAccept),
 | 
			
		||||
    TekRequest(TekRequest),
 | 
			
		||||
    TekPreview(TekPreview),
 | 
			
		||||
    //TekAccept(TekAccept),
 | 
			
		||||
    //BankRequest(BankRequest),
 | 
			
		||||
    //BankInteraction(BankInteraction),
 | 
			
		||||
    //PlayerSoldItem(PlayerSoldItem),
 | 
			
		||||
@ -1199,8 +1210,9 @@ impl PSOPacketData for GameMessage {
 | 
			
		||||
            PhotonChairMove::CMD => Ok(GameMessage::PhotonChairMove(PhotonChairMove::from_bytes(&mut cur)?)),
 | 
			
		||||
            //ShopRequest::CMD => Ok(GameMessage::ShopRequest(ShopRequest::from_bytes(&mut cur)?)),
 | 
			
		||||
            //BuyItem::CMD => Ok(GameMessage::BuyItem(BuyItem::from_bytes(&mut cur)?)),
 | 
			
		||||
            //TechItem::CMD => Ok(GameMessage::TechItem(TechItem::from_bytes(&mut cur)?)),
 | 
			
		||||
            //TechWeaponAccept::CMD => Ok(GameMessage::TechWeaponAccept(TechWeaponAccept::from_bytes(&mut cur)?)),
 | 
			
		||||
            TekRequest::CMD => Ok(GameMessage::TekRequest(TekRequest::from_bytes(&mut cur)?)),
 | 
			
		||||
            TekPreview::CMD => Ok(GameMessage::TekPreview(TekPreview::from_bytes(&mut cur)?)),
 | 
			
		||||
            //TekAccept::CMD => Ok(GameMessage::TekAccept(TekAccept::from_bytes(&mut cur)?)),
 | 
			
		||||
            //BankRequest::CMD => Ok(GameMessage::BankRequest(BankRequest::from_bytes(&mut cur)?)),
 | 
			
		||||
            //BankInteraction::CMD => Ok(GameMessage::BankInteraction(BankInteraction::from_bytes(&mut cur)?)),
 | 
			
		||||
            //PlayerSoldItem::CMD => Ok(GameMessage::PlayerSoldItem(PlayerSoldItem::from_bytes(&mut cur)?)),
 | 
			
		||||
@ -1363,8 +1375,9 @@ impl PSOPacketData for GameMessage {
 | 
			
		||||
            GameMessage::PhotonChairMove(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::ShopRequest(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::BuyItem(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::TechItem(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::TechWeaponAccept(data) => data.as_bytes(),
 | 
			
		||||
            GameMessage::TekRequest(data) => data.as_bytes(),
 | 
			
		||||
            GameMessage::TekPreview(data) => data.as_bytes(),
 | 
			
		||||
            // GameMessage::TekAccept(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::BankRequest(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::BankInteraction(data) => data.as_bytes(),
 | 
			
		||||
            //GameMessage::PlayerSoldItem(data) => data.as_bytes(),
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user