From fed38efcc4d2c5e4e93bf0168322d194248792da Mon Sep 17 00:00:00 2001 From: Lyle Mantooth Date: Sat, 4 Jun 2022 14:38:35 -0400 Subject: [PATCH] Add back options passed by ALttpDoorRandomizer. Even though they aren't used, we have to declare them to parse them. --- enemize/src/main.rs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/enemize/src/main.rs b/enemize/src/main.rs index 0e3cc09..17da211 100644 --- a/enemize/src/main.rs +++ b/enemize/src/main.rs @@ -17,18 +17,26 @@ const ENEMIZER_BASE_PATCH: &'static str = "enemizer_base_patch.json"; #[clap(author, version, about)] struct Args { /// path to the base rom file - rom: PathBuf, - /// seed number #[clap(short, long)] - seed: Option, + rom: PathBuf, /// path to the enemizerOptions.json #[clap(short, long)] enemizer: PathBuf, + /// seed number + #[clap(short, long)] + seed: Option, /// path to the intended output file + #[clap(short, long)] output: PathBuf, /// operate in binary mode (takes already randomized SFC and applies enemizer directly to ROM) #[clap(long)] binary: bool, + /// path to base2patched.json (not used) + #[clap(long)] + base: Option, + /// path to the randomizerPatch.json (not used) + #[clap(long)] + randomizer: Option, } fn main() -> anyhow::Result<()> { @@ -36,7 +44,12 @@ fn main() -> anyhow::Result<()> { let stopwatch = Instant::now(); - let options = serde_json::from_reader(File::open(args.enemizer)?)?; + let options = { + let mut opts_file = File::open(args.enemizer)?; + let mut json = String::new(); + opts_file.read_to_string(&mut json)?; + serde_json::from_str(&json)? + }; let symbols = load_symbols()?; let mut raw_data = vec![];