Skip to content

Commit

Permalink
Fix edge cases
Browse files Browse the repository at this point in the history
  • Loading branch information
melody-rs committed May 31, 2024
1 parent 1d65ad8 commit af0f7a1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions crates/data/src/rmxp/system.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ pub use crate::{
Path,
};

#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
#[derive(Default, Debug)]
#[derive(serde::Deserialize, serde::Serialize)]
#[derive(alox_48::Deserialize, alox_48::Serialize)]
#[serde(default)] // ??? rmxp???
#[marshal(default)]
Expand Down Expand Up @@ -67,8 +68,9 @@ pub struct System {
pub actor_collapse_se: AudioFile,
pub enemy_collapse_se: AudioFile,
pub words: Words,
// #[serde(skip_deserializing)]
pub test_battlers: Vec<TestBattler>,
#[serde(skip)]
// #[marshal(skip)]
pub test_battlers: alox_48::Value,
#[serde(with = "optional_id_serde")]
#[marshal(with = "optional_id_alox")]
pub test_troop_id: Option<usize>,
Expand Down

0 comments on commit af0f7a1

Please sign in to comment.