Merge 'add no logic weekly preset' (#2245)

Author: fenhl

README.md

@@ -119,6 +119,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * The `Links Pocket` location is renamed to `ToT Reward from Rauru`, and a new setting has been added that controls whether it is skipped.
 * New option `Specific Rewards` for the `Pre-completed Dungeons Mode` setting, allowing the user to set dungeons to be precompleted depending on which medallion or stone they have. Not compatible with shuffled dungeon rewards.
 * New settings to `Include Empty Pots` and `Include Empty Crates` when pots and crates are shuffled respectively.
+* New settings preset for the No Logic Weekly.
 
 #### Other New Features
 * A text box has been added when completing the adult shooting gallery without a bow to warn the player that they haven't received the real reward.

data/presets_default.json

@@ -2206,5 +2206,195 @@
             "Eyedrops",
             "Claim Check"
         ]
+    },
+    "No Logic Weekly": {
+        "aliases": [
+            "no_logic",
+            "nl"
+        ],
+        "show_seed_info": true,
+        "user_message": "No Logic Weekly",
+        "world_count": 1,
+        "create_spoiler": true,
+        "randomize_settings": false,
+        "logic_rules": "none",
+        "reachable_locations": "all",
+        "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": "dungeons",
+        "bridge_medallions": 6,
+        "bridge_stones": 3,
+        "bridge_rewards": 4,
+        "bridge_tokens": 100,
+        "bridge_hearts": 20,
+        "trials_random": false,
+        "trials": 0,
+        "shuffle_ganon_bosskey": "dungeons",
+        "ganon_bosskey_medallions": 6,
+        "ganon_bosskey_stones": 3,
+        "ganon_bosskey_rewards": 7,
+        "ganon_bosskey_tokens": 100,
+        "ganon_bosskey_hearts": 20,
+        "shuffle_dungeon_rewards": "reward",
+        "shuffle_bosskeys": "regional",
+        "shuffle_smallkeys": "keysanity",
+        "shuffle_hideoutkeys": "keysanity",
+        "shuffle_tcgkeys": "vanilla",
+        "key_rings_choice": "off",
+        "key_rings": [],
+        "keyring_give_bk": false,
+        "shuffle_silver_rupees": "vanilla",
+        "silver_rupee_pouches_choice": "off",
+        "silver_rupee_pouches": [],
+        "shuffle_mapcompass": "startwith",
+        "enhance_map_compass": false,
+        "open_forest": "open",
+        "open_kakariko": "open",
+        "open_door_of_time": true,
+        "zora_fountain": "open",
+        "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_grotto_entrances": false,
+        "shuffle_dungeon_entrances": "all",
+        "shuffle_bosses": "off",
+        "shuffle_overworld_entrances": false,
+        "shuffle_gerudo_valley_river_exit": false,
+        "owl_drops": false,
+        "warp_songs": false,
+        "spawn_positions": [],
+        "free_bombchu_drops": true,
+        "one_item_per_dungeon": false,
+        "shuffle_song_items": "any",
+        "shopsanity": "4",
+        "shopsanity_prices": "random",
+        "tokensanity": "off",
+        "shuffle_scrubs": "low",
+        "shuffle_child_trade": [],
+        "shuffle_freestanding_items": "off",
+        "shuffle_pots": "off",
+        "shuffle_empty_pots": false,
+        "shuffle_crates": "off",
+        "shuffle_empty_crates": false,
+        "shuffle_cows": true,
+        "shuffle_beehives": false,
+        "shuffle_wonderitems": false,
+        "shuffle_kokiri_sword": true,
+        "shuffle_ocarinas": true,
+        "shuffle_gerudo_card": true,
+        "shuffle_beans": true,
+        "shuffle_expensive_merchants": true,
+        "shuffle_frog_song_rupees": true,
+        "shuffle_individual_ocarina_notes": false,
+        "shuffle_loach_reward": "off",
+        "logic_no_night_tokens_without_suns_song": false,
+        "disabled_locations": [],
+        "allowed_tricks": [],
+        "starting_equipment": [],
+        "starting_songs": [],
+        "starting_inventory": [
+            "zeldas_letter"
+        ],
+        "start_with_consumables": false,
+        "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": true,
+        "useful_cutscenes": true,
+        "fast_chests": true,
+        "free_scarecrow": false,
+        "fast_bunny_hood": false,
+        "auto_equip_masks": false,
+        "plant_beans": false,
+        "chicken_count_random": true,
+        "chicken_count": 2,
+        "big_poe_count_random": false,
+        "big_poe_count": 1,
+        "easier_fire_arrow_entry": false,
+        "fae_torch_count": 2,
+        "ruto_already_f1_jabu": false,
+        "ocarina_songs": "off",
+        "correct_chest_appearances": "textures",
+        "chest_textures_specific": [
+            "major",
+            "bosskeys",
+            "keys",
+            "tokens",
+            "hearts"
+        ],
+        "soa_unlocks_chest_texture": false,
+        "minor_items_as_major_chest": [
+            "bombchus",
+            "shields",
+            "capacity"
+        ],
+        "invisible_chests": false,
+        "correct_potcrate_appearances": "textures_unchecked",
+        "potcrate_textures_specific": [
+            "major",
+            "bosskeys",
+            "keys",
+            "tokens",
+            "hearts"
+        ],
+        "soa_unlocks_potcrate_texture": false,
+        "key_appearance_match_dungeon": true,
+        "clearer_hints": true,
+        "hints": "always",
+        "hint_dist": "very_strong_magic",
+        "item_hints": [],
+        "hint_dist_user": {},
+        "misc_hints": [
+            "altar",
+            "dampe_diary",
+            "ganondorf",
+            "warp_songs_and_owls",
+            "10_skulltulas",
+            "20_skulltulas",
+            "30_skulltulas",
+            "40_skulltulas",
+            "50_skulltulas",
+            "frogs2",
+            "mask_shop",
+            "unique_merchants"
+        ],
+        "text_shuffle": "none",
+        "damage_multiplier": "normal",
+        "deadly_bonks": "none",
+        "no_collectible_hearts": false,
+        "starting_tod": "default",
+        "blue_fire_arrows": true,
+        "fix_broken_drops": false,
+        "item_pool_value": "balanced",
+        "junk_ice_traps": "normal",
+        "ice_trap_appearance": "junk_only",
+        "adult_trade_shuffle": false,
+        "adult_trade_start": [
+            "Prescription",
+            "Eyeball Frog",
+            "Eyedrops",
+            "Claim Check"
+        ]
     }
 }

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.1.54'
+__version__ = '8.1.55'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0