Fix no map textbox update case and solve preset conflict on dev

Author: GSKirox

Messages.py

@@ -1509,7 +1509,8 @@ def update_map_compass_messages(messages: list[Message], world: World):
                             map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for {COLOR_MAP['Red'] + 'masterful' if world.dungeon_mq[dungeon.name] else COLOR_MAP['Green'] + 'ordinary'}\x01{dungeon_name}\x05\x40!\x01In this dungeon, {boss_textboxes[boss_room]}\x05\x40\x01lurks within!\x05\x40\x09"
                         else:
                             map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for\x01{dungeon_name}\x05\x40!\x01In this dungeon, {boss_textboxes[boss_room]}\x05\x40\x01lurks within!\x05\x40\x09"
+                        update_message_by_id(messages, map_id, map_message, allow_duplicates=True)
                     else:
                         if 'map_mq' in world.settings.enhance_map_compass and (world.settings.mq_dungeons_mode == 'random' or world.settings.mq_dungeons_count != 0 and world.settings.mq_dungeons_count != 12):
                             map_message = f"\x13\x76\x08You found the \x05\x41Map\x05\x40 for\x01{dungeon_name}\x05\x40!\x01It\'s {COLOR_MAP['Red'] + 'masterful' if world.dungeon_mq[dungeon.name] else COLOR_MAP['Green'] + 'ordinary'}!\x09"
-                    update_message_by_id(messages, map_id, map_message, allow_duplicates=True)
+                            update_message_by_id(messages, map_id, map_message, allow_duplicates=True)

data/presets_default.json

@@ -2137,241 +2137,6 @@
         "custom_ice_trap_count": 100,
         "ice_trap_appearance": "junk_only"
     },
