From 32aebb2ad141a11efca033b45206b1551c87e599 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 15 Jun 2022 16:55:20 -0600 Subject: [PATCH] Pottery fix for item counting because of shop conflict --- RELEASENOTES.md | 1 + Rom.py | 2 +- data/base2current.bps | Bin 93021 -> 93041 bytes 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f120a32c..a27c05d0 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -162,6 +162,7 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o * Item will be highlighted in red if experimental is on * Bug with 0 GT crystals not opening GT * Settings code fix + * Fix for pottery not counting items in certain caves that share a supertile with shops * 1.0.2.4 * Updated tourney winners (included Doors Async League winners) * Fixed a couple issues with dungeon counters and the DungeonCompletion field for autotracking diff --git a/Rom.py b/Rom.py index f4bdd02c..c64c7491 100644 --- a/Rom.py +++ b/Rom.py @@ -37,7 +37,7 @@ from source.dungeon.RoomList import Room0127 JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '01166fb16b38b49ef79acc9993dc4f02' +RANDOMIZERBASEHASH = 'e33204b6023f07025eba16874308f57d' class JsonRom(object): diff --git a/data/base2current.bps b/data/base2current.bps index bd6417a47ef665eabc70d7f6055e50cdcb4562a4..fc22d9c3956780075f6752188bd52fca2ae6c189 100644 GIT binary patch delta 3217 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 LP#1RGTsixHG@5?( delta 3280 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 fWKz-Q^6O6{O4j?rcrZGc