diff --git a/src/main/java/lmr/randomizer/Main.java b/src/main/java/lmr/randomizer/Main.java index 76b5db24..f18af1a4 100644 --- a/src/main/java/lmr/randomizer/Main.java +++ b/src/main/java/lmr/randomizer/Main.java @@ -335,7 +335,7 @@ static class CheckboxPanel extends JPanel { public CheckboxPanel() { super(new MigLayout("wrap 2", "[sizegroup checkboxes]", "[]2[]")); - fullItemAccess = new JCheckBox("Require 100% item accessibility"); + fullItemAccess = new JCheckBox("All items must be accessible (100% seed)"); fullItemAccess.setSelected(Settings.isFullItemAccess()); add(fullItemAccess); @@ -343,11 +343,11 @@ public CheckboxPanel() { enableDamageBoostRequirements.setSelected(Settings.isRequireSoftwareComboForKeyFairy()); add(enableDamageBoostRequirements); - requireSoftwareComboForKeyFairy = new JCheckBox("Require software combo for key fairies"); + requireSoftwareComboForKeyFairy = new JCheckBox("Key Fairy chests/doors expect miracle + mekuri"); requireSoftwareComboForKeyFairy.setSelected(Settings.isRequireSoftwareComboForKeyFairy()); add(requireSoftwareComboForKeyFairy); - randomizeForbiddenTreasure = new JCheckBox("Include Forbidden Treasure in randomized items"); + randomizeForbiddenTreasure = new JCheckBox("Replace random non-Shrine map with Forbidden Treasure"); randomizeForbiddenTreasure.setSelected(Settings.isRandomizeForbiddenTreasure()); add(randomizeForbiddenTreasure); } @@ -579,7 +579,9 @@ private static void doTheThing() { RcdWriter.writeRcd(rcdData); DatWriter.writeDat(datInfo); -// accessChecker.outputRemaining(Settings.getStartingSeed(), attempt); + if(!Settings.isFullItemAccess()) { + accessChecker.outputRemaining(Settings.getStartingSeed(), attempt); + } return; } catch (Exception ex) { diff --git a/src/main/java/lmr/randomizer/Settings.java b/src/main/java/lmr/randomizer/Settings.java index 4e51ca35..85f722c0 100644 --- a/src/main/java/lmr/randomizer/Settings.java +++ b/src/main/java/lmr/randomizer/Settings.java @@ -33,7 +33,7 @@ private Settings() { startingSeed = new Random().nextInt(Integer.MAX_VALUE); laMulanaBaseDir = "Please enter your La-Mulana install directory"; - fullItemAccess = false; + fullItemAccess = true; randomizeForbiddenTreasure = true; enableDamageBoostRequirements = false; requireSoftwareComboForKeyFairy = true; @@ -41,8 +41,8 @@ private Settings() { bossDifficulty = BossDifficulty.HARD; shopRandomization = ShopRandomizationEnum.EVERYTHING; - nonRandomizedItems.add("Holy Grail"); - nonRandomizedItems.add("Hermes' Boots"); + initiallyAvailableItems.add("Holy Grail"); + initiallyAvailableItems.add("Hermes' Boots"); for(String filename : Arrays.asList("C:\\Games\\La-Mulana Remake 1.3.3.1", "C:\\GOG Games\\La-Mulana", "C:\\GOG Games\\La-Mulana", "C:\\Steam\\steamapps\\common\\La-Mulana", "C:\\Program Files (x86)\\Steam\\steamapps\\common\\La-Mulana", diff --git a/src/main/java/lmr/randomizer/node/AccessChecker.java b/src/main/java/lmr/randomizer/node/AccessChecker.java index 62d40d65..88224f16 100644 --- a/src/main/java/lmr/randomizer/node/AccessChecker.java +++ b/src/main/java/lmr/randomizer/node/AccessChecker.java @@ -206,23 +206,23 @@ public boolean isEnoughAnkhJewelsToDefeatAllAccessibleBosses() { } public void outputRemaining(long startingSeed, int attemptNumber) throws IOException { - BufferedWriter writer = FileUtils.getFileWriter(String.format("%s/inaccessible_%s.txt", startingSeed, attemptNumber)); - if (writer == null) { - return; - } - - NodeWithRequirements node; - for(String nodeName : mapOfNodeNameToRequirementsObject.keySet()) { - node = mapOfNodeNameToRequirementsObject.get(nodeName); - for(List requirementSet : node.getAllRequirements()) { - writer.write(nodeName + " => " + requirementSet); - writer.newLine(); - } - } - writer.flush(); - writer.close(); - - writer = FileUtils.getFileWriter(String.format("%s/missing_item_%s.txt", startingSeed, attemptNumber)); +// BufferedWriter writer = FileUtils.getFileWriter(String.format("%s/inaccessible_%s.txt", startingSeed, attemptNumber)); +// if (writer == null) { +// return; +// } +// +// NodeWithRequirements node; +// for(String nodeName : mapOfNodeNameToRequirementsObject.keySet()) { +// node = mapOfNodeNameToRequirementsObject.get(nodeName); +// for(List requirementSet : node.getAllRequirements()) { +// writer.write(nodeName + " => " + requirementSet); +// writer.newLine(); +// } +// } +// writer.flush(); +// writer.close(); + + BufferedWriter writer = FileUtils.getFileWriter(String.format("%s/excluded_items.txt", startingSeed)); if (writer == null) { return; } @@ -237,17 +237,17 @@ public void outputRemaining(long startingSeed, int attemptNumber) throws IOExcep writer.close(); - writer = FileUtils.getFileWriter(String.format("%s/accessible_%s.txt", startingSeed, attemptNumber)); - if (writer == null) { - return; - } - - for(String item : accessedNodes) { - writer.write(item); - writer.newLine(); - } - writer.flush(); - writer.close(); +// writer = FileUtils.getFileWriter(String.format("%s/accessible_%s.txt", startingSeed, attemptNumber)); +// if (writer == null) { +// return; +// } +// +// for(String item : accessedNodes) { +// writer.write(item); +// writer.newLine(); +// } +// writer.flush(); +// writer.close(); } public void setItemRandomizer(ItemRandomizer itemRandomizer) {