From 10677b4bf1c9779fc5660696a59bd6318e99fb70 Mon Sep 17 00:00:00 2001 From: Joe Lyga Date: Sun, 13 Nov 2022 16:25:21 -0500 Subject: [PATCH 1/2] Updated Github actions yml to fix Node.js 12 deprecation Several actions have been updated to avoid the Node.js 12 deprecation: actions/checkout actions/setup-python mad9000/actions-find-and-replace-string actions/upload-artifact actions/download-artifact --- .github/workflows/ci.yml | 44 ++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 261dc125..5845e58b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,10 @@ jobs: steps: # checkout commit - name: Checkout commit - uses: actions/checkout@v2 + uses: actions/checkout@v3 # install python - name: Install python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: "x64" @@ -50,21 +50,21 @@ jobs: pip install pyinstaller # get parent directory - name: Get Repo Name - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: repoName with: source: ${{ github.repository }} find: '${{ github.repository_owner }}/' replace: '' - name: Get Parent Directory Path (!Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDirNotWin with: source: ${{ github.workspace }} find: '${{ steps.repoName.outputs.value }}/${{ steps.repoName.outputs.value }}' replace: ${{ steps.repoName.outputs.value }} - name: Get Parent Directory Path (Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDir with: source: ${{ steps.parentDirNotWin.outputs.value }} @@ -92,7 +92,7 @@ jobs: python ./resources/ci/common/prepare_binary.py # upload binary artifacts for later step - name: Upload Binary Artifacts - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: binaries-${{ matrix.os-name }} path: ${{ steps.parentDir.outputs.value }}/artifact @@ -117,10 +117,10 @@ jobs: steps: # checkout commit - name: Checkout commit - uses: actions/checkout@v2 + uses: actions/checkout@v3 # install python - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} architecture: "x64" @@ -134,21 +134,21 @@ jobs: python ./resources/ci/common/install.py # get parent directory - name: Get Repo Name - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: repoName with: source: ${{ github.repository }} find: '${{ github.repository_owner }}/' replace: '' - name: Get Parent Directory Path (!Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDirNotWin with: source: ${{ github.workspace }} find: '${{ steps.repoName.outputs.value }}/${{ steps.repoName.outputs.value }}' replace: ${{ steps.repoName.outputs.value }} - name: Get Parent Directory Path (Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDir with: source: ${{ steps.parentDirNotWin.outputs.value }} @@ -156,7 +156,7 @@ jobs: replace: ${{ steps.repoName.outputs.value }} # download binary artifact - name: Download Binary Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: binaries-${{ matrix.os-name }} path: ./ @@ -170,13 +170,13 @@ jobs: python ./resources/ci/common/prepare_release.py # upload appversion artifact for later step - name: Upload AppVersion Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: appversion-${{ matrix.os-name }} path: ./resources/app/meta/manifests/app_version.txt # upload archive artifact for later step - name: Upload Archive Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: archive-${{ matrix.os-name }} path: ${{ steps.parentDir.outputs.value }}/deploy @@ -202,24 +202,24 @@ jobs: steps: # checkout commit - name: Checkout commit - uses: actions/checkout@v2 + uses: actions/checkout@v3 # get parent directory - name: Get Repo Name - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: repoName with: source: ${{ github.repository }} find: '${{ github.repository_owner }}/' replace: '' - name: Get Parent Directory Path (!Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDirNotWin with: source: ${{ github.workspace }} find: '${{ steps.repoName.outputs.value }}/${{ steps.repoName.outputs.value }}' replace: ${{ steps.repoName.outputs.value }} - name: Get Parent Directory Path (Windows) - uses: mad9000/actions-find-and-replace-string@1 + uses: mad9000/actions-find-and-replace-string@3 id: parentDir with: source: ${{ steps.parentDirNotWin.outputs.value }} @@ -230,25 +230,25 @@ jobs: python -m pip install pytz requests # download appversion artifact - name: Download AppVersion Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: appversion-${{ matrix.os-name }} path: ${{ steps.parentDir.outputs.value }}/build # download ubuntu archive artifact - name: Download Ubuntu Archive Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: archive-ubuntu-latest path: ${{ steps.parentDir.outputs.value }}/deploy/linux # download macos archive artifact - name: Download MacOS Archive Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: archive-macOS-latest path: ${{ steps.parentDir.outputs.value }}/deploy/macos # download windows archive artifact - name: Download Windows Archive Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: archive-windows-latest path: ${{ steps.parentDir.outputs.value }}/deploy/windows From 6934aedfd896f4bba76ab817db40bf99df670a0a Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 29 Nov 2022 13:22:27 -0700 Subject: [PATCH 2/2] Logic bug for GT Refill room not requiring boots --- Main.py | 2 +- RELEASENOTES.md | 2 ++ Rules.py | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Main.py b/Main.py index d0174f27..506fe985 100644 --- a/Main.py +++ b/Main.py @@ -31,7 +31,7 @@ from Utils import output_path, parse_player_names from source.item.FillUtil import create_item_pool_config, massage_item_pool, district_item_pool_config from source.tools.BPS import create_bps_from_data -__version__ = '1.1.1-dev' +__version__ = '1.1.2-dev' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index eff11535..831368e8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -181,6 +181,8 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o # Bug Fixes and Notes +* 1.1.2 + * Fixed a logic bug with GT Refill room not requiring boots to access the pots in there. * 1.1.1 * Fixed a logic bug with Bumper Cave where the pots were accessible without Cape or Hookshot from the top entrance * Fixed a pot coloring issue with hammer peg cave diff --git a/Rules.py b/Rules.py index 68f9e616..397b4054 100644 --- a/Rules.py +++ b/Rules.py @@ -384,7 +384,8 @@ def global_rules(world, player): set_rule(world.get_entrance('GT Mimics 1 ES', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('GT Mimics 2 WS', player), lambda state: state.can_shoot_arrows(player)) set_rule(world.get_entrance('GT Mimics 2 NE', player), lambda state: state.can_shoot_arrows(player)) - # consider access to refill room + # consider access to refill room - interior doors would need a change + set_rule(world.get_entrance('GT Cannonball Bridge SE', player), lambda state: state.has_Boots(player)) set_rule(world.get_entrance('GT Gauntlet 1 WN', player), lambda state: state.can_kill_most_things(player)) set_rule(world.get_entrance('GT Gauntlet 2 EN', player), lambda state: state.can_kill_most_things(player)) set_rule(world.get_entrance('GT Gauntlet 2 SW', player), lambda state: state.can_kill_most_things(player))