Apply feedback from native French speakers

* Replace all usages of player settings

* Fixed line break error

* Attempt to fix line break again

* Finally figure out what Pycharm did to this file

* Pycharm search failed me

* Remove duplicate s

* Update ArchipIdle

* Revert random newline changes from Pycharm

* Remove player settings from fstrings and rename --samesettings to --sameoptions

* Finally get PyCharm to not auto-format my commits, randomly inserting the newlines

* Removing player-settings

* Missed one

* Remove final line break error
Co-authored-by: Exempt-Medic <60412657+exempt-medic@users.noreply.github.com>

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com>

Generate.py

@@ -35,8 +35,8 @@ def mystery_argparse():
 
     parser = argparse.ArgumentParser(description="CMD Generation Interface, defaults come from host.yaml.")
     parser.add_argument('--weights_file_path', default=defaults.weights_file_path,
-                        help='Path to the weights file to use for rolling game settings, urls are also valid')
-    parser.add_argument('--samesettings', help='Rolls settings per weights file rather than per player',
+                        help='Path to the weights file to use for rolling game options, urls are also valid')
+    parser.add_argument('--sameoptions', help='Rolls options per weights file rather than per player',
                         action='store_true')
     parser.add_argument('--player_files_path', default=defaults.player_files_path,
                         help="Input directory for player files.")
@@ -104,8 +104,8 @@ def main(args=None, callback=ERmain):
             del(meta_weights["meta_description"])
         except Exception as e:
             raise ValueError("No meta description found for meta.yaml. Unable to verify.") from e
-        if args.samesettings:
-            raise Exception("Cannot mix --samesettings with --meta")
+        if args.sameoptions:
+            raise Exception("Cannot mix --sameoptions with --meta")
     else:
         meta_weights = None
     player_id = 1
@@ -157,7 +157,7 @@ def main(args=None, callback=ERmain):
     erargs.skip_output = args.skip_output
 
     settings_cache: Dict[str, Tuple[argparse.Namespace, ...]] = \
-        {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.samesettings else None)
+        {fname: (tuple(roll_settings(yaml, args.plando) for yaml in yamls) if args.sameoptions else None)
          for fname, yamls in weights_cache.items()}
 
     if meta_weights:

WebHostLib/autolauncher.py

@@ -6,6 +6,7 @@ import multiprocessing
 import threading
 import time
 import typing
+from uuid import UUID
 from datetime import timedelta, datetime
 
 from pony.orm import db_session, select, commit
@@ -62,6 +63,16 @@ def autohost(config: dict):
     def keep_running():
         try:
             with Locker("autohost"):
+                # delete unowned user-content
+                with db_session:
+                    # >>> bool(uuid.UUID(int=0))
+                    # True
+                    rooms = Room.select(lambda room: room.owner == UUID(int=0)).delete(bulk=True)
+                    seeds = Seed.select(lambda seed: seed.owner == UUID(int=0) and not seed.rooms).delete(bulk=True)
+                    slots = Slot.select(lambda slot: not slot.seed).delete(bulk=True)
+                    # Command gets deleted by ponyorm Cascade Delete, as Room is Required
+                if rooms or seeds or slots:
+                    logging.info(f"{rooms} Rooms, {seeds} Seeds and {slots} Slots have been deleted.")
                 run_guardian()
                 while 1:
                     time.sleep(0.1)
@@ -191,6 +202,6 @@ def run_guardian():
             guardian = threading.Thread(name="Guardian", target=guard)
 
 
-from .models import Room, Generation, STATE_QUEUED, STATE_STARTED, STATE_ERROR, db, Seed
+from .models import Room, Generation, STATE_QUEUED, STATE_STARTED, STATE_ERROR, db, Seed, Slot
 from .customserver import run_server_process, get_static_server_data
 from .generate import gen_game

WebHostLib/misc.py

@@ -49,12 +49,6 @@ def weighted_options():
     return render_template("weighted-options.html")
 
 
-# TODO for back compat. remove around 0.4.5
-@app.route("/games/<string:game>/player-settings")
-def player_settings(game: str):
-    return redirect(url_for("player_options", game=game), 301)
-
-
 # Player options pages
 @app.route("/games/<string:game>/player-options")
 @cache.cached()

WebHostLib/templates/userContent.html

@@ -25,6 +25,7 @@
                             <th class="center">Players</th>
                             <th>Created (UTC)</th>
                             <th>Last Activity (UTC)</th>
