Merge software combo fairy requirements from master into ankh-jewels

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>lmr.randomizer</groupId>
     <artifactId>randomizer</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1</version>
     <name>La-Mulana Remake Randomizer</name>
     <description>La-Mulana Remake Randomizer</description>
     <packaging>jar</packaging>

src/main/java/lmr/randomizer/DataFromFile.java

@@ -189,7 +189,16 @@ public static Map<String, NodeWithRequirements> getMapOfNodeNameToRequirementsOb
                 FileUtils.populateRequirements(mapOfNodeNameToRequirementsObject, "requirement/glitch/item_reqs.txt", null);
                 FileUtils.populateRequirements(mapOfNodeNameToRequirementsObject, "requirement/glitch/shop_reqs.txt", null);
             }
+            if(!Settings.requireSoftwareComboForKeyFairy) {
+                FileUtils.populateRequirements(mapOfNodeNameToRequirementsObject, "requirement/special/no_software_combo_for_key_fairy_reqs.txt", null);
+            }
         }
         return mapOfNodeNameToRequirementsObject;
     }
+
+    public static void clearRequirementsData() {
+        if(mapOfNodeNameToRequirementsObject != null) {
+            mapOfNodeNameToRequirementsObject = null;
+        }
+    }
 }

src/main/java/lmr/randomizer/Main.java

@@ -315,6 +315,7 @@ static class CheckboxPanel extends JPanel {
         private JCheckBox enableGlitches;
         private JCheckBox initialSubweapon;
         private JCheckBox randomizeShops;
+        private JCheckBox requireSoftwareComboForKeyFairy;
 
         public CheckboxPanel() {
             super(new GridLayout(2, 2));
@@ -330,12 +331,22 @@ public CheckboxPanel() {
             randomizeShops = new JCheckBox("Enable shop randomization");
             add(randomizeShops);
             randomizeShops.setSelected(true);
+
+            requireSoftwareComboForKeyFairy = new JCheckBox("Require software combo for key fairies");
+            add(requireSoftwareComboForKeyFairy);
+            requireSoftwareComboForKeyFairy.setSelected(true);
         }
 
         public void updateSettings() {
             Settings.allowGlitches = enableGlitches.isSelected();
             Settings.guaranteeSubweapon = initialSubweapon.isSelected();
+
+            if(Settings.randomizeShops != randomizeShops.isSelected()
+                    || Settings.requireSoftwareComboForKeyFairy != requireSoftwareComboForKeyFairy.isSelected()) {
+                DataFromFile.clearRequirementsData();
+            }
             Settings.randomizeShops = randomizeShops.isSelected();
+            Settings.requireSoftwareComboForKeyFairy = requireSoftwareComboForKeyFairy.isSelected();
         }
     }
 

src/main/java/lmr/randomizer/Settings.java

@@ -13,6 +13,7 @@ private Settings() { }
     public static boolean allowGlitches = false;
     public static boolean randomizeShops = false;
     public static boolean guaranteeSubweapon = false; // Ensure at least one subweapon drop within initial item set. // todo: restore this; it's broken in cases where no subweapons are included in randomization
+    public static boolean requireSoftwareComboForKeyFairy = false;
 
     public static String laMulanaBaseDir = null;
     public static String rcdFileLocation = null;

src/main/resources/lmr/randomizer/requirement/item_reqs.txt

@@ -73,9 +73,9 @@ Eye of Truth => Location: Tower of the Goddess [Lamp], Location: Tower of the Go
 Eye of Truth => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Hand Scanner, reader.exe, Origin Seal, Axe, Sacred Orb
 Eye of Truth => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Hand Scanner, reader.exe, Origin Seal, Rolling Shuriken, Sacred Orb
 Eye of Truth => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Hand Scanner, reader.exe, Origin Seal, Earth Spear, Sacred Orb
-Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Axe
-Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Katana
-Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Knife
+Fairy Clothes => Location: Gate of Illusion [Middle], miracle.exe, mekuri.exe, Isis' Pendant, Axe
+Fairy Clothes => Location: Gate of Illusion [Middle], miracle.exe, mekuri.exe, Isis' Pendant, Katana
+Fairy Clothes => Location: Gate of Illusion [Middle], miracle.exe, mekuri.exe, Isis' Pendant, Knife
 Feather => Serpent Staff
 Flail Whip => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Hand Scanner, reader.exe, Origin Seal, Philosopher's Ocarina
 Flare Gun => None
@@ -146,7 +146,7 @@ Shuriken => None
 Silver Shield => Location: Graveyard of the Giants [West], Knife
 Silver Shield => Location: Graveyard of the Giants [West], Axe
 Silver Shield => Location: Graveyard of the Giants [West], Katana
-Spaulder => Location: Tower of the Goddess [Grail], Isis' Pendant
+Spaulder => Location: Tower of the Goddess [Grail], Isis' Pendant, Holy Grail, mirai.exe, miracle.exe, mekuri.exe
 Talisman => Event: Viy Defeated
 Treasures => Pepper
 Twin Statue => Location: Endless Corridor [2F-4F]

src/main/resources/lmr/randomizer/requirement/location_reqs.txt

@@ -57,7 +57,7 @@ Chamber of Birth [East] => Location: Chamber of Birth [West], Location: Gate of
 Twin Labyrinths [Loop] => None
 Twin Labyrinths [Lower] => None
 Twin Labyrinths [Upper] => Event: Ellmac Defeated, Twin Statue
-Gate of Time => Location: Chamber of Extinction [Main], Isis' Pendant
+Gate of Time => Location: Chamber of Extinction [Main], Isis' Pendant, miracle.exe, mekuri.exe
 Endless Corridor [1F] => None
 Endless Corridor [2F-4F] => Key of Eternity
 Endless Corridor [5F] => Key of Eternity, Location: Endless Corridor [2F-4F]

src/main/resources/lmr/randomizer/requirement/shop_reqs.txt

@@ -26,7 +26,7 @@ Shop 9 (Sun) => None
 Shop 10 (Sun) => Death Seal, Feather
 Shop 11 (Moonlight) => Location: Temple of Moonlight [Lower], Bomb, Birth Seal
 Shop 12 (Spring) => Helmet, Origin Seal
-Shop 12 Alt (Spring) => Helmet, Origin Seal, Isis' Pendant
+Shop 12 Alt (Spring) => Helmet, Origin Seal, Isis' Pendant, miracle.exe, mekuri.exe
 Shop 13 (Goddess) => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Lamp of Time, Hand Scanner, reader.exe, Origin Seal, Caltrops, Scalesphere
 Shop 13 (Goddess) => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Lamp of Time, Hand Scanner, reader.exe, Origin Seal, Bomb, Scalesphere
 Shop 13 (Goddess) => Location: Tower of the Goddess [Lamp], Location: Tower of the Goddess [Lower], Lamp of Time, Hand Scanner, reader.exe, Origin Seal, Knife, Scalesphere

src/main/resources/lmr/randomizer/requirement/special/no_software_combo_for_key_fairy_reqs.txt

@@ -0,0 +1,6 @@
+Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Axe
+Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Katana
+Fairy Clothes => Location: Gate of Illusion [Middle], Isis' Pendant, Knife
+Spaulder => Location: Tower of the Goddess [Grail], Isis' Pendant, Holy Grail, mirai.exe
+Location: Gate of Time => Location: Chamber of Extinction [Main], Isis' Pendant
+Shop 12 Alt (Spring) => Helmet, Origin Seal, Isis' Pendant