From f4c465f5c3c504df895bcf08eb3c0ee9780f3b26 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Tue, 26 Sep 2023 13:40:22 -0600
Subject: [PATCH] Baserom update (colletion rate counter for mystery) Minor
 issue with customizer/mystery yamls and booleans

---
 Main.py                      |   2 +-
 RELEASENOTES.md              |   9 +++++++++
 Rom.py                       |   2 +-
 data/base2current.bps        | Bin 117439 -> 117445 bytes
 source/tools/MysteryUtils.py |  36 +++++++++++++++++------------------
 5 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Main.py b/Main.py
index ce8e2516..eacd2ca3 100644
--- a/Main.py
+++ b/Main.py
@@ -37,7 +37,7 @@ from source.enemizer.DamageTables import DamageTable
 from source.enemizer.Enemizer import randomize_enemies
 from source.rom.DataTables import init_data_tables
 
-version_number = '1.3.0.2'
+version_number = '1.3.0.3'
 version_branch = '-v'
 __version__ = f'{version_number}{version_branch}'
 
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 77d7707d..b2b5d838 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -141,6 +141,15 @@ These are now independent of retro mode and have three options: None, Random, an
 
 # Bug Fixes and Notes
 
+* 1.3.0.3v
+  * Faeries now part of the enemy shuffle pool. Take note, this will increase enemy drop locations to include fairy pools both in dungeons and in caves.
+  * Enemy drop indicator (blue square) now works in caves based on entrance used
+  * Fixes:
+    * Collection rate counter is properly hidden in mystery seeds
+    * Sprite limit lowered where possible to allow for lifting of pots
+    * Hovers in Swamp Waterway properly do not drop items anymore
+    * Lots more bans (thanks to jsd in particular but also thanks to all the reports)
+    * Minor issue with customizer/mystery files not allowing "true" for booleans
 * 1.3.0.2v
   * Fix for multiworld received keys not counting correctly
   * Fix for multiworld lamps incorrect graphics
diff --git a/Rom.py b/Rom.py
index 3933ac76..15196757 100644
--- a/Rom.py
+++ b/Rom.py
@@ -40,7 +40,7 @@ from source.enemizer.Enemizer import write_enemy_shuffle_settings
 
 
 JAP10HASH = '03a63945398191337e896e5771f77173'
-RANDOMIZERBASEHASH = '6fbf895bae14a0c74ec8dc782d3b9a95'
+RANDOMIZERBASEHASH = '8f9863c742096d16cae181fe314be3d7'
 
 
 class JsonRom(object):