+                            <th>Mark for deletion</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -35,6 +36,7 @@
                                 <td>{{ room.seed.slots|length }}</td>
                                 <td>{{ room.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
                                 <td>{{ room.last_activity.strftime("%Y-%m-%d %H:%M") }}</td>
+                                <td><a href="{{ url_for("disown_room", room=room.id) }}">Delete next maintenance.</td>
                             </tr>
                         {% endfor %}
                     </tbody>
@@ -51,6 +53,7 @@
                             <th>Seed</th>
                             <th class="center">Players</th>
                             <th>Created (UTC)</th>
+                            <th>Mark for deletion</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -60,6 +63,7 @@
                                 <td>{% if seed.multidata %}{{ seed.slots|length }}{% else %}1{% endif %}
                                 </td>
                                 <td>{{ seed.creation_time.strftime("%Y-%m-%d %H:%M") }}</td>
+                                <td><a href="{{ url_for("disown_seed", seed=seed.id) }}">Delete next maintenance.</td>
                             </tr>
                         {% endfor %}
                     </tbody>

WebHostLib/upload.py

@@ -7,7 +7,7 @@ import zipfile
 import zlib
 
 from io import BytesIO
-from flask import request, flash, redirect, url_for, session, render_template
+from flask import request, flash, redirect, url_for, session, render_template, abort
 from markupsafe import Markup
 from pony.orm import commit, flush, select, rollback
 from pony.orm.core import TransactionIntegrityError
@@ -219,3 +219,29 @@ def user_content():
     rooms = select(room for room in Room if room.owner == session["_id"])
     seeds = select(seed for seed in Seed if seed.owner == session["_id"])
     return render_template("userContent.html", rooms=rooms, seeds=seeds)
+
+
+@app.route("/disown_seed/<suuid:seed>", methods=["GET"])
+def disown_seed(seed):
+    seed = Seed.get(id=seed)
+    if not seed:
+        return abort(404)
+    if seed.owner !=  session["_id"]:
+        return abort(403)
+    
+    seed.owner = 0
+
+    return redirect(url_for("user_content"))
+
+
+@app.route("/disown_room/<suuid:room>", methods=["GET"])
+def disown_room(room):
+    room = Room.get(id=room)
+    if not room:
+        return abort(404)
+    if room.owner != session["_id"]:
+        return abort(403)
+
+    room.owner = 0
+
+    return redirect(url_for("user_content"))

docs/settings api.md

@@ -1,7 +1,7 @@
 # Archipelago Settings API
 
 The settings API describes how to use installation-wide config and let the user configure them, like paths, etc. using
-host.yaml. For the player settings / player yamls see [options api.md](options api.md).
+host.yaml. For the player options / player yamls see [options api.md](options api.md).
 
 The settings API replaces `Utils.get_options()` and `Utils.get_default_options()`
 as well as the predefined `host.yaml` in the repository.

playerSettings.yaml

@@ -1,591 +0,0 @@
-# What is this file?
-# This file contains options which allow you to configure your multiworld experience while allowing others
-# to play how they want as well.
-
-# How do I use it?
-# The options in this file are weighted. This means the higher number you assign to a value, the more
-# chances you have for that option to be chosen. For example, an option like this:
-#
-# map_shuffle:
-#   on: 5
-#   off: 15
-#
-# Means you have 5 chances for map shuffle to occur, and 15 chances for map shuffle to be turned off
-
-# I've never seen a file like this before. What characters am I allowed to use?
-# This is a .yaml file. You are allowed to use most characters.
-# To test if your yaml is valid or not, you can use this website:
-# http://www.yamllint.com/
-
-description: Template Name # Used to describe your yaml. Useful if you have multiple files
-name: YourName{number} # Your name in-game. Spaces will be replaced with underscores and there is a 16 character limit
-#{player} will be replaced with the player's slot number.
-#{PLAYER} will be replaced with the player's slot number if that slot number is greater than 1.
-#{number} will be replaced with the counter value of the name.
-#{NUMBER} will be replaced with the counter value of the name if the counter value is greater than 1.
-game: # Pick a game to play
-  A Link to the Past: 1
-requires:
-  version: 0.4.4 # Version of Archipelago required for this yaml to work as expected.
-A Link to the Past:
-  progression_balancing:
-    # A system that can move progression earlier, to try and prevent the player from getting stuck and bored early.
-    # A lower setting means more getting stuck. A higher setting means less getting stuck.
-    #
-    # You can define additional values between the minimum and maximum values.
-    # Minimum value is 0
-    # Maximum value is 99
-    random: 0
-    random-low: 0
-    random-high: 0
-    disabled: 0 # equivalent to 0
-    normal: 50 # equivalent to 50
-    extreme: 0 # equivalent to 99
-
-  accessibility:
-    # Set rules for reachability of your items/locations.
-    # Locations: ensure everything can be reached and acquired.
-    # Items: ensure all logically relevant items can be acquired.
-    # Minimal: ensure what is needed to reach your goal can be acquired.
-    locations: 0
-    items: 50
-    minimal: 0
-
-  local_items:
-    # Forces these items to be in their native world.
-    [ ]
-
-  non_local_items:
-    # Forces these items to be outside their native world.
-    [ ]
-
-  start_inventory:
-    # Start with these items.
-    { }
-
-  start_hints:
-    # Start with these item's locations prefilled into the !hint command.
-    [ ]
-
-  start_location_hints:
-    # Start with these locations and their item prefilled into the !hint command
-    [ ]
-
-  exclude_locations:
-    # Prevent these locations from having an important item
-    [ ]
-
-  priority_locations:
-    # Prevent these locations from having an unimportant item
-    [ ]
-
-  item_links:
-    # Share part of your item pool with other players.
-    [ ]
-
-  ### Logic Section ###
-  glitches_required: # Determine the logic required to complete the seed
-    none: 50 # No glitches required
-    minor_glitches: 0 # Puts fake flipper, waterwalk, super bunny shenanigans, and etc into logic
-    overworld_glitches: 0 # Assumes the player has knowledge of both overworld major glitches (boots clips, mirror clips) and minor glitches
-    hybrid_major_glitches: 0 # In addition to overworld glitches, also requires underworld clips between dungeons.
-    no_logic: 0 # Your own items are placed with no regard to any logic; such as your Fire Rod can be on your Trinexx.
-    # Other players items are placed into your world under HMG logic
-  dark_room_logic: # Logic for unlit dark rooms
-    lamp: 50 # require the Lamp for these rooms to be considered accessible.
-    torches: 0 # in addition to lamp, allow the fire rod and presence of easily accessible torches for access
-    none: 0 # all dark rooms are always considered doable, meaning this may force completion of rooms in complete darkness
-  restrict_dungeon_item_on_boss: # aka ambrosia boss items
-    on: 0 # prevents unshuffled compasses, maps and keys to be boss drops, they can still drop keysanity and other players' items
-    off: 50
-  ### End of Logic Section ###
-  bigkey_shuffle: # Big Key Placement
-    original_dungeon: 50
-    own_dungeons: 0
-    own_world: 0
-    any_world: 0
-    different_world: 0
-    start_with: 0
-  smallkey_shuffle: # Small Key Placement
-    original_dungeon: 50
-    own_dungeons: 0
-    own_world: 0
-    any_world: 0
-    different_world: 0
-    universal: 0
-    start_with: 0
-  key_drop_shuffle: # Shuffle keys found in pots or dropped from killed enemies
-    off: 50
-    on: 0
-  compass_shuffle: # Compass Placement
-    original_dungeon: 50
-    own_dungeons: 0
-    own_world: 0
-    any_world: 0
-    different_world: 0
-    start_with: 0
-  map_shuffle: # Map Placement
-    original_dungeon: 50
-    own_dungeons: 0
-    own_world: 0
-    any_world: 0
-    different_world: 0
-    start_with: 0
-  dungeon_counters:
-    on: 0 # Always display amount of items checked in a dungeon
-    pickup: 50 # Show when compass is picked up
-    default: 0 # Show when compass is picked up if the compass itself is shuffled
-    off: 0 # Never show item count in dungeons
-  progressive: # Enable or disable progressive items (swords, shields, bow)
-    on: 50 # All items are progressive
-    off: 0 # No items are progressive
-    grouped_random: 0 # Randomly decides for all items. Swords could be progressive, shields might not be
-  entrance_shuffle:
-    none: 50 # Vanilla game map. All entrances and exits lead to their original locations. You probably want this option
-    dungeonssimple: 0 # Shuffle just dungeons amongst each other, swapping dungeons entirely, so Hyrule Castle is always 1 dungeon
-    dungeonsfull: 0 # Shuffle any dungeon entrance with any dungeon interior, so Hyrule Castle can be 4 different dungeons, but keep dungeons to a specific world
-    dungeonscrossed: 0 # like dungeonsfull, but allow cross-world traversal through a dungeon. Warning: May force repeated dungeon traversal
-    simple: 0 # Entrances are grouped together before being randomized. Simple uses the most strict grouping rules
-    restricted: 0 # Less strict than simple
-    full: 0 # Less strict than restricted
-    crossed: 0 # Less strict than full
-    insanity: 0 # Very few grouping rules. Good luck
-    # you can also define entrance shuffle seed, like so:
-    crossed-1000: 0 # using this method, you can have the same layout as another player and share entrance information
-    # however, many other settings like logic, world state, retro etc. may affect the shuffle result as well.
-    crossed-group-myfriends: 0 # using this method, everyone with "group-myfriends" will share the same seed
-  goals:
-    ganon: 50 # Climb GT, defeat Agahnim 2, and then kill Ganon
-    crystals: 0 # Only killing Ganon is required. However, items may still be placed in GT
-    bosses: 0 # Defeat the boss of all dungeons, including Agahnim's tower and GT (Aga 2)
-    pedestal: 0 # Pull the Triforce from the Master Sword pedestal
-    ganon_pedestal: 0 # Pull the Master Sword pedestal, then kill Ganon
-    triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout the worlds, then turn them in to Murahadala in front of Hyrule Castle
-    local_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout your world, then turn them in to Murahadala in front of Hyrule Castle
-    ganon_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout the worlds, then kill Ganon
-    local_ganon_triforce_hunt: 0 # Collect 20 of 30 Triforce pieces spread throughout your world, then kill Ganon
-    ice_rod_hunt: 0 # You start with everything needed to 216 the seed. Find the Ice rod, then kill Trinexx at Turtle rock.
-  open_pyramid:
-    goal: 50 # Opens the pyramid if the goal requires you to kill Ganon, unless the goal is Slow Ganon or All Dungeons
-    auto: 0 # Same as Goal, but also is closed if holes are shuffled and ganon is part of the shuffle pool
-    open: 0 # Pyramid hole is always open. Ganon's vulnerable condition is still required before he can he hurt
-    closed: 0 # Pyramid hole is always closed until you defeat Agahnim atop Ganon's Tower
-  triforce_pieces_mode: #Determine how to calculate the extra available triforce pieces.
-    extra: 0 # available = triforce_pieces_extra + triforce_pieces_required
-    percentage: 0 # available = (triforce_pieces_percentage /100) * triforce_pieces_required
-    available: 50 # available = triforce_pieces_available
-  triforce_pieces_extra: # Set to how many extra triforces pieces are available to collect in the world.
-    # Format "pieces: chance"
-    0: 0
-    5: 50
-    10: 50
-    15: 0
-    20: 0
-  triforce_pieces_percentage: # Set to how many triforce pieces according to a percentage of the required ones, are available to collect in the world.
-    # Format "pieces: chance"
-    100: 0 #No extra
-    150: 50 #Half the required will be added as extra
-    200: 0 #There are the double of the required ones available.
-  triforce_pieces_available: # Set to how many triforces pieces are available to collect in the world. Default is 30. Max is 90, Min is 1
-    # Format "pieces: chance"
-    25: 0
-    30: 50
-    40: 0
-    50: 0
-  triforce_pieces_required: # Set to how many out of X triforce pieces you need to win the game in a triforce hunt. Default is 20. Max is 90, Min is 1
-    # Format "pieces: chance"
-    15: 0
-    20: 50
-    30: 0
-    40: 0
-    50: 0
-  crystals_needed_for_gt: # Crystals required to open GT
-    0: 0
-    7: 50
-    random: 0
-    random-low: 0 # any valid number, weighted towards the lower end
-    random-middle: 0 # any valid number, weighted towards the central range
-    random-high: 0 # any valid number, weighted towards the higher end
-  crystals_needed_for_ganon: # Crystals required to hurt Ganon
-    0: 0
-    7: 50
-    random: 0
-    random-low: 0
-    random-middle: 0
-    random-high: 0
-  mode:
-    standard: 0 # Begin the game by rescuing Zelda from her cell and escorting her to the Sanctuary
-    open: 50 # Begin the game from your choice of Link's House or the Sanctuary
-    inverted: 0 # Begin in the Dark World. The Moon Pearl is required to avoid bunny-state in Light World, and the Light World game map is altered
-  retro_bow:
-    on: 0 # Zelda-1 like mode. You have to purchase a quiver to shoot arrows using rupees.
-    off: 50
-  retro_caves:
-    on: 0 # Zelda-1 like mode. There are randomly placed take-any caves that contain one Sword and choices of Heart Container/Blue Potion.
-    off: 50
-  hints: # On/Full: Put item and entrance placement hints on telepathic tiles and some NPCs, Full removes joke hints.
-    'on': 50
-    'off': 0
-    full: 0
-  scams: # If on, these Merchants will no longer tell you what they're selling.
-    'off': 50
-    'king_zora': 0
-    'bottle_merchant': 0
-    'all': 0
-  swordless:
-    on: 0 # Your swords are replaced by rupees. Gameplay changes have been made to accommodate this change
-    off: 1
-  item_pool:
-    easy: 0 # Doubled upgrades, progressives, and etc
-    normal: 50 # Item availability remains unchanged from vanilla game
-    hard: 0 # Reduced upgrade availability (max: 14 hearts, blue mail, tempered sword, fire shield, no silvers unless swordless)
-    expert: 0 # Minimum upgrade availability (max: 8 hearts, green mail, master sword, fighter shield, no silvers unless swordless)
-  item_functionality:
-    easy: 0 # Allow Hammer to damage ganon, Allow Hammer tablet collection, Allow swordless medallion use everywhere.
-    normal: 50 # Vanilla item functionality
-    hard: 0 # Reduced helpfulness of items (potions less effective, can't catch faeries, cape uses double magic, byrna does not grant invulnerability, boomerangs do not stun, silvers disabled outside ganon)
-    expert: 0 # Vastly reduces the helpfulness of items (potions barely effective, can't catch faeries, cape uses double magic, byrna does not grant invulnerability, boomerangs and hookshot do not stun, silvers disabled outside ganon)
-  tile_shuffle: # Randomize the tile layouts in flying tile rooms
-    on: 0
-    off: 50
-  misery_mire_medallion: # required medallion to open Misery Mire front entrance
-    random: 50
-    Ether: 0
-    Bombos: 0
-    Quake: 0
-  turtle_rock_medallion: # required medallion to open Turtle Rock front entrance
-    random: 50
-    Ether: 0
-    Bombos: 0
-    Quake: 0
-  ### Enemizer Section ###
-  boss_shuffle:
-    none: 50 # Vanilla bosses
-    basic: 0 # Existing bosses except Ganon and Agahnim are shuffled throughout dungeons
-    full: 0 # 3 bosses can occur twice
-    chaos: 0 # Any boss can appear any amount of times
-    singularity: 0 # Picks a boss, tries to put it everywhere that works, if there's spaces remaining it picks a boss to fill those
-  enemy_shuffle: # Randomize enemy placement
-    on: 0
-    off: 50
-  killable_thieves: # Make thieves killable
-    on: 0 # Usually turned on together with enemy_shuffle to make annoying thief placement more manageable
-    off: 50
-  bush_shuffle: # Randomize the chance that bushes have enemies and the enemies under said bush
-    on: 0
-    off: 50
-  enemy_damage:
-    default: 50 # Vanilla enemy damage
-    shuffled: 0 # Enemies deal 0 to 4 hearts and armor helps
-    chaos: 0 # Enemies deal 0 to 8 hearts and armor just reshuffles the damage
-  enemy_health:
-    default: 50 # Vanilla enemy HP
-    easy: 0 # Enemies have reduced health
-    hard: 0 # Enemies have increased health
-    expert: 0 # Enemies have greatly increased health
-  pot_shuffle:
-    'on': 0 # Keys, items, and buttons hidden under pots in dungeons are shuffled with other pots in their supertile
-    'off': 50 # Default pot item locations
-  ### End of Enemizer Section ###
-  ### Beemizer ###
-  # can add weights for any whole number between 0 and 100
-  beemizer_total_chance: # Remove items from the global item pool and replace them with single bees (fill bottles) and bee traps
-    0: 50   # No junk fill items are replaced (Beemizer is off)
-    25: 0   # 25% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
-    50: 0   # 50% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
-    75: 0   # 75% chance for each junk fill item (rupees, bombs and arrows) to be replaced with bees
-    100: 0  # All junk fill items (rupees, bombs and arrows) are replaced with bees
-  beemizer_trap_chance:
-    60: 50  # 60% chance for each beemizer replacement to be a trap, 40% chance to be a single bee
-    70: 0   # 70% chance for each beemizer replacement to be a trap, 30% chance to be a single bee
-    80: 0   # 80% chance for each beemizer replacement to be a trap, 20% chance to be a single bee
-    90: 0   # 90% chance for each beemizer replacement to be a trap, 10% chance to be a single bee
-    100: 0  # All beemizer replacements are traps
-  ### Shop Settings ###
-  shop_item_slots: # Maximum amount of shop slots to be filled with regular item pool items (such as Moon Pearl)
-    0: 50
-    5: 0
-    15: 0
-    30: 0
-    random: 0 # 0 to 30 evenly distributed
-  shop_price_modifier: # Percentage modifier for shuffled item prices in shops
-    # you can add additional values between minimum and maximum
-    0: 0 # minimum value
-    400: 0 # maximum value
-    random: 0
-    random-low: 0
-    random-high: 0
-    100: 50
-  shop_shuffle:
-    none: 50
-    g: 0 # Generate new default inventories for overworld/underworld shops, and unique shops
-    f: 0 # Generate new default inventories for every shop independently
-    i: 0 # Shuffle default inventories of the shops around
-    p: 0 # Randomize the prices of the items in shop inventories
-    u: 0 # Shuffle capacity upgrades into the item pool (and allow them to traverse the multiworld)
-    w: 0 # Consider witch's hut like any other shop and shuffle/randomize it too
-    P: 0 # Prices of the items in shop inventories cost hearts, arrow, or bombs instead of rupees
-    ip: 0 # Shuffle inventories and randomize prices
-    fpu: 0 # Generate new inventories, randomize prices and shuffle capacity upgrades into item pool
-    uip: 0 # Shuffle inventories, randomize prices and shuffle capacity upgrades into the item pool
-    # You can add more combos
-  ### End of Shop Section ###
-  shuffle_prizes: # aka drops
-    none: 0 # do not shuffle prize packs
-    g: 50 # shuffle "general" prize packs, as in enemy, tree pull, dig etc.
-    b: 0 # shuffle "bonk" prize packs
-    bg: 0 # shuffle both
-  timer:
-    none: 50 # No timer will be displayed.
-    timed: 0 # Starts with clock at zero. Green clocks subtract 4 minutes (total 20). Blue clocks subtract 2 minutes (total 10). Red clocks add two minutes (total 10). Winner is the player with the lowest time at the end.
-    timed_ohko: 0 # Starts the clock at ten minutes. Green clocks add five minutes (total 25). As long as the clock as at zero, Link will die in one hit.
-    ohko: 0 # Timer always at zero. Permanent OHKO.
-    timed_countdown: 0 # Starts the clock with forty minutes. Same clocks as timed mode, but if the clock hits zero you lose. You can still keep playing, though.
-    display: 0 # Displays a timer, but otherwise does not affect gameplay or the item pool.
-  countdown_start_time: # For timed_ohko and timed_countdown timer modes, the amount of time in minutes to start with
-    0: 0 # For timed_ohko, starts in OHKO mode when starting the game
-    10: 50
-    20: 0
-    30: 0
-    60: 0
-  red_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a red clock
-    -2: 50
-    1: 0
-  blue_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a blue clock
-    1: 0
-    2: 50
-  green_clock_time: # For all timer modes, the amount of time in minutes to gain or lose when picking up a green clock
-    4: 50
-    10: 0
-    15: 0
-  glitch_boots:
-    on: 50 # Start with Pegasus Boots in any glitched logic mode that makes use of them
-    off: 0
-  # rom options section
-  random_sprite_on_event: # An alternative to specifying randomonhit / randomonexit / etc... in sprite down below.
-    enabled:  # If enabled, sprite down below is ignored completely, (although it may become the sprite pool)
-      on: 0
-      off: 1
-    on_hit:  # Random sprite on hit. Being hit by things that cause 0 damage still counts.
-      on: 1
-      off: 0
-    on_enter:  # Random sprite on underworld entry. Note that entering hobo counts.
-      on: 0
-      off: 1
-    on_exit:  # Random sprite on underworld exit. Exiting hobo does not count.
-      on: 0
-      off: 1
-    on_slash:  # Random sprite on sword slash. Note, it still counts if you attempt to slash while swordless.
-      on: 0
-      off: 1
-    on_item:  # Random sprite on getting an item.  Anything that causes you to hold an item above your head counts.
-      on: 0
-      off: 1
-    on_bonk:  # Random sprite on bonk.
-      on: 0
-      off: 1
-    on_everything:  # Random sprite on ALL currently implemented events, even if not documented at present time.
-      on: 0
-      off: 1
-    use_weighted_sprite_pool:  # Always on if no sprite_pool exists, otherwise it controls whether to use sprite as a weighted sprite pool
-      on: 0
-      off: 1
-  #sprite_pool: # When specified, limits the pool of sprites used for randomon-event to the specified pool.  Uncomment to use this.
-  #  - link
-  #  - pride link
-  #  - penguin link
-  #  - random  # You can specify random multiple times for however many potentially unique random sprites you want in your pool.
-  sprite: # Enter the name of your preferred sprite and weight it appropriately
-    random: 0
-    randomonhit: 0 # Random sprite on hit
-    randomonenter: 0 # Random sprite on entering the underworld.
-    randomonexit: 0 # Random sprite on exiting the underworld.
-    randomonslash: 0 # Random sprite on sword slashes
-    randomonitem: 0  # Random sprite on getting items.
-    randomonbonk: 0 # Random sprite on bonk.
-    # You can combine these events like this.  randomonhit-enter-exit  if you want it on hit, enter, exit.
-    randomonall: 0 # Random sprite on any and all currently supported events. Refer to above for the supported events.
-    Link: 50 # To add other sprites: open the gui/Creator, go to adjust, select a sprite and write down the name the gui calls it
-  music: # If "off", all in-game music will be disabled
-    on: 50
-    off: 0
-  quickswap: # Enable switching items by pressing the L+R shoulder buttons
-    on: 50
-    off: 0
-  triforcehud: # Disable visibility of the triforce hud unless collecting a piece or speaking to Murahadala
-    normal: 0 # original behavior (always visible)
-    hide_goal: 50 # hide counter until a piece is collected or speaking to Murahadala
-    hide_required: 0 # Always visible, but required amount is invisible until determined by Murahadala
-    hide_both: 0 # Hide both under above circumstances
-  reduceflashing: # Reduces instances of flashing such as lightning attacks, weather, ether and more.
-    on: 50
-    off: 0
-  menuspeed: # Controls how fast the item menu opens and closes
-    normal: 50
-    instant: 0
-    double: 0
-    triple: 0
-    quadruple: 0
-    half: 0
-  heartcolor: # Controls the color of your health hearts
-    red: 50
-    blue: 0
-    green: 0
-    yellow: 0
-    random: 0
-  heartbeep: # Controls the frequency of the low-health beeping
-    double: 0
-    normal: 50
-    half: 0
-    quarter: 0
-    off: 0
-  ow_palettes: # Change the colors of the overworld
-    default: 50 # No changes
-    good: 0 # Shuffle the colors, with harmony in mind
-    blackout: 0 # everything black / blind mode
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
-  uw_palettes: # Change the colors of caves and dungeons
-    default: 50 # No changes
-    good: 0 # Shuffle the colors, with harmony in mind
-    blackout: 0 # everything black / blind mode
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
-  hud_palettes: # Change the colors of the hud
-    default: 50 # No changes
-    good: 0 # Shuffle the colors, with harmony in mind
-    blackout: 0 # everything black / blind mode
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
-  sword_palettes: # Change the colors of swords
-    default: 50 # No changes
-    good: 0 # Shuffle the colors, with harmony in mind
-    blackout: 0 # everything black / blind mode
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
-  shield_palettes: # Change the colors of shields
-    default: 50 # No changes
-    good: 0 # Shuffle the colors, with harmony in mind
-    blackout: 0 # everything black / blind mode
-    grayscale: 0
-    negative: 0
-    classic: 0
-    dizzy: 0
-    sick: 0
-    puke: 0
-
-  # triggers that replace options upon rolling certain options
-  legacy_weapons: # this is not an actual option, just a set of weights to trigger from
-    trigger_disabled: 50
-    randomized: 0 # Swords are placed randomly throughout the world
-    assured: 0 # Begin with a sword, the rest are placed randomly throughout the world
-    vanilla: 0 # Swords are placed in vanilla locations in your own game (Uncle, Pyramid Fairy, Smiths, Pedestal)
-    swordless: 0 # swordless mode
-
-  death_link:
-    false: 50
-    true: 0
-
-  allow_collect: # Allows for !collect / co-op to auto-open chests containing items for other players.
-    #    Off by default, because it currently crashes on real hardware.
-    false: 50
-    true: 0
-
-linked_options:
-  - name: crosskeys
-    options: # These overwrite earlier options if the percentage chance triggers
-      A Link to the Past:
-        entrance_shuffle: crossed
-        bigkey_shuffle: true
-        compass_shuffle: true
-        map_shuffle: true
-        smallkey_shuffle: true
-    percentage: 0 # Set this to the percentage chance you want crosskeys
-  - name: localcrosskeys
-    options: # These overwrite earlier options if the percentage chance triggers
-      A Link to the Past:
-        entrance_shuffle: crossed
-        bigkey_shuffle: true
-        compass_shuffle: true
-        map_shuffle: true
-        smallkey_shuffle: true
-        local_items: # Forces keys to be local to your own world
-          - "Small Keys"
-          - "Big Keys"
-    percentage: 0 # Set this to the percentage chance you want local crosskeys
-  - name: enemizer
-    options:
-      A Link to the Past:
-        boss_shuffle: # Subchances can be injected too, which then get rolled
-          basic: 1
-          full: 1
-          chaos: 1
-          singularity: 1
-        enemy_damage:
-          shuffled: 1
-          chaos: 1
-        enemy_health:
-          easy: 1
-          hard: 1
-          expert: 1
-    percentage: 0 # Set this to the percentage chance you want enemizer
-triggers:
-  # trigger block for legacy weapons mode, to enable these add weights to legacy_weapons
-  - option_name: legacy_weapons
-    option_result: randomized
-    option_category: A Link to the Past
-    options:
-      A Link to the Past:
-        swordless: off
-  - option_name: legacy_weapons
-    option_result: assured
-    option_category: A Link to the Past
-    options:
-      A Link to the Past:
-        swordless: off
-        start_inventory:
-          Progressive Sword: 1
-  - option_name: legacy_weapons
-    option_result: vanilla
-    option_category: A Link to the Past
-    options:
-      A Link to the Past:
-        swordless: off
-        plando_items:
-          - items:
-              Progressive Sword: 4
-            locations:
-              - Master Sword Pedestal
-              - Pyramid Fairy - Left
-              - Blacksmith
-              - Link's Uncle
-  - option_name: legacy_weapons
-    option_result: swordless
-    option_category: A Link to the Past
-    options:
-      A Link to the Past:
-        swordless: on
-  # end of legacy weapons block
-  - option_name: enemy_damage # targets enemy_damage
-    option_category: A Link to the Past
-    option_result: shuffled # if it rolls shuffled
-    percentage: 0 # AND has a 0 percent chance (meaning this is default disabled, just to show how it works)
-    options: # then inserts these options
-      A Link to the Past:
-        swordless: off

settings.py

@@ -1,6 +1,6 @@
 """
 Application settings / host.yaml interface using type hints.
-This is different from player settings.
+This is different from player options.
 """
 
 import os.path

worlds/adventure/docs/setup_en.md

@@ -43,7 +43,7 @@ an experience customized for their taste, and different players in the same mult
 
 You can generate a yaml or download a template by visiting the [Adventure Options Page](/games/Adventure/player-options)
 
-### What are recommended settings to tweak for beginners to the rando?
+### What are recommended options to tweak for beginners to the rando?
 Setting difficulty_switch_a and lowering the dragons' speeds makes the dragons easier to avoid.  Adding Chalice to 
 local_items guarantees you'll visit at least one of the interesting castles, as it can only be placed in a castle or
 the credits room.

worlds/adventure/docs/setup_fr.md

@@ -42,7 +42,7 @@ une expérience personnalisée à leur goût, et différents joueurs dans le mê
 
 ### Où puis-je obtenir un fichier YAML ?
 
-Vous pouvez générer un yaml ou télécharger un modèle en visitant la [page des paramètres d'aventure](/games/Adventure/player-settings)
+Vous pouvez générer un yaml ou télécharger un modèle en visitant la [page des paramètres d'aventure](/games/Adventure/player-options)
 
 ### Quels sont les paramètres recommandés pour s'initier à la rando ?
 Régler la difficulty_switch_a et réduire la vitesse des dragons rend les dragons plus faciles à éviter. Ajouter Calice à
@@ -72,4 +72,4 @@ configuré pour le faire automatiquement.
 Pour connecter le client au multiserveur, mettez simplement `<adresse>:<port>` dans le champ de texte en haut et appuyez sur Entrée (si le
 le serveur utilise un mot de passe, saisissez dans le champ de texte inférieur `/connect <adresse> :<port> [mot de passe]`)
 
-Appuyez sur Réinitialiser et commencez à jouer
+Appuyez sur Réinitialiser et commencez à jouer

worlds/alttp/Rom.py

@@ -4,7 +4,7 @@ import Utils
 import worlds.Files
 
 LTTPJPN10HASH: str = "03a63945398191337e896e5771f77173"
-RANDOMIZERBASEHASH: str = "35d010bc148e0ea0ee68e81e330223f1"
+RANDOMIZERBASEHASH: str = "8704fb9b9fa4fad52d4d2f9a95fb5360"
 ROM_PLAYER_LIMIT: int = 255
 
 import io

worlds/alttp/__init__.py

@@ -345,42 +345,43 @@ class ALTTPWorld(World):
 
     def create_regions(self):
         player = self.player
-        world = self.multiworld
+        multiworld = self.multiworld
 
-        if world.mode[player] != 'inverted':
-            create_regions(world, player)
+        if multiworld.mode[player] != 'inverted':
+            create_regions(multiworld, player)
         else:
-            create_inverted_regions(world, player)
-        create_shops(world, player)
+            create_inverted_regions(multiworld, player)
+        create_shops(multiworld, player)
         self.create_dungeons()
 
-        if world.glitches_required[player] not in ["no_glitches", "minor_glitches"] and world.entrance_shuffle[player] in \
-                {"vanilla", "dungeons_simple", "dungeons_full", "simple", "restricted", "full"}:
-            world.fix_fake_world[player] = False
+        if (multiworld.glitches_required[player] not in ["no_glitches", "minor_glitches"] and
+                multiworld.entrance_shuffle[player] in [
+                    "vanilla", "dungeons_simple", "dungeons_full", "simple", "restricted", "full"]):
+            multiworld.fix_fake_world[player] = False
 
         # seeded entrance shuffle
-        old_random = world.random
-        world.random = random.Random(self.er_seed)
+        old_random = multiworld.random
+        multiworld.random = random.Random(self.er_seed)
 
-        if world.mode[player] != 'inverted':
-            link_entrances(world, player)
-            mark_light_world_regions(world, player)
+        if multiworld.mode[player] != 'inverted':
+            link_entrances(multiworld, player)
+            mark_light_world_regions(multiworld, player)
             for region_name, entrance_name in indirect_connections_not_inverted.items():
-                world.register_indirect_condition(world.get_region(region_name, player),
-                                                  world.get_entrance(entrance_name, player))
+                multiworld.register_indirect_condition(multiworld.get_region(region_name, player),
+                                                  multiworld.get_entrance(entrance_name, player))
         else:
-            link_inverted_entrances(world, player)
-            mark_dark_world_regions(world, player)
+            link_inverted_entrances(multiworld, player)
+            mark_dark_world_regions(multiworld, player)
             for region_name, entrance_name in indirect_connections_inverted.items():
-                world.register_indirect_condition(world.get_region(region_name, player),
-                                                  world.get_entrance(entrance_name, player))
+                multiworld.register_indirect_condition(multiworld.get_region(region_name, player),
+                                                  multiworld.get_entrance(entrance_name, player))
 
-        world.random = old_random
-        plando_connect(world, player)
+        multiworld.random = old_random
+        plando_connect(multiworld, player)
 
         for region_name, entrance_name in indirect_connections.items():
-            world.register_indirect_condition(world.get_region(region_name, player),
-                                              world.get_entrance(entrance_name, player))
+            multiworld.register_indirect_condition(multiworld.get_region(region_name, player),
+                                              multiworld.get_entrance(entrance_name, player))
 
     def collect_item(self, state: CollectionState, item: Item, remove=False):
         item_name = item.name

worlds/alttp/docs/multiworld_de.md

@@ -47,12 +47,12 @@ wählen können!
 
 ### Wo bekomme ich so eine YAML-Datei her?
 
-Die [Player Settings](/games/A Link to the Past/player-settings) Seite auf der Website ermöglicht das einfache Erstellen
+Die [Player Options](/games/A Link to the Past/player-options) Seite auf der Website ermöglicht das einfache Erstellen
 und Herunterladen deiner eigenen `yaml` Datei. Drei verschiedene Voreinstellungen können dort gespeichert werden.
 
 ### Deine YAML-Datei ist gewichtet!
 
-Die **Player Settings** Seite hat eine Menge Optionen, die man per Schieber einstellen kann. Das ermöglicht es,
+Die **Player Options** Seite hat eine Menge Optionen, die man per Schieber einstellen kann. Das ermöglicht es,
 verschiedene Optionen mit unterschiedlichen Wahrscheinlichkeiten in einer Kategorie ausgewürfelt zu werden
 
 Als Beispiel kann man sich die Option "Map Shuffle" als einen Eimer mit Zetteln zur Abstimmung Vorstellen. So kann man

worlds/alttp/docs/multiworld_es.md

@@ -59,7 +59,7 @@ de multiworld puede tener diferentes opciones.
 
 ### Donde puedo obtener un fichero YAML?
 
-La página "[Generate Game](/games/A%20Link%20to%20the%20Past/player-settings)" en el sitio web te permite configurar tu
+La página "[Generate Game](/games/A%20Link%20to%20the%20Past/player-options)" en el sitio web te permite configurar tu
 configuración personal y descargar un fichero "YAML".
 
 ### Configuración YAML avanzada
@@ -86,7 +86,7 @@ Si quieres validar que tu fichero YAML para asegurarte que funciona correctament
 
 ## Generar una partida para un jugador
 
-1. Navega a [la pagina Generate game](/games/A%20Link%20to%20the%20Past/player-settings), configura tus opciones, haz
+1. Navega a [la pagina Generate game](/games/A%20Link%20to%20the%20Past/player-options), configura tus opciones, haz
    click en el boton "Generate game".
 2. Se te redigirá a una pagina "Seed Info", donde puedes descargar tu archivo de parche.
 3. Haz doble click en tu fichero de parche, y el emulador debería ejecutar tu juego automáticamente. Como el Cliente no

worlds/alttp/docs/multiworld_fr.md

@@ -60,7 +60,7 @@ peuvent avoir différentes options.
 
 ### Où est-ce que j'obtiens un fichier YAML ?
 
-La page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-settings) vous permet de configurer vos
+La page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-options) vous permet de configurer vos
 paramètres personnels et de les exporter vers un fichier YAML.
 
 ### Configuration avancée du fichier YAML
@@ -87,7 +87,7 @@ Si vous voulez valider votre fichier YAML pour être sûr qu'il fonctionne, vous
 
 ## Générer une partie pour un joueur
 
-1. Aller sur la page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-settings), configurez vos options,
+1. Aller sur la page [Génération de partie](/games/A%20Link%20to%20the%20Past/player-options), configurez vos options,
    et cliquez sur le bouton "Generate Game".
 2. Il vous sera alors présenté une page d'informations sur la seed, où vous pourrez télécharger votre patch.
 3. Double-cliquez sur le patch et l'émulateur devrait se lancer automatiquement avec la seed. Etant donné que le client
@@ -207,4 +207,4 @@ Le logiciel recommandé pour l'auto-tracking actuellement est
 3. Sélectionnez votre appareil SNES dans la liste déroulante.
 4. Si vous voulez tracquer les petites clés ainsi que les objets des donjons, cochez la case **Race Illegal Tracking**
 5. Cliquez sur le bouton **Start Autotracking**
-6. Fermez la fenêtre "AutoTracker" maintenant, elle n'est plus nécessaire
+6. Fermez la fenêtre "AutoTracker" maintenant, elle n'est plus nécessaire

worlds/archipidle/docs/guide_en.md

@@ -8,5 +8,5 @@
       [ArchipIDLE GitHub Releases Page](https://github.com/ArchipelagoMW/archipidle/releases)
 3. Enter the server address in the `Server Address` field and press enter
 4. Enter your slot name when prompted. This should be the same as the `name` you entered on the
-   setting page above, or the `name` field in your yaml file.
+   options page above, or the `name` field in your yaml file.
 5. Click the "Begin!" button.

worlds/archipidle/docs/guide_fr.md

@@ -1,11 +1,10 @@
 # Guide de configuration d'ArchipIdle
 
 ## Rejoindre une partie MultiWorld
-1. Générez un fichier `.yaml` à partir de la [page des paramètres du lecteur ArchipIDLE](/games/ArchipIDLE/player-settings)
+1. Générez un fichier `.yaml` à partir de la [page des paramètres du lecteur ArchipIDLE](/games/ArchipIDLE/player-options)
 2. Ouvrez le client ArchipIDLE dans votre navigateur Web en :
-     - Accédez au [Client ArchipIDLE](http://idle.multiworld.link)
-     - Téléchargez le client et exécutez-le localement à partir du
-       [Page des versions d'ArchipIDLE GitHub](https://github.com/ArchipelagoMW/archipidle/releases)
+    - Accédez au [Client ArchipIDLE](http://idle.multiworld.link)
+    - Téléchargez le client et exécutez-le localement à partir du [Page des versions d'ArchipIDLE GitHub](https://github.com/ArchipelagoMW/archipidle/releases)
 3. Entrez l'adresse du serveur dans le champ `Server Address` et appuyez sur Entrée
 4. Entrez votre nom d'emplacement lorsque vous y êtes invité. Il doit être le même que le `name` que vous avez saisi sur le
     page de configuration ci-dessus, ou le champ `name` dans votre fichier yaml.

worlds/dark_souls_3/docs/setup_fr.md

@@ -29,5 +29,5 @@ placez-le à la racine du jeu (ex: "SteamLibrary\steamapps\common\DARK SOULS III
 
 ## Où trouver le fichier de configuration ?
 
-La [Page de configuration](/games/Dark%20Souls%20III/player-settings) sur le site vous permez de configurer vos 
+La [Page de configuration](/games/Dark%20Souls%20III/player-options) sur le site vous permez de configurer vos
 paramètres et de les exporter sous la forme d'un fichier.

worlds/dlcquest/docs/fr_DLCQuest.md

@@ -2,7 +2,7 @@
 
 ## Où se trouve la page des paramètres ?
 
-La [page des paramètres du joueur pour ce jeu](../player-settings) contient tous les paramètres dont vous avez besoin pour configurer et exporter le fichier.
+La [page des paramètres du joueur pour ce jeu](../player-options) contient tous les paramètres dont vous avez besoin pour configurer et exporter le fichier.
 
 
 ## Quel est l'effet de la randomisation sur ce jeu ?
@@ -46,4 +46,4 @@ Il y a aussi de nouveaux objets pièges, utilisés comme substituts, basés sur
 Chaque fois qu'un objet est reçu en ligne, une notification apparaît à l'écran pour en informer le joueur.
 Certains objets sont accompagnés d'une animation ou d'une scène qui se déroule immédiatement après leur réception.
 
-Les objets reçus hors ligne ne sont pas accompagnés d'une animation ou d'une scène, et sont simplement activés lors de la connexion.
+Les objets reçus hors ligne ne sont pas accompagnés d'une animation ou d'une scène, et sont simplement activés lors de la connexion.

worlds/dlcquest/docs/setup_fr.md

@@ -18,7 +18,7 @@ Voir le guide d'Archipelago sur la mise en place d'un YAML de base : [Basic Mult
 
 ### Où puis-je obtenir un fichier YAML ?
 
-Vous pouvez personnaliser vos paramètres en visitant la [page des paramètres du joueur DLC Quest] (/games/DLCQuest/player-settings).
+Vous pouvez personnaliser vos paramètres en visitant la [page des paramètres du joueur DLC Quest](/games/DLCQuest/player-options).
 
 ## Rejoindre une partie multi-monde
 
@@ -52,4 +52,4 @@ Vous pouvez personnaliser vos paramètres en visitant la [page des paramètres d
 
 Vous ne pouvez pas envoyer de commandes au serveur ou discuter avec les autres joueurs depuis DLC Quest, car le jeu ne dispose pas d'un moyen approprié pour saisir du texte.
 Vous pouvez suivre l'activité du serveur dans votre console BepInEx, car les messages de chat d'Archipelago y seront affichés.
-Vous devrez utiliser [Archipelago Text Client] (https://github.com/ArchipelagoMW/Archipelago/releases) si vous voulez envoyer des commandes.
+Vous devrez utiliser [Archipelago Text Client] (https://github.com/ArchipelagoMW/Archipelago/releases) si vous voulez envoyer des commandes.

worlds/generic/docs/advanced_settings_en.md

@@ -2,27 +2,28 @@
 This guide covers more the more advanced options available in YAML files. This guide is intended for the user who plans
 to edit their YAML file manually. This guide should take about 10 minutes to read.
 
-If you would like to generate a basic, fully playable YAML without editing a file, then visit the settings page for the
+If you would like to generate a basic, fully playable YAML without editing a file, then visit the options page for the
 game you intend to play. The weighted settings page can also handle most of the advanced settings discussed here.
 
-The settings page can be found on the supported games page, just click the "Settings Page" link under the name of the
-game you would like. 
+The options page can be found on the supported games page, just click the "Options Page" link under the name of the
+game you would like.
+
 * Supported games page: [Archipelago Games List](/games)
 * Weighted settings page: [Archipelago Weighted Settings](/weighted-settings)
 
-Clicking on the "Export Settings" button at the bottom-left will provide you with a pre-filled YAML with your options.
-The player settings page also has a link to download a full template file for that game which will have every option
+Clicking on the "Export Options" button at the bottom-left will provide you with a pre-filled YAML with your options.
+The player options page also has a link to download a full template file for that game which will have every option
 possible for the game including some that don't display correctly on the site.
 
 ## YAML Overview
 
 The Archipelago system generates games using player configuration files as input. These are going to be YAML files and
-each world will have one of these containing their custom settings for the game that world will play.
+each world will have one of these containing their custom options for the game that world will play.
 
 ## YAML Formatting
 
 YAML files are a format of human-readable config files. The basic syntax of a yaml file will have a `root` node and then
-different levels of `nested` nodes that the generator reads in order to determine your settings.
+different levels of `nested` nodes that the generator reads in order to determine your options.
 
 To nest text, the correct syntax is to indent **two spaces over** from its root option. A YAML file can be edited with
 whatever text editor you choose to use though I personally recommend that you use Sublime Text. Sublime text
@@ -53,13 +54,13 @@ so `option_one_setting_one` is guaranteed to occur.
 
 For `nested_option_two`, `option_two_setting_one` will be rolled 14 times and `option_two_setting_two` will be rolled 43
 times against each other. This means `option_two_setting_two` will be more likely to occur, but it isn't guaranteed,
-adding more randomness and "mystery" to your settings. Every configurable setting supports weights.
+adding more randomness and "mystery" to your options. Every configurable setting supports weights.
 
 ## Root Options
 
 Currently, there are only a few options that are root options. Everything else should be nested within one of these root
 options or in some cases nested within other nested options. The only options that should exist in root
-are `description`, `name`, `game`, `requires`, and the name of the games you want settings for.
+are `description`, `name`, `game`, `requires`, and the name of the games you want options for.
 
 * `description` is ignored by the generator and is simply a good way for you to organize if you have multiple files
   using this to detail the intention of the file.
@@ -79,15 +80,15 @@ are `description`, `name`, `game`, `requires`, and the name of the games you wan
 
 * `requires` details different requirements from the generator for the YAML to work as you expect it to. Generally this
   is good for detailing the version of Archipelago this YAML was prepared for as, if it is rolled on an older version,
-  settings may be missing and as such it will not work as expected. If any plando is used in the file then requiring it
+  options may be missing and as such it will not work as expected. If any plando is used in the file then requiring it
   here to ensure it will be used is good practice.
 
 ## Game Options
 
-One of your root settings will be the name of the game you would like to populate with settings. Since it is possible to
+One of your root options will be the name of the game you would like to populate with options. Since it is possible to
 give a weight to any option, it is possible to have one file that can generate a seed for you where you don't know which
 game you'll play. For these cases you'll want to fill the game options for every game that can be rolled by these
-settings. If a game can be rolled it **must** have a settings section even if it is empty.
+settings. If a game can be rolled it **must** have an options section even if it is empty.
 
 ### Universal Game Options
 

worlds/generic/docs/triggers_en.md

@@ -6,7 +6,7 @@ about 5 minutes to read.
 
 ## What are triggers?
 
-Triggers allow you to customize your game settings by allowing you to define one or many options which only occur under
+Triggers allow you to customize your game options by allowing you to define one or many options which only occur under
 specific conditions. These are essentially "if, then" statements for options in your game. A good example of what you
 can do with triggers is the [custom mercenary mode YAML
 ](https://github.com/alwaysintreble/Archipelago-yaml-dump/blob/main/Snippets/Mercenary%20Mode%20Snippet.yaml) that was
@@ -148,4 +148,4 @@ In this example, if the `start_location` option rolls `landing_site`, only a sta
 If `aqueduct` is rolled, a starting hint for Gravity Suit will also be created alongside the hint for Morph Ball.
 
 Note that for lists, items can only be added, not removed or replaced. For dicts, defining a value for a present key will 
-replace that value within the dict.
+replace that value within the dict.

worlds/minecraft/docs/minecraft_fr.md

@@ -16,7 +16,7 @@ guide : [Guide de configuration de base de Multiworld](/tutorial/Archipelago/se
 
 ### Où puis-je obtenir un fichier YAML ?
 
-Vous pouvez personnaliser vos paramètres Minecraft en allant sur la [page des paramètres de joueur](/games/Minecraft/player-settings)
+Vous pouvez personnaliser vos paramètres Minecraft en allant sur la [page des paramètres de joueur](/games/Minecraft/player-options)
 
 ## Rejoindre une partie MultiWorld
 
@@ -71,4 +71,4 @@ les liens suivants sont les versions des logiciels que nous utilisons.
 - [Page des versions du mod Minecraft Archipelago Randomizer] (https://github.com/KonoTyran/Minecraft_AP_Randomizer/releases)
      - **NE PAS INSTALLER CECI SUR VOTRE CLIENT**
 - [Amazon Corretto](https://docs.aws.amazon.com/corretto/)
-     - choisissez la version correspondante et sélectionnez "Téléchargements" sur la gauche
+     - choisissez la version correspondante et sélectionnez "Téléchargements" sur la gauche

worlds/minecraft/docs/minecraft_sv.md

@@ -103,8 +103,6 @@ shuffle_structures:
   off: 0
 ```
 
-För mer detaljer om vad varje inställning gör, kolla standardinställningen `PlayerSettings.yaml` som kommer med
-Archipelago-installationen.
 
 ## Gå med i ett Multivärld-spel
 

worlds/musedash/docs/setup_es.md

@@ -2,7 +2,7 @@
 
 ## Enlaces rápidos
 - [Página Principal](../../../../games/Muse%20Dash/info/en)
-- [Página de Configuraciones](../../../../games/Muse%20Dash/player-settings)
+- [Página de Configuraciones](../../../../games/Muse%20Dash/player-options)
 
 ## Software Requerido
 
@@ -27,7 +27,7 @@
 Si todo fue instalado correctamente, un botón aparecerá en la parte inferior derecha del juego una vez abierto, que te permitirá conectarte al servidor de Archipelago.
 
 ## Generar un juego MultiWorld
-1. Entra a la página de [configuraciones de jugador](/games/Muse%20Dash/player-settings) y configura las opciones del juego a tu gusto.
+1. Entra a la página de [configuraciones de jugador](/games/Muse%20Dash/player-options) y configura las opciones del juego a tu gusto.
 2. Genera tu archivo YAML y úsalo para generar un juego nuevo en el radomizer
   - (Instrucciones sobre como generar un juego en Archipelago disponibles en la [guía web de Archipelago en Inglés](/tutorial/Archipelago/setup/en))
 

worlds/oot/docs/setup_fr.md

@@ -46,7 +46,7 @@ guide : [Guide de configuration de base de Multiworld](/tutorial/Archipelago/set
 
 ### Où puis-je obtenir un fichier de configuration (.yaml) ?
 
-La page Paramètres du lecteur sur le site Web vous permet de configurer vos paramètres personnels et d'exporter un fichier de configuration depuis eux. Page des paramètres du joueur : [Page des paramètres du joueur d'Ocarina of Time](/games/Ocarina%20of%20Time/player-settings)
+La page Paramètres du lecteur sur le site Web vous permet de configurer vos paramètres personnels et d'exporter un fichier de configuration depuis eux. Page des paramètres du joueur : [Page des paramètres du joueur d'Ocarina of Time](/games/Ocarina%20of%20Time/player-options)
 
 ### Vérification de votre fichier de configuration
 
@@ -67,4 +67,4 @@ Une fois le client et l'émulateur démarrés, vous devez les connecter. Accéde
 
 Pour connecter le client au multiserveur, mettez simplement `<adresse>:<port>` dans le champ de texte en haut et appuyez sur Entrée (si le serveur utilise un mot de passe, tapez dans le champ de texte inférieur `/connect <adresse>:<port> [mot de passe]`)
 
-Vous êtes maintenant prêt à commencer votre aventure dans Hyrule.
+Vous êtes maintenant prêt à commencer votre aventure dans Hyrule.

worlds/pokemon_rb/docs/setup_es.md

@@ -51,7 +51,7 @@ opciones.
 
 ### ¿Dónde puedo obtener un archivo YAML?
 
-Puedes generar un archivo YAML or descargar su plantilla en la [página de configuración de jugador de Pokémon Red and Blue](/games/Pokemon%20Red%20and%20Blue/player-settings)
+Puedes generar un archivo YAML or descargar su plantilla en la [página de configuración de jugador de Pokémon Red and Blue](/games/Pokemon%20Red%20and%20Blue/player-options)
 
 Es importante tener en cuenta que la opción `game_version` determina el ROM que será parcheado.
 Tanto el jugador como la persona que genera (si está generando localmente) necesitarán el archivo del ROM

worlds/smz3/Options.py

@@ -25,7 +25,7 @@ class SwordLocation(Choice):
     Randomized - The sword can be placed anywhere.
     Early - The sword will be placed in a location accessible from the start of
     the game.
-    Unce assured - The sword will always be placed on Link's Uncle."""
+    Uncle - The sword will always be placed on Link's Uncle."""
     display_name = "Sword Location"
     option_Randomized = 0
     option_Early = 1
@@ -48,7 +48,7 @@ class MorphLocation(Choice):
     
 class Goal(Choice):
     """This option decides what goal is required to finish the randomizer.
-    Defeat Ganon and Mother Brain - Find the required crystals and boss tokens kill both bosses.
+    Defeat Ganon and Mother Brain - Find the required crystals and boss tokens to kill both bosses.
     Fast Ganon and Defeat Mother Brain - The hole to ganon is open without having to defeat Agahnim in 
                                          Ganon's Tower and Ganon can be defeat as soon you have the required 
                                          crystals to make Ganon vulnerable. For keysanity, this mode also removes 

worlds/stardew_valley/__init__.py

@@ -44,15 +44,25 @@ class StardewWebWorld(WebWorld):
     bug_report_page = "https://github.com/agilbert1412/StardewArchipelago/issues/new?labels=bug&title=%5BBug%5D%3A+Brief+Description+of+bug+here"
     options_presets = sv_options_presets
 
-    tutorials = [
-        Tutorial(
-            "Multiworld Setup Guide",
-            "A guide to playing Stardew Valley with Archipelago.",
-            "English",
-            "setup_en.md",
-            "setup/en",
-            ["KaitoKid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"]
-        )]
+    setup_en = Tutorial(
+        "Multiworld Setup Guide",
+        "A guide to playing Stardew Valley with Archipelago.",
+        "English",
+        "setup_en.md",
+        "setup/en",
+        ["KaitoKid", "Jouramie", "Witchybun (Mod Support)", "Exempt-Medic (Proofreading)"]
+    )
+
+    setup_fr = Tutorial(
+        setup_en.tutorial_name,
+        setup_en.description,
+        "Français",
+        "setup_fr.md",
+        "setup/fr",
+        ["Firzohche"]
+    )
+
+    tutorials = [setup_en, setup_fr]
 
 
 class StardewValleyWorld(World):

worlds/stardew_valley/docs/setup_fr.md

@@ -0,0 +1,86 @@
+# Guide d'installation de Stardew Valley Randomizer
+
+## Logiciels requis
+
+- Stardew Valley sur PC (Recommandée: [Version Steam](https://store.steampowered.com/app/413150/Stardew_Valley/))
+- SMAPI ([Chargeur de mods pour Stardew Valley](https://smapi.io/))
+- [Version 5.x.x du mod StardewArchipelago](https://github.com/agilbert1412/StardewArchipelago/releases)
+    - Il est important d'utiliser une version 5.x.x du mod pour jouer à des "seeds" qui y ont été générées. Les versions les plus récentes ne peuvent être utilisées qu'avec les versions les plus récentes du générateur de monde, qui ne sont pas encore supportées par archiepalgo.gg.
+
+## Logiciels facultatifs
+- Archipelago via la [page des versions Archipelago](https://github.com/ArchipelagoMW/Archipelago/releases)
+    - (Uniquement pour le textclient)
+- Autres mods de Stardew Valley depuis [Nexus Mods](https://www.nexusmods.com/stardewvalley)
+    - Il y a des [mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md) que vous pouvez ajouter à votre dossier YAML pour les inclure avec la randomisation de Archipelago.
+
+    - Il n'est cependant **pas** recommandé d'ajouter des mods non supportés, même s'il est possible de le faire. Les intéractions entre les mods peuvent être imprévisibles, et aucune assistance ne sera proposée si des problèmes surviennent.
+    - Plus vous avez de mods non supportés, et plus ils sont lourds, plus vous avez de chance de causer des problèmes.
+
+## Configurer votre dossier YAML
+
+### Qu'est-ce qu'un dossier YAML et pourquoi il m'en faut un ?
+
+Voir le guide pour configurer un YAML basique: [Guide basique de configuration d'un MultiWrold](/tutorial/Archipelago/setup/en)
+
+### Où puis-je obtenir un dossier YAML ?
+
+Vous pouvez customiser vos paramètres en visitant la [page de paramètres de joueur de Stardew Valley](/games/Stardew%20Valley/player-settings)
+
+## Rejoindre une partie Multimondes
+
+### Installation du mod
+
+- Installez [SMAPI](https://smapi.io/) en suivant les instructions sur leur site internet.
+- Téléchargez et extrayez le mod [StardewArchipelago](https://github.com/agilbert1412/StardewArchipelago/releases) dans votre dossier "Mods" de Stardew Valley.
+- *FACULTATIF*: Si vous voulez lancer votre jeu depuis Steam, ajoutez ce qui suit dans vos options de lancement de Stardew Valley:
+    - "[PATH TO STARDEW VALLEY]\Stardew Valley\StardewModdingAPI.exe" %command%
+- Sinon, lancez simplement "StardewModdingAPI.exe" directement dans votre dossier d'installation.
+- Stardew Valley devrait se lancer seul à côté d'une console qui vous permet de lire les informations de mods et d'intéragir avec certains d'entre eux.
+
+### Se connecter au MultiServer
+
+Lancez Stardew Valley avec SMAPI. Une fois que vous êtes sur l'écran d'accueil de Stardew Valley, créez une nouvelle ferme.
+
+Sur la page de création d'un nouveau personnage, vous verrez trois nouveaux champs, utilisés pour lier votre nouveau personnage au multiworld d'Archipelago.
+
+![image](https://i.imgur.com/b8KZy2F.png)
+
+Vous pouvez customiser votre ferme et votre personnage autant que vous le souhaitez.
+
+Le champ "Server" doit contenir l'adresse et le port, et le champ "Slot" doit contenir le nom que vous avez spécifié dans votre yaml.
+
+`archipelago.gg:38281`
+
+`StardewPlayer`
+
+Le mot de passe est facultatif.
+
+Votre partie se connectera automatiquement à Archipelago, et se reconnectera automatiquement en chargeant la partie, plus tard.
+
+Vous n'aurez jamais besoin d'entrer ces informations de nouveau pour ce personnage, à moins que vous ne changiez l'adresse ip ou le port de la salle/page.
+Si l'adresse ip ou le port de la salle/page change, vous pouvez suivre les instructions suivantes pour modifier les informations de connection de votre partie.
+- Lancez la version modifiée de Stardew Valley
+- En étant **sur le menu principal** du jeu, entrez la commande suivante **dans la console SMAPI**:
+- `connect_override ip:port slot password`
+- Exemple: `connect_override archipelago.gg:38281 StardewPlayer`
+- Sauvegardez la partie. Les nouvelles informations de connexion seront utilisées, à la place des anciennes.
+- Jouer un jour complet, dormez, et sauvegardez le jeu. Ces informations de connexions remplaceront les anciennes et deviendront permanentes.
+
+### Intéragir avec le MultiWorld depuis le jeu
+
+Lorsque vous vous connectez, vous devriez voir un message dans le clavardage vous informant de la commande `!!help`. Cette comande listera d'autres commandes de chat exclusives à Stardew Valley, que vous pouvez utiliser.
+
+En outre, vous pouvez utiliser le chat du jeu pour communiquer à d'autres joueurs du MultiWorld, à condition qu'ils jouent à un jeu ayant la fontion "chat".
+
+Enfin, vous pouvez également utiliser la commande `!help` depuis le chat du jeu, vous permettant de demander des indices sur certains objets, ou des endroits encore non trouvés.
+
+Il est important de noter que le chat de Stardew Valley est assez limité dans ses capacités. Par exemple, il ne permet pas de remonter l'historique, et ainsi de voir ce qui est sorti de l'affichage. La console SMAPI, qui tourne en même temps que votre jeu aura le même historique, entier, et sera sans doute une meilleure option pour lire les ancien messages. 
+Pour une meilleure expérience de chat, vous pouvez aussi utiliser le Client de Texte Archipelago (Archipelago Text Client) officiel; il ne vous permettra cependant pas de taper des commanddes exclusives à Stardew Valley.
+
+### Jouer avec des mods supportés
+
+Voir la [documentation des mods supportés](https://github.com/agilbert1412/StardewArchipelago/blob/5.x.x/Documentation/Supported%20Mods.md)
+
+### Multijoueur
+
+Le mode multijoueur de Stardew Valley n'est pas compatible avec Archipelago pour le moment. Il n'y aucun projet pour supporter cette fonctionnalité.

worlds/timespinner/docs/setup_de.md

@@ -42,7 +42,7 @@ Weitere Informationen zum Randomizer findest du hier: [ReadMe](https://github.co
 
 ## Woher bekomme ich eine Konfigurationsdatei?
 
-Die [Player Settings](https://archipelago.gg/games/Timespinner/player-settings) Seite auf der Website erlaubt dir,
+Die [Player Options](https://archipelago.gg/games/Timespinner/player-options) Seite auf der Website erlaubt dir,
 persönliche Einstellungen zu definieren und diese in eine Konfigurationsdatei zu exportieren
 
 * Die Timespinner Randomizer Option "StinkyMaw" ist in Archipelago Seeds aktuell immer an

worlds/witness/docs/setup_en.md

@@ -43,4 +43,4 @@ The Witness has a fully functional map tracker that supports auto-tracking.
 3. Click on the "AP" symbol at the top.
 4. Enter the AP address, slot name and password. 
 
-The rest should take care of itself! Items and checks will be marked automatically, and it even knows your settings - It will hide checks & adjust logic accordingly.
+The rest should take care of itself! Items and checks will be marked automatically, and it even knows your options - It will hide checks & adjust logic accordingly.

worlds/yoshisisland/docs/en_Yoshi's Island.md

@@ -1,6 +1,6 @@
 # Yoshi's Island
 
-## Where is the settings page?
+## Where is the options page?
 
 The [player options page for this game](../player-options) contains all the options you need to configure and export a config file.
 

worlds/yoshisisland/docs/setup_en.md

@@ -39,7 +39,7 @@ guide: [Basic Multiworld Setup Guide](/tutorial/Archipelago/setup/en)
 
 ### Where do I get a config file?
 
-The Player Options page on the website allows you to configure your personal settings and export a config file from
+The Player Options page on the website allows you to configure your personal options and export a config file from
 them.
 
 ### Verifying your config file