diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5845e58b..ab6c8163 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: # os & python versions strategy: matrix: - os-name: [ ubuntu-latest, ubuntu-18.04, macOS-latest, windows-latest ] + os-name: [ ubuntu-latest, ubuntu-20.04, macOS-latest, windows-latest ] python-version: [ 3.9 ] # needs: [ install-test ] steps: @@ -110,7 +110,7 @@ jobs: strategy: matrix: # install/release on not bionic - os-name: [ ubuntu-latest, ubuntu-18.04, macOS-latest, windows-latest ] + os-name: [ ubuntu-latest, ubuntu-20.04, macOS-latest, windows-latest ] python-version: [ 3.9 ] needs: [ install-build ] diff --git a/Main.py b/Main.py index 4538bab4..f4bedf43 100644 --- a/Main.py +++ b/Main.py @@ -38,7 +38,7 @@ from source.enemizer.DamageTables import DamageTable from source.enemizer.Enemizer import randomize_enemies from source.rom.DataTables import init_data_tables -version_number = '1.4.1.8' +version_number = '1.4.1.9' version_branch = '-u' __version__ = f'{version_number}{version_branch}' diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2f7f9103..db0682ed 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -141,6 +141,8 @@ These are now independent of retro mode and have three options: None, Random, an # Patch Notes +* 1.4.1.9u + * todo * 1.4.1.8u * HUD: New dungeon indicators based on common abbreviations * OWG+HMG: EG is allowed to be armed diff --git a/Rules.py b/Rules.py index 7fd58e10..b2eb91f1 100644 --- a/Rules.py +++ b/Rules.py @@ -1285,6 +1285,7 @@ def forbid_bomb_jump_requirements(world, player): + # Light cones in standard depend on which world we actually are in, not which one the location would normally be # We add Lamp requirements only to those locations which lie in the dark world (or everything if open DW_Entrances = ['Bumper Cave (Bottom)', 'Superbunny Cave (Top)', 'Superbunny Cave (Bottom)', 'Hookshot Cave', 'Bumper Cave (Top)', 'Hookshot Cave Back Entrance', 'Dark Death Mountain Ledge (East)', @@ -1484,6 +1485,7 @@ kill_chests = { + def add_connection(parent_name, target_name, entrance_name, world, player): parent = world.get_region(parent_name, player) target = world.get_region(target_name, player) diff --git a/Text.py b/Text.py index 4d95f516..f2554030 100644 --- a/Text.py +++ b/Text.py @@ -2025,6 +2025,8 @@ class TextTable(object): text['ganon_phase_3_alt'] = CompressedTextMapper.convert("Got wax in your ears? I cannot die!") # 190 text['sign_east_death_mountain_bridge'] = CompressedTextMapper.convert("Glitched\ntournament\nwinners\n{HARP}\n" + "~~~HMG 2023~~~\ntam\n\n" + "~~~No Logic 2022~~~\nChexhuman\n\n" "~~~HMG 2021~~~\nKrithel\n\n" "~~~OWG 2019~~~\nGlan\n\n" "~~~OWG 2018~~~\nChristosOwen\nthe numpty")