Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core: move option results to the World class instead of MultiWorld #993

Merged
merged 120 commits into from
Oct 10, 2023

Commits on Sep 2, 2022

  1. Configuration menu
    Copy the full SHA
    24471ce View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    220571f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    643205c View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2022

  1. copy/paste bad

    alwaysintreble committed Sep 25, 2022
    Configuration menu
    Copy the full SHA
    695c94c View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    caaf051 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2022

  1. Configuration menu
    Copy the full SHA
    d481eed View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f9a8bb2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cded105 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Fill.py
    #	worlds/AutoWorld.py
    alwaysintreble committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    be3fa3a View commit details
    Browse the repository at this point in the history
  2. update world api

    alwaysintreble committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    52290df View commit details
    Browse the repository at this point in the history
  3. update soe tests

    alwaysintreble committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    5896e6c View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2022

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    #	test/worlds/test_base.py
    alwaysintreble committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    cdcd06c View commit details
    Browse the repository at this point in the history
  2. fix world api

    alwaysintreble committed Oct 29, 2022
    Configuration menu
    Copy the full SHA
    2581d57 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2023

  1. Configuration menu
    Copy the full SHA
    121152b View commit details
    Browse the repository at this point in the history
  2. core: auto initialize a dataclass on the World class with the option …

    …results: small tying improvement
    el-u committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    82ff125 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #14 from el-u/options_dict

    core: auto initialize a dataclass on the World class with the option results
    alwaysintreble authored Jan 9, 2023
    Configuration menu
    Copy the full SHA
    ad2f59e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    43353de View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Options.py
    #	docs/world api.md
    #	test/general/__init__.py
    #	test/inverted/TestInverted.py
    #	test/inverted_minor_glitches/TestInvertedMinor.py
    #	test/inverted_owg/TestInvertedOWG.py
    #	test/owg/TestVanillaOWG.py
    #	test/vanilla/TestVanilla.py
    #	test/worlds/test_base.py
    #	worlds/AutoWorld.py
    #	worlds/alttp/test/dungeons/TestDungeon.py
    #	worlds/alttp/test/inverted/TestInvertedBombRules.py
    #	worlds/alttp/test/minor_glitches/TestMinor.py
    #	worlds/ror2/__init__.py
    alwaysintreble committed Jan 9, 2023
    Configuration menu
    Copy the full SHA
    af5647d View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    76833d5 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2023

  1. Configuration menu
    Copy the full SHA
    d85fb69 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    #	worlds/ror2/Options.py
    #	worlds/ror2/__init__.py
    alwaysintreble committed Feb 12, 2023
    Configuration menu
    Copy the full SHA
    42c1abb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cfdc0b1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    eaadb6e View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	worlds/oot/__init__.py
    #	worlds/ror2/__init__.py
    alwaysintreble committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    d890de4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0658a5b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    effbca0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b78b7d3 View commit details
    Browse the repository at this point in the history
  5. fix comparisons

    alwaysintreble committed Feb 14, 2023
    Configuration menu
    Copy the full SHA
    94d18dc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0c0663b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a638582 View commit details
    Browse the repository at this point in the history
  8. Merge pull request #15 from el-u/options_dict

    core: automatically create missing options_dataclass from legacy option_definitions
    alwaysintreble authored Feb 14, 2023
    Configuration menu
    Copy the full SHA
    11214aa View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    fe679fc View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2023

  1. give ArchipIDLE the default options_dataclass so its options get gene…

    …rated and spoilered properly
    alwaysintreble committed Feb 15, 2023
    Configuration menu
    Copy the full SHA
    c5684bb View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2023

  1. Configuration menu
    Copy the full SHA
    cecd3f7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1fbc1a4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c3ad00b View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1730eaf View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    1b1ee31 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    85e98a0 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a24bb2e View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9df025d View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2023

  1. Configuration menu
    Copy the full SHA
    337133c View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2023

  1. Configuration menu
    Copy the full SHA
    aadbd56 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2584535 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0ae2acc View commit details
    Browse the repository at this point in the history
  4. remove legacy dictionaries

    el-u committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    a147aae View commit details
    Browse the repository at this point in the history
  5. cache the metaclass property

    el-u committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    88db4f7 View commit details
    Browse the repository at this point in the history
  6. clarify inheritance in world api

    el-u committed Feb 25, 2023
    Configuration menu
    Copy the full SHA
    01374e0 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #16 from el-u/options_dict

    cleanup related to metaclass property
    alwaysintreble authored Feb 25, 2023
    Configuration menu
    Copy the full SHA
    9d4ab5b View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    #	test/general/__init__.py
    #	worlds/AutoWorld.py
    alwaysintreble committed Mar 6, 2023
    Configuration menu
    Copy the full SHA
    069328c View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    alwaysintreble committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    b831bac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ac123db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e6806ed View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	worlds/messenger/Rules.py
    alwaysintreble committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    7c7a49f View commit details
    Browse the repository at this point in the history
  2. update the doc

    alwaysintreble committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    2c8afbc View commit details
    Browse the repository at this point in the history
  3. rename o to options

    alwaysintreble committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    f8ba777 View commit details
    Browse the repository at this point in the history
  4. missed a spot

    alwaysintreble committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    984d659 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	docs/world api.md
    #	worlds/AutoWorld.py
    #	worlds/factorio/__init__.py
    #	worlds/messenger/Options.py
    #	worlds/messenger/Rules.py
    #	worlds/messenger/SubClasses.py
    #	worlds/messenger/__init__.py
    alwaysintreble committed Apr 1, 2023
    Configuration menu
    Copy the full SHA
    61b82f1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e959c49 View commit details
    Browse the repository at this point in the history
  3. comment spacing

    Co-authored-by: Doug Hoskisson <[email protected]>
    alwaysintreble and beauxq authored Apr 1, 2023
    Configuration menu
    Copy the full SHA
    ec8c75b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Fill.py
    #	WebHostLib/options.py
    #	worlds/alttp/test/dungeons/TestDungeon.py
    #	worlds/messenger/Options.py
    #	worlds/messenger/Rules.py
    #	worlds/messenger/SubClasses.py
    #	worlds/messenger/__init__.py
    alwaysintreble committed May 21, 2023
    Configuration menu
    Copy the full SHA
    5f32194 View commit details
    Browse the repository at this point in the history
  2. fix tests

    alwaysintreble committed May 21, 2023
    Configuration menu
    Copy the full SHA
    2b46533 View commit details
    Browse the repository at this point in the history
  3. fix missing import

    alwaysintreble committed May 21, 2023
    Configuration menu
    Copy the full SHA
    e6424e2 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Configuration menu
    Copy the full SHA
    f189f5d View commit details
    Browse the repository at this point in the history

