Flute mode

And some odd fixes

source/classes/CustomSettings.py

@@ -68,6 +68,7 @@ class CustomSettings(object):
                 args.logic[p] = get_setting(settings['logic'], args.logic[p])
                 args.mode[p] = get_setting(settings['mode'], args.mode[p])
                 args.swords[p] = get_setting(settings['swords'], args.swords[p])
+                args.flute_mode[p] = get_setting(settings['flute_mode'], args.flute_mode[p])
                 args.item_functionality[p] = get_setting(settings['item_functionality'], args.item_functionality[p])
                 args.goal[p] = get_setting(settings['goal'], args.goal[p])
                 args.difficulty[p] = get_setting(settings['difficulty'], args.difficulty[p])
@@ -189,6 +190,7 @@ class CustomSettings(object):
             settings_dict[p]['logic'] = world.logic[p]
             settings_dict[p]['mode'] = world.mode[p]
             settings_dict[p]['swords'] = world.swords[p]
+            settings_dict[p]['flute_mode'] = world.flute_mode[p]
             settings_dict[p]['difficulty'] = world.difficulty[p]
             settings_dict[p]['goal'] = world.goal[p]
             settings_dict[p]['accessibility'] = world.accessibility[p]

source/classes/constants.py

@@ -67,9 +67,8 @@ SETTINGSTOPROCESS = {
       "crystals_ganon": "crystals_ganon",
       "weapons": "swords",
       "itempool": "difficulty",
-      "itemfunction": "item_functionality",
+      "flute_mode": "flute_mode",
       "timer": "timer",
-      "progressives": "progressive",
       "accessibility": "accessibility",
       "sortingalgo": "algorithm",
       "beemizer": "beemizer",

source/item/FillUtil.py

@@ -454,6 +454,7 @@ vanilla_mapping = {
     'Hookshot': ['Swamp Palace - Big Chest'],
     'Magic Mirror': ['Old Man'],
     'Ocarina': ['Flute Spot'],
+    'Ocarina (Activated)': ['Flute Spot'],
     'Pegasus Boots': ['Sahasrahla'],
     'Power Glove': ['Desert Palace - Big Chest'],
     'Cape': ["King's Tomb"],
@@ -779,7 +780,7 @@ major_items = {'Bombos', 'Book of Mudora', 'Cane of Somaria', 'Ether', 'Fire Rod
                'Bug Catching Net', 'Cane of Byrna', 'Blue Boomerang', 'Red Boomerang', 'Progressive Glove',
                'Power Glove', 'Titans Mitts', 'Bottle', 'Bottle (Red Potion)', 'Bottle (Green Potion)', 'Magic Mirror',
                'Bottle (Blue Potion)', 'Bottle (Fairy)', 'Bottle (Bee)', 'Bottle (Good Bee)', 'Magic Upgrade (1/2)',
-               'Sanctuary Heart Container', 'Boss Heart Container', 'Progressive Shield',
+               'Sanctuary Heart Container', 'Boss Heart Container', 'Progressive Shield', 'Ocarina (Activated)',
                'Mirror Shield', 'Progressive Armor', 'Blue Mail', 'Red Mail', 'Progressive Sword', 'Fighter Sword',
                'Master Sword', 'Tempered Sword', 'Golden Sword', 'Bow', 'Silver Arrows', 'Triforce Piece', 'Moon Pearl',
                'Progressive Bow', 'Progressive Bow (Alt)'}

source/tools/MysteryUtils.py

@@ -144,6 +144,7 @@ def roll_settings(weights):
                       }[swords]
 
     ret.difficulty = get_choice('item_pool')
+    ret.flute_mode = get_choice_default('flute_mode', default='normal')
 
     ret.item_functionality = get_choice('item_functionality')