-<<<<<<< HEAD
-=======
-    "League S7": {
-        "aliases": [
-            "league",
-            "league_s7"
-        ],
-        "show_seed_info": true,
-        "user_message": "OoTR League S7",
-        "world_count": 1,
-        "create_spoiler": true,
-        "password_lock": false,
-        "randomize_settings": false,
-        "logic_rules": "glitchless",
-        "reachable_locations": "beatable",
-        "triforce_hunt": false,
-        "triforce_count_per_world": 30,
-        "triforce_goal_per_world": 20,
-        "lacs_condition": "vanilla",
-        "lacs_medallions": 6,
-        "lacs_stones": 3,
-        "lacs_rewards": 9,
-        "lacs_tokens": 100,
-        "lacs_hearts": 20,
-        "bridge": "medallions",
-        "bridge_medallions": 5,
-        "bridge_stones": 3,
-        "bridge_rewards": 9,
-        "bridge_tokens": 100,
-        "bridge_hearts": 20,
-        "trials_random": false,
-        "trials": 0,
-        "shuffle_ganon_bosskey": "medallions",
-        "ganon_bosskey_medallions": 6,
-        "ganon_bosskey_stones": 3,
-        "ganon_bosskey_rewards": 9,
-        "ganon_bosskey_tokens": 100,
-        "ganon_bosskey_hearts": 20,
-        "open_forest": "closed_deku",
-        "open_kakariko": "open",
-        "open_door_of_time": "open",
-        "zora_fountain": "closed",
-        "gerudo_fortress": "fast",
-        "dungeon_shortcuts_choice": "off",
-        "dungeon_shortcuts": [],
-        "starting_age": "random",
-        "mq_dungeons_mode": "vanilla",
-        "mq_dungeons_specific": [],
-        "mq_dungeons_count": 0,
-        "empty_dungeons_mode": "none",
-        "empty_dungeons_specific": [],
-        "empty_dungeons_rewards": [],
-        "empty_dungeons_count": 2,
-        "shuffle_interior_entrances": "off",
-        "shuffle_hideout_entrances": false,
-        "shuffle_gerudo_fortress_heart_piece": "remove",
-        "shuffle_grotto_entrances": false,
-        "shuffle_dungeon_entrances": "off",
-        "shuffle_bosses": "off",
-        "shuffle_ganon_tower": false,
-        "shuffle_overworld_entrances": false,
-        "shuffle_gerudo_valley_river_exit": false,
-        "owl_drops": false,
-        "warp_songs": false,
-        "spawn_positions": [
-            "child",
-            "adult"
-        ],
-        "free_bombchu_drops": false,
-        "shuffle_song_items": "song",
-        "shopsanity": "off",
-        "special_deal_price_distribution": "betavariate",
-        "special_deal_price_min": 0,
-        "special_deal_price_max": 300,
-        "tokensanity": "off",
-        "shuffle_scrubs": "low",
-        "shuffle_child_trade": [],
-        "adult_trade_shuffle": false,
-        "adult_trade_start": [
-            "Prescription",
-            "Eyeball Frog",
-            "Eyedrops",
-            "Claim Check"
-        ],
-        "shuffle_freestanding_items": "off",
-        "shuffle_pots": "off",
-        "shuffle_empty_pots": false,
-        "shuffle_crates": "off",
-        "shuffle_empty_crates": false,
-        "shuffle_cows": false,
-        "shuffle_beehives": false,
-        "shuffle_wonderitems": false,
-        "shuffle_kokiri_sword": true,
-        "shuffle_ocarinas": false,
-        "shuffle_gerudo_card": false,
-        "shuffle_beans": false,
-        "shuffle_expensive_merchants": false,
-        "shuffle_frog_song_rupees": false,
-        "shuffle_100_skulltula_rupee": false,
-        "shuffle_loach_reward": "off",
-        "shuffle_individual_ocarina_notes": false,
-        "shuffle_dungeon_rewards": "reward",
-        "shuffle_mapcompass": "startwith",
-        "shuffle_smallkeys": "dungeon",
-        "shuffle_hideoutkeys": "vanilla",
-        "shuffle_tcgkeys": "vanilla",
-        "key_rings_choice": "off",
-        "key_rings": [],
-        "keyring_give_bk": false,
-        "shuffle_bosskeys": "dungeon",
-        "shuffle_silver_rupees": "vanilla",
-        "silver_rupee_pouches_choice": "off",
-        "silver_rupee_pouches": [],
-        "enhance_map_compass": [],
-        "logic_no_night_tokens_without_suns_song": false,
-        "disabled_locations": [
-            "Deku Theater Mask of Truth",
-            "Song from Impa",
-            "Dodongos Cavern Deku Scrub Lobby",
-            "Dodongos Cavern Deku Scrub Near Bomb Bag Right",
-            "Dodongos Cavern Deku Scrub Near Bomb Bag Left",
-            "Dodongos Cavern Deku Scrub Side Room Near Dodongos",
-            "Jabu Jabus Belly Deku Scrub",
-            "Ganons Castle Deku Scrub Center-Left",
-            "Ganons Castle Deku Scrub Center-Right",
-            "Ganons Castle Deku Scrub Right",
-            "Ganons Castle Deku Scrub Left"
-        ],
-        "allowed_tricks": [
-            "logic_fewer_tunic_requirements",
-            "logic_grottos_without_agony",
-            "logic_child_deadhand",
-            "logic_rusted_switches",
-            "logic_forest_vines",
-            "logic_lens_botw",
-            "logic_lens_castle",
-            "logic_lens_gtg",
-            "logic_lens_shadow",
-            "logic_lens_shadow_platform",
-            "logic_lens_bongo",
-            "logic_lens_spirit",
-            "logic_man_on_roof",
-            "logic_windmill_poh",
-            "logic_crater_bean_poh_with_hovers",
-            "logic_dc_jump"
-        ],
-        "advanced_allowed_tricks": [],
-        "starting_equipment": [
-            "deku_shield"
-        ],
-        "starting_inventory": [
-            "ocarina",
-            "lens",
-            "farores_wind",
-            "zeldas_letter"
-        ],
-        "starting_songs": [
-            "prelude"
-        ],
-        "add_random_starting_items": 0,
-        "start_with_consumables": true,
-        "start_with_rupees": true,
-        "starting_hearts": 3,
-        "skip_reward_from_rauru": true,
-        "no_escape_sequence": true,
-        "no_guard_stealth": true,
-        "no_epona_race": true,
-        "skip_some_minigame_phases": true,
-        "complete_mask_quest": false,
-        "useful_cutscenes": false,
-        "fast_chests": true,
-        "scarecrow_behavior": "vanilla",
-        "fast_bunny_hood": true,
-        "auto_equip_masks": false,
-        "plant_beans": true,
-        "easier_fire_arrow_entry": false,
-        "fae_torch_count": 3,
-        "ruto_already_f1_jabu": true,
-        "fast_shadow_boat": false,
-        "chicken_count_random": false,
-        "chicken_count": 3,
-        "big_poe_count_random": false,
-        "big_poe_count": 1,
-        "clearer_hints": true,
-        "hints": "always",
-        "hint_dist": "league",
-        "item_hints": [],
-        "hint_dist_user": {},
-        "plandomized_locations": {},
-        "misc_hints": [
-            "altar",
-            "ganondorf",
-            "warp_songs_and_owls",
-            "30_skulltulas",
-            "40_skulltulas",
-            "50_skulltulas"
-        ],
-        "correct_chest_appearances": "both",
-        "chest_textures_specific": [
-            "major",
-            "bosskeys",
-            "keys",
-            "tokens",
-            "hearts"
-        ],
-        "soa_unlocks_chest_texture": false,
-        "minor_items_as_major_chest": [],
-        "invisible_chests": false,
-        "correct_potcrate_appearances": "textures_content",
-        "key_appearance_match_dungeon": false,
-        "potcrate_textures_specific": [
-            "major",
-            "bosskeys",
-            "keys",
-            "tokens",
-            "hearts"
-        ],
-        "soa_unlocks_potcrate_texture": false,
-        "ocarina_songs": [],
-        "text_shuffle": "none",
-        "damage_multiplier": "normal",
-        "deadly_bonks": "none",
-        "starting_tod": "default",
-        "blue_fire_arrows": true,
-        "fix_broken_drops": false,
-        "tcg_requires_lens": false,
-        "no_collectible_hearts": false,
-        "one_item_per_dungeon": false,
-        "item_pool_value": "balanced",
-        "junk_ice_traps": "off",
-        "custom_ice_trap_percent": 50,
-        "custom_ice_trap_count": 100,
-        "ice_trap_appearance": "junk_only"
-    },
->>>>>>> 3eab7acf (Move new data into auto-tracker context)
     "Co-Op Tournament Season 3": {
         "aliases": [
             "co-op",