Commits on May 31, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    alwaysintreble committed May 31, 2023
    Configuration menu
    Copy the full SHA
    73e5875 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Generate.py
    #	worlds/messenger/Options.py
    #	worlds/messenger/Rules.py
    #	worlds/messenger/SubClasses.py
    #	worlds/messenger/__init__.py
    #	worlds/ror2/__init__.py
    alwaysintreble committed Jun 28, 2023
    Configuration menu
    Copy the full SHA
    2ba7464 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3e1be1e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fc93f97 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0b9959e View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    #	docs/world api.md
    #	worlds/alttp/test/dungeons/TestDungeon.py
    #	worlds/alttp/test/inverted/TestInverted.py
    #	worlds/alttp/test/inverted/TestInvertedBombRules.py
    #	worlds/alttp/test/inverted_minor_glitches/TestInvertedMinor.py
    #	worlds/alttp/test/inverted_owg/TestInvertedOWG.py
    #	worlds/alttp/test/minor_glitches/TestMinor.py
    #	worlds/alttp/test/owg/TestVanillaOWG.py
    #	worlds/alttp/test/vanilla/TestVanilla.py
    #	worlds/messenger/__init__.py
    alwaysintreble committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    996697f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    266acd2 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Options.py
    #	worlds/messenger/SubClasses.py
    #	worlds/stardew_valley/test/__init__.py
    alwaysintreble committed Jul 23, 2023
    Configuration menu
    Copy the full SHA
    c39081a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4596be9 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    41ed545 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    26976b8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7a114d4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bb06b3a View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Main.py
    #	worlds/messenger/Shop.py
    #	worlds/messenger/SubClasses.py
    #	worlds/messenger/__init__.py
    #	worlds/ror2/__init__.py
    #	worlds/stardew_valley/test/__init__.py
    alwaysintreble committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    8c8adbf View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Configuration menu
    Copy the full SHA
    f5da39e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9cf454b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    37f6d8b View commit details
    Browse the repository at this point in the history
  4. CommonOptions not abstract

    beauxq committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    d381d1d View commit details
    Browse the repository at this point in the history
  5. Docs: fix mistake in options api.md

    Co-authored-by: Doug Hoskisson <[email protected]>
    alwaysintreble and beauxq authored Sep 2, 2023
    Configuration menu
    Copy the full SHA
    6d418f9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c02be73 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2023

  1. Configuration menu
    Copy the full SHA
    2e30f07 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8583c2a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	Main.py
    alwaysintreble committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    c58f4a5 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	BaseClasses.py
    alwaysintreble committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    c3a666f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    833f09c View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2023

  1. Configuration menu
    Copy the full SHA
    06ba9ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7d09402 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Configuration menu
    Copy the full SHA
    ddb630b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Configuration menu
    Copy the full SHA
    de98a33 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2023

  1. Merge remote-tracking branch 'Main/main' into options_dict

    # Conflicts:
    #	worlds/messenger/Rules.py
    alwaysintreble committed Oct 6, 2023
    Configuration menu
    Copy the full SHA
    cf0e267 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2023

  1. Configuration menu
    Copy the full SHA
    dc041df View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    366a069 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    668d598 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b952aaa View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    555ac4c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    75e2c6a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    8a5c157 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4a9e222 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    bcec62e View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2023

  1. Configuration menu
    Copy the full SHA
    0c1b3b2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    db38f11 View commit details
    Browse the repository at this point in the history
  3. typo

    alwaysintreble committed Oct 8, 2023
    Configuration menu
    Copy the full SHA
    5eb17a1 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    16ae3ad View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2023

  1. Configuration menu
    Copy the full SHA
    228dfaa View commit details
    Browse the repository at this point in the history
  2. - Fixed init options

    agilbert1412 committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    92f08a7 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    095195a View commit details
    Browse the repository at this point in the history
  4. missed a file

    alwaysintreble committed Oct 9, 2023
    Configuration menu
    Copy the full SHA
    f5c0e23 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c38cce9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    4876639 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Configuration menu
    Copy the full SHA
    b0f7671 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    82ae9df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    db21617 View commit details
    Browse the repository at this point in the history
  4. resolve conflicts

    alwaysintreble committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    86e956b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    130da25 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d8fab8e View commit details
    Browse the repository at this point in the history
  7. better slot data description

    Co-authored-by: black-sliver <[email protected]>
    alwaysintreble and black-sliver authored Oct 10, 2023
    Configuration menu
    Copy the full SHA
    1e707c7 View commit details
    Browse the repository at this point in the history