fix(vanilla_fill): make uncle weapon non-random, make medallions vanilla

fix(enemizer): enemy bans

ItemList.py

@@ -301,6 +301,8 @@ def generate_itempool(world, player):
                     if not found_sword and world.swords[player] != 'swordless':
                         found_sword = True
                         possible_weapons.append(item)
+                if world.algorithm == 'vanilla_fill':  # skip other possibilities
+                    continue
                 if (item in ['Progressive Bow', 'Bow'] and not found_bow
                    and not world.bow_mode[player].startswith('retro')):
                     found_bow = True
@@ -394,9 +396,15 @@ def generate_itempool(world, player):
                 if tr_medallion == 'Random':
                     tr_medallion = None
     if not mm_medallion:
-        mm_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
+        if world.algorithm == 'vanilla_fill':
+            mm_medallion = 'Ether'
+        else:
+            mm_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
     if not tr_medallion:
-        tr_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
+        if world.algorithm == 'vanilla_fill':
+            tr_medallion = 'Quake'
+        else:
+            tr_medallion = ['Ether', 'Quake', 'Bombos'][random.randint(0, 2)]
     world.required_medallions[player] = (mm_medallion, tr_medallion)
 
     # shuffle bottle refills

RELEASENOTES.md

@@ -141,6 +141,13 @@ These are now independent of retro mode and have three options: None, Random, an
 
 # Bug Fixes and Notes
 
+* 1.3.0.9v
+  * ER: New Swapped ER mode borrowed from OWR
+  * ER: fixed a generation error where TR chooses all "must-exits"
+  * Ganonhunt: playthrough no longer collects crystals
+  * Vanilla Fill: Uncle weapon is always a sword, medallions for Mire/TR will be vanilla
+  * Customizer: support shufflebosses/shuffleenemies as well as boss_shuffle/enemy_shuffle
+  * Enemizer: enemy bans
 * 1.3.0.8v
   * Enemizer: Red Mimics correctly banned from challenge rooms in appropriate logic setting
   * No Logic Standard ER: Rain doors aren't blocked if no logic is enabled.

source/enemizer/enemy_deny.yaml

@@ -50,7 +50,7 @@ UwGeneralDeny:
   - [ 0x0027, 4, ["Bumper", "BigSpike", "AntiFairyCircle", "RollerVerticalDown", "RollerVerticalUp"]]
   - [ 0x0027, 5, [ "SparkCW", "SparkCCW", "RollerVerticalDown", "RollerVerticalUp", "RollerHorizontalLeft", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Tower Of Hera - Petting Zoo - Kodongo 1"
   - [ 0x0028, 4, [ "RollerVerticalUp" ] ]  #"Swamp Palace - Entrance Ledge - Spike Trap"
-  - [ 0x002a, 2, [ "SparkCW", "SparkCCW", "RollerHorizontalRight", "RollerHorizontalLeft", "AntiFairyCircle", "BigSpike", "SpikeBlock" ] ]  #"Palace of Darkness - Arena Main - Hardhat Beetle 1"
+  - [ 0x002a, 2, [ "SparkCW", "SparkCCW", "RollerHorizontalRight", "RollerHorizontalLeft", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper"]]  #"Palace of Darkness - Arena Main - Hardhat Beetle 1"
   - [ 0x002a, 3, [ "Statue", "SparkCW", "SparkCCW", "RollerVerticalDown", "RollerVerticalUp", "RollerHorizontalRight", "RollerHorizontalLeft", "Beamos", "AntiFairyCircle", "BigSpike", "FirebarCW", "FirebarCCW", "SpikeBlock", "Bumper" ] ]  #"Palace of Darkness - Arena Main - Hardhat Beetle 2"
   - [ 0x002a, 4, [ "Statue", "Beamos", "AntiFairyCircle", "BigSpike", "Bumper" ]]
   - [ 0x002a, 6, [ "RollerVerticalUp", "RollerHorizontalRight", "RollerHorizontalLeft", "Beamos", "AntiFairyCircle", "BigSpike", "SpikeBlock", "Bumper" ] ]  #"Palace of Darkness - Arena Main - Hardhat Beetle 5"
@@ -165,6 +165,7 @@ UwGeneralDeny:
   - [ 0x0065, 1, [ "RollerHorizontalLeft", "RollerHorizontalRight" ] ]  #"Thieves' Town - Attic Window - Rat 2"
   - [ 0x0065, 2, [ "Beamos", "AntiFairyCircle", "Bumper" ] ]  #"Thieves' Town - Attic Window - Rat 3"
   - [ 0x0066, 0, [ "Beamos", "AntiFairyCircle", "BigSpike", "Bumper" ] ]  #"Swamp Palace - Waterfall Room - Hover 1"
+  - [ 0x0066, 2, [ "AntiFairyCircle", "Bumper"]]
   - [ 0x0067, 1, [ "RollerVerticalUp", "RollerVerticalDown" ] ]  #"Skull Woods - Firebar Pits - Blue Bari 1"
   - [ 0x0067, 2, ["Bumper"]]  #"Skull Woods - Firebar Pits - Blue Bari 2"
   - [ 0x0067, 3, [ "RollerVerticalUp", "RollerVerticalDown" ] ]  #"Skull Woods - Firebar Pits - Hardhat Beetle 1"