Merge pull request #86 from rickfay/fix-ice-gimos

Fix Ice Gimos Fight logic

Author: rickfay

build.rs

@@ -1,13 +1,14 @@
 use std::env;
 use std::io;
-use winres::WindowsResource;
+// use winres::WindowsResource;
 
 fn main() -> io::Result<()> {
     // Windows
     if env::var_os("CARGO_CFG_WINDOWS").is_some() {
-        let mut res = WindowsResource::new();
-        res.set_icon("icon.ico");
-        res.compile()?;
+        // FIXME this is creating problems for some reason, commenting out until it can be fixed.
+        // let mut res = WindowsResource::new();
+        // res.set_icon("icon.ico");
+        // res.compile()?;
     }
 
     // macOS - todo

presets/Example.json

@@ -1,7 +1,7 @@
 {
   // "Visit the project GitHub for details about each option: https://github.com/rickfay/z17-randomizer/tree/dev#game-options"
   "seed": 0,
-  "version": "v0.4.0 - Beta Build 2024-12-02",
+  "version": "v0.4.0 - Beta Build 2025-01-16",
   "settings": {
 
 

randomizer/src/constants.rs

@@ -1,5 +1,5 @@
 //! Application Constants
 
 /// Build Version
-pub const VERSION: &str = "v0.4.0 - Beta Build 2024-12-02";
+pub const VERSION: &str = "v0.4.0 - Beta Build 2025-01-16";
 pub const CONFIG_FILE_NAME: &str = "config.json";

randomizer/src/world/lorule.rs

@@ -1037,7 +1037,7 @@ pub(crate) fn graph(crack_map: &CrackMap) -> HashMap<Location, LocationNode> {
                 vec![
                     check!("Treacherous Tower Weather Vane", regions::lorule::death::mountain::SUBREGION),
                     check!("Ice Gimos Fight", regions::lorule::death::mountain::SUBREGION, |p| p
-                        .can_defeat_margomill()),
+                        .can_attack_iceproof()),
                     check!("Lorule Mountain W Ledge", regions::lorule::death::mountain::SUBREGION => {
                         normal: |p| p.can_merge(),
                         glitched: |p| p.has_nice_bombs(),