Parse misc item info

peppi/src/model/enums/item.rs

@@ -232,5 +232,26 @@ pseudo_enum!(Type: u16 {
 	236 => BIRDO_EGG,
 });
 
+pseudo_enum!(TurnipType: u8 {
+	0 => SMILEY,
+	1 => BORED,
+	2 => SLEEPY,
+	3 => SHOCKED,
+	4 => LAUGHING,
+	5 => WINK,
+	6 => DOT_EYES,
+	7 => STITCH_FACE,
+});
+
+pseudo_enum!(MissileType: u8 {
+	0 => HOMING,
+	1 => SUPER,
+});
+
+pseudo_enum!(ChargeState: u8 {
+	0 => CHARGING,
+	1 => LAUNCHED,
+});
+
 pseudo_enum!(State: u8 {
 });

peppi/src/model/item.rs

@@ -1,11 +1,19 @@
 use serde::Serialize;
 
 use crate::model::{
-	enums::item::{State, Type},
+	enums::item::{ChargeState, MissileType, State, TurnipType, Type},
 	primitives::{Direction, Port, Position, Velocity},
 };
 use peppi_derive::Arrow;
 
+#[derive(Clone, Copy, Debug, PartialEq, Serialize, Arrow)]
+pub struct MiscInfo {
+	pub missile_type: MissileType,
+	pub turnip_type: TurnipType,
+	pub charge_state: ChargeState,
+	pub charge_power: u8,
+}
+
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Arrow)]
 pub struct Item {
 	pub id: u32,
@@ -26,7 +34,7 @@ pub struct Item {
 
 	#[serde(skip_serializing_if = "Option::is_none")]
 	#[slippi(version = "3.2")]
-	pub misc: Option<[u8; 4]>,
+	pub misc_info: Option<MiscInfo>,
 
 	#[serde(skip_serializing_if = "Option::is_none")]
 	#[slippi(version = "3.5")]

peppi/src/serde/de.rs

@@ -24,7 +24,7 @@ use crate::{
 		},
 		frame::{self, Post, Pre},
 		game::{self, Netplay, Player, PlayerType, MAX_PLAYERS, NUM_PORTS},
-		item::Item,
+		item::{Item, MiscInfo},
 		primitives::{Port, Position, Velocity},
 		slippi, triggers,
 	},
@@ -512,39 +512,56 @@ fn frame_end(r: &mut &[u8]) -> Result<FrameEvent<FrameId, frame::End>> {
 }
 
 fn item(r: &mut &[u8]) -> Result<FrameEvent<FrameId, Item>> {
-	let id = FrameId::new(r.read_i32::<BE>()?);
-	trace!("Item Update: {:?}", id);
+	let frame_id = FrameId::new(r.read_i32::<BE>()?);
+	trace!("Item Update: {:?}", frame_id);
 	let r#type = item::Type(r.read_u16::<BE>()?);
+	let state = item::State(r.read_u8()?);
+	let direction = {
+		let x = r.read_f32::<BE>()?;
+		if x == 0.0 {
+			None
+		} else {
+			Some(x.try_into()?)
+		}
+	};
+	let velocity = Velocity {
+		x: r.read_f32::<BE>()?,
+		y: r.read_f32::<BE>()?,
+	};
+	let position = Position {
+		x: r.read_f32::<BE>()?,
+		y: r.read_f32::<BE>()?,
+	};
+	let damage = r.read_u16::<BE>()?;
+	let timer = r.read_f32::<BE>()?;
+	let id = r.read_u32::<BE>()?;
+	// v3.2
+	let misc_info = if_more(r, |r| {
+		Ok(MiscInfo {
+			missile_type: item::MissileType(r.read_u8()?),
+			turnip_type: item::TurnipType(r.read_u8()?),
+			charge_state: item::ChargeState(r.read_u8()?),
+			charge_power: r.read_u8()?,
+		})
+	})?;
+	// v3.6
+	let owner = if_more(r, |r| Ok(Port::try_from(r.read_u8()?).ok()))?;
+
 	Ok(FrameEvent {
-		id: id,
+		id: frame_id,
 		event: Item {
-			r#type: r#type,
-			state: item::State(r.read_u8()?),
-			direction: {
-				let x = r.read_f32::<BE>()?;
-				if x == 0.0 {
-					None
-				} else {
-					Some(x.try_into()?)
-				}
-			},
-			velocity: Velocity {
-				x: r.read_f32::<BE>()?,
-				y: r.read_f32::<BE>()?,
-			},
-			position: Position {
-				x: r.read_f32::<BE>()?,
-				y: r.read_f32::<BE>()?,
-			},
-			damage: r.read_u16::<BE>()?,
-			timer: r.read_f32::<BE>()?,
-			id: r.read_u32::<BE>()?,
+			r#type,
+			state,
+			direction,
+			velocity,
+			position,
+			damage,
+			timer,
+			id,
 			// v3.2
-			misc: if_more(r, |r| {
-				Ok([r.read_u8()?, r.read_u8()?, r.read_u8()?, r.read_u8()?])
-			})?,
+			misc_info,
 			// v3.6
-			owner: if_more(r, |r| Ok(Port::try_from(r.read_u8()?).ok()))?,
+			owner,
 		},
 	})
 }

peppi/src/serde/ser.rs

@@ -243,7 +243,11 @@ fn item<W: Write>(w: &mut W, i: &item::Item, ver: Version, frame_idx: i32) -> Re
 	w.write_u32::<BE>(i.id)?;
 
 	if ver.gte(3, 2) {
-		w.write_all(&i.misc.unwrap())?;
+		let misc = &i.misc_info.unwrap();
+		w.write_u8(misc.missile_type.0)?;
+		w.write_u8(misc.turnip_type.0)?;
+		w.write_u8(misc.charge_state.0)?;
+		w.write_u8(misc.charge_power)?;
 	}
 
 	if ver.gte(3, 6) {

peppi/tests/peppi.rs

@@ -24,7 +24,7 @@ use peppi::{
 			DashBack, End, EndMethod, Frames, Game, Language, Netplay, Player, PlayerType, Scene,
 			ShieldDrop, Start, Ucf,
 		},
-		item::Item,
+		item::{Item, MiscInfo},
 		metadata::{self, Metadata},
 		primitives::{Direction, Port, Position, Velocity},
 		slippi::{Slippi, Version},
@@ -573,7 +573,12 @@ fn items() {
 					timer: 140.0,
 					r#type: item::Type::PEACH_TURNIP,
 					velocity: Velocity { x: 0.0, y: 0.0 },
-					misc: Some([5, 5, 5, 5]),
+					misc_info: Some(MiscInfo {
+						missile_type: item::MissileType(5),
+						turnip_type: item::TurnipType::WINK,
+						charge_state: item::ChargeState(5),
+						charge_power: 5,
+					}),
 					owner: Some(Some(Port::P1)),
 				}
 			);
@@ -591,7 +596,12 @@ fn items() {
 					timer: 140.0,
 					r#type: item::Type::PEACH_TURNIP,
 					velocity: Velocity { x: 0.0, y: 0.0 },
-					misc: Some([5, 0, 5, 5]),
+					misc_info: Some(MiscInfo {
+						missile_type: item::MissileType(5),
+						turnip_type: item::TurnipType::SMILEY,
+						charge_state: item::ChargeState(5),
+						charge_power: 5,
+					}),
 					owner: Some(Some(Port::P1)),
 				}
 			);
@@ -609,7 +619,12 @@ fn items() {
 					timer: 140.0,
 					r#type: item::Type::PEACH_TURNIP,
 					velocity: Velocity { x: 0.0, y: 0.0 },
-					misc: Some([5, 0, 5, 5]),
+					misc_info: Some(MiscInfo {
+						missile_type: item::MissileType(5),
+						turnip_type: item::TurnipType::SMILEY,
+						charge_state: item::ChargeState(5),
+						charge_power: 5,
+					}),
 					owner: Some(Some(Port::P1)),
 				}
 			);