feat: random fight backgrounds

markisha64 · Nov 6, 2024 · 9117d0c · 9117d0c
1 parent 8c3d1b1
commit 9117d0c
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/src/gui/maps.rs b/src/gui/maps.rs
@@ -12,6 +12,7 @@ pub fn maps() -> Element {
 
     let color = read_state.randomizer.maps.color;
     let backgrounds = read_state.randomizer.maps.backgrounds;
+    let fight_backgrounds = read_state.randomizer.maps.fight_backgrounds;
     let item_boxes = read_state.randomizer.maps.item_boxes;
     let selected = read_state.randomizer.maps.item_boxes_items_only.clone();
 
@@ -59,6 +60,21 @@ pub fn maps() -> Element {
                     },
                 }
             },
+            div {
+                div {
+                    class: "left",
+                    checkbox::checkbox {
+                        label: "Fight Backgrounds",
+                        id: "maps.fight_backgrounds",
+                        checked: fight_backgrounds,
+                        disabled: !enabled,
+                        tooltip: "Randomize fight backgrounds",
+                        onchange: move |x: bool| {
+                            state.write().randomizer.maps.fight_backgrounds = x;
+                        }
+                    },
+                }
+            },
             div {
                 class: "left",
                 checkbox::checkbox {

diff --git a/src/json.rs b/src/json.rs
@@ -71,6 +71,8 @@ pub struct Maps {
     pub item_boxes: bool,
     #[serde(default = "ShopItems::default")]
     pub item_boxes_items_only: ShopItems,
+    #[serde(default = "default_bool_true")]
+    pub fight_backgrounds: bool,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]

diff --git a/src/rand.rs b/src/rand.rs
@@ -642,7 +642,7 @@ async fn read_map_objects(
 
                             let ptr = area.original.teams[0];
 
-                            if ptr.is_valid() {
+                            if !ptr.is_valid() {
                                 return None;
                             }
 

diff --git a/src/rand/maps.rs b/src/rand/maps.rs
@@ -1,4 +1,4 @@
-use std::collections::BTreeSet;
+use std::collections::{BTreeSet, HashSet};
 
 use crate::{rand::Objects, util};
 use anyhow::Context;
@@ -57,9 +57,27 @@ pub fn patch(
         item_boxes(preset, objects, rng)?;
     }
 
+    if maps.fight_backgrounds {
+        random_fight_backgrounds(objects, rng);
+    }
+
     Ok(())
 }
 
+fn random_fight_backgrounds(objects: &mut Objects, rng: &mut Xoshiro256StarStar) {
+    for map in &mut objects.map_objects {
+        if let Some(se_obj) = &mut map.stage_encounters {
+            for opt in &mut se_obj.stage_encounters {
+                if let Some(encounters_obj) = opt {
+                    for encounter in &mut encounters_obj.modified {
+                        encounter.stage = rng.next_u32() % 0x39;
+                    }
+                }
+            }
+        }
+    }
+}
+
 fn color(objects: &mut Objects, rng: &mut Xoshiro256StarStar) {
     for map in &mut objects.map_objects {
         if let Some(color_object) = &mut map.map_color {