diff --git a/data/base2current.bps b/data/base2current.bps
index 80984e899379618bfc446f1d737abbe1b45a38c3..1befcc5427d0a3653117beba996e2add6a951559 100644
GIT binary patch
delta 692
zcmWNKTS!xJ9LM+b?3QLuol}(R=*C<GI!(k&ULFe6CYph|lU<OgOdljnLQ0Re4JI=$
zr?bDORcEQ|G_^JvwJ2e-8k=^(mx$B{@gXFlj-+CPsPpvweE5Fh8=z$&TIR&Wp_Y<K
zN{kgs?BiV4ELDM3f{h|ELcYpyy1R51@7ut>#KI}x>jO(EaMWkkEM-84uf9@U2ra&@
z?&z?Lcs`YN>>lU8A%%syvK>z`>E+Ws5|XPKNe=3r5{<1OY%2`gio&*%u)VYhSq&<h
zO20;iN<A?ow;UH#IQwwhNZ6o49gR={H_>b(X!1`ZM$G30@n=`5D#Y;G!J28$b(F1Q
z{wM<L+r2o94^4#Kdfm`eIH2IYf}@xwuqDmgDPq7S6D?zgdAmDN=TRbO6J%x=&|F$y
zJ<UB0T;w_Cgenqo?`VXa*gx`Ej;|pBNyTIz+H8VD2V1pD(oub<Kf#gFdw-Od;>qJP
zIWZ3F$`jF~8mXHhQ>`oK84{wA$a?(nZz?p_m1AKtL|)7gr5(kjTevr&E5fjr8n*bR
z9vM?CR$jZpB{Xa?dOUYLsCP}~H*A?*GBj$9l5xmnjzrkjepb@Ynm+E?bv@DcmB0hU
zP2(SsfP*!Zc7VE#J~zV=c!~ZsLpfBTawFtHHR?1%s!B6qm3y{_E$-#S4ZS<neD3FZ
z3^JmJM$pFXGTu0xWxU7nIrPa0*(Gy~x0CHYuOiLwlx%#Pie#jCuREk<$B0+1N>(h$
zrji{%Vxgi<g6%11@-C=Iwj1RVkS49Tl}x_5jA{uuoRXQs(ED7miwY4cDYFf^oQsA2
z9@I~OI&qhYdNG%%-3`#*Rw**9p%(<?Lmk>AfWXdJ3;ZX~Lf<7wLZJX?puzt=0Dm!w
X793QI|HoT+FO{!$CU1QGweamfGDax5

delta 729
zcmW-aT}V@L9ESJvxDOL+=C&j&j#JkbCG#Wms}!n>Y*Bcj?nDL=p{}CrgRq$Y*|s?5
z$&b_a_cZFPbRLgl8x36K#l%|EB=8~)j6k}G=t55BMXjPnckcu5^S&{UGU`$KiPXjB
zU60vRqD<a5DCkGn8lo25EFvh?A}1K{dGueypNRJx;BffG#y46h2)pv%<iNS`iQ2p}
zXb4}up6FGU+!yrJ)8WW91xz2`_c16(LS0|hjM*>GXG-HtS)3`4GnH{~RXL_DY7e`$
z4aKU0DM(mIpHcfe$)3KrMUC4Vpa#z4XAO{Fd>C`7Qqc@K(ZW_^PBL`YjRo6rj*k1O
zj;^fR$zPax5*N)zW;h;IOQ9rVRU`Clp7gR*S3oISAS{z!G1C}S;gLqjRTO%J?9Mv;
zwh^+^mN0inhtxw?@M<IM*xq2!Am5SOj!nKz_6Plvg3K5k*QfaC<q_G?7Hn#Q+`MfE
zBo0Ahc6KGB_d6RKxLWAua%3UGvhML!ATfDn#}|^tV@$6*Jp9P2b<>hzSs?1aac0sq
zIAabB8S1~e0!rLZCr~<ex@KqjGY($v;GJ*RyvB}%Z8_@2!Wj7)Cu4UVYv^Jx;}1<>
zf)JKl;Q&<QLslp%-0!DTq~Zsq9o-WPrl9m!i1{UTaE;A=LaT!7y>4+K^OITJ;ySgu
zl7f%nAuAZtB`%asa$KmI9LMjhu(NZV3ti&dnsvzaO2b2|4si<7F2*$c0QEdj%cmyc
zi-zyQH(GSa<4n>I&3M6S9s2J$R0FC4#P_(e(}K>h3en>4htZN-S!jy7nT6=xqx^tX
zkM0&BF4r#Z8BNZ#I~ZrK-G;SV&XX3{Fqfg0;mZ9zOu#=^7P*M;P>`1?afuKSkl924
zTWhV%vV^B7D29W0l>&;e(Z<NplhAn<6nH)g`OqAZqVR{1Zv`LQ5?Ol*^9t38G+FuH
Iis{e)0I(7|iU0rr

diff --git a/source/tools/MysteryUtils.py b/source/tools/MysteryUtils.py
index 6ed297a2..78505eb2 100644
--- a/source/tools/MysteryUtils.py
+++ b/source/tools/MysteryUtils.py
@@ -86,25 +86,25 @@ def roll_settings(weights):
     ret.door_type_mode = get_choice('door_type_mode')
     ret.trap_door_mode = get_choice('trap_door_mode')
     ret.key_logic_algorithm = get_choice('key_logic_algorithm')
-    ret.decoupledoors = get_choice('decoupledoors') == 'on'
-    ret.experimental = get_choice('experimental') == 'on'
-    ret.collection_rate = get_choice('collection_rate') == 'on'
+    ret.decoupledoors = get_choice('decoupledoors')
+    ret.experimental = get_choice('experimental')
+    ret.collection_rate = get_choice('collection_rate')
 
     ret.dungeon_counters = get_choice('dungeon_counters') if 'dungeon_counters' in weights else 'default'
     if ret.dungeon_counters == 'default':
         ret.dungeon_counters = 'pickup' if ret.door_shuffle != 'vanilla' or ret.compassshuffle == 'on' else 'off'
 
-    ret.shufflelinks = get_choice('shufflelinks') == 'on'
-    ret.shuffletavern = get_choice('shuffletavern') == 'on'
-    ret.pseudoboots = get_choice('pseudoboots') == 'on'
-    ret.shopsanity = get_choice('shopsanity') == 'on'
-    keydropshuffle = get_choice('keydropshuffle') == 'on'
+    ret.shufflelinks = get_choice('shufflelinks')
+    ret.shuffletavern = get_choice('shuffletavern')
+    ret.pseudoboots = get_choice('pseudoboots')
+    ret.shopsanity = get_choice('shopsanity')
+    keydropshuffle = get_choice('keydropshuffle')
     ret.dropshuffle = get_choice('dropshuffle') if 'dropshuffle' in weights else 'none'
     ret.dropshuffle = 'keys' if ret.dropshuffle == 'none' and keydropshuffle else ret.dropshuffle
     ret.pottery = get_choice('pottery') if 'pottery' in weights else 'none'
     ret.pottery = 'keys' if ret.pottery == 'none' and keydropshuffle else ret.pottery
-    ret.colorizepots = get_choice_default('colorizepots', default='on') == 'on'
-    ret.shufflepots = get_choice('pot_shuffle') == 'on'
+    ret.colorizepots = get_choice_default('colorizepots', default=True)
+    ret.shufflepots = get_choice('pot_shuffle')
     ret.mixed_travel = get_choice('mixed_travel') if 'mixed_travel' in weights else 'prevent'
     ret.standardize_palettes = (get_choice('standardize_palettes') if 'standardize_palettes' in weights
                                 else 'standardize')
@@ -139,12 +139,12 @@ def roll_settings(weights):
     if ret.mode == 'retro':
         ret.mode = 'open'
         ret.retro = True
-    ret.retro = get_choice('retro') == 'on'  # this overrides world_state if used
+    ret.retro = get_choice('retro')  # this overrides world_state if used
     ret.take_any = get_choice_default('take_any', default='none')
 
-    ret.bombbag = get_choice('bombbag') == 'on'
+    ret.bombbag = get_choice('bombbag')
 
-    ret.hints = get_choice('hints') == 'on'
+    ret.hints = get_choice('hints')
 
     swords = get_choice('weapons')
     if swords is not None:
@@ -197,15 +197,15 @@ def roll_settings(weights):
     if 'rom' in weights:
         romweights = weights['rom']
         ret.sprite = get_choice('sprite', romweights)
-        ret.disablemusic = get_choice('disablemusic', romweights) == 'on'
-        ret.quickswap = get_choice('quickswap', romweights) == 'on'
-        ret.reduce_flashing = get_choice('reduce_flashing', romweights) == 'on'
+        ret.disablemusic = get_choice('disablemusic', romweights)
+        ret.quickswap = get_choice('quickswap', romweights)
+        ret.reduce_flashing = get_choice('reduce_flashing', romweights)
         ret.fastmenu = get_choice('menuspeed', romweights)
         ret.heartcolor = get_choice('heartcolor', romweights)
         ret.heartbeep = get_choice('heartbeep', romweights)
         ret.ow_palettes = get_choice('ow_palettes', romweights)
         ret.uw_palettes = get_choice('uw_palettes', romweights)
-        ret.shuffle_sfx = get_choice('shuffle_sfx', romweights) == 'on'
-        ret.msu_resume = get_choice('msu_resume', romweights) == 'on'
+        ret.shuffle_sfx = get_choice('shuffle_sfx', romweights)
+        ret.msu_resume = get_choice('msu_resume', romweights)
 
     return ret