alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'DoorDev' into DoorDevUnstable

Browse Source
This commit is contained in:
aerinon
2024-03-28 10:04:40 -06:00
parent 6c1f673086 b55727f0bf
commit 9235c19d34
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View File

@@ -26,7 +26,7 @@ jobs:
# os & python versions # os & python versions
strategy: strategy:
matrix: 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 ] python-version: [ 3.9 ]
# needs: [ install-test ] # needs: [ install-test ]
steps: steps:
@@ -110,7 +110,7 @@ jobs:
strategy: strategy:
matrix: matrix:
# install/release on not bionic # 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 ] python-version: [ 3.9 ]
needs: [ install-build ] needs: [ install-build ]

2
Main.py
View File

@@ -38,7 +38,7 @@ from source.enemizer.DamageTables import DamageTable
from source.enemizer.Enemizer import randomize_enemies from source.enemizer.Enemizer import randomize_enemies
from source.rom.DataTables import init_data_tables from source.rom.DataTables import init_data_tables
version_number = '1.4.1.8' version_number = '1.4.1.9'
version_branch = '-u' version_branch = '-u'
__version__ = f'{version_number}{version_branch}' __version__ = f'{version_number}{version_branch}'

2
RELEASENOTES.md
View File

@@ -141,6 +141,8 @@ These are now independent of retro mode and have three options: None, Random, an
# Patch Notes # Patch Notes
* 1.4.1.9u
* todo
* 1.4.1.8u * 1.4.1.8u
* HUD: New dungeon indicators based on common abbreviations * HUD: New dungeon indicators based on common abbreviations
* OWG+HMG: EG is allowed to be armed * OWG+HMG: EG is allowed to be armed

2
Rules.py
View File

@@ -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 # 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 # 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)', 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): def add_connection(parent_name, target_name, entrance_name, world, player):
parent = world.get_region(parent_name, player) parent = world.get_region(parent_name, player)
target = world.get_region(target_name, player) target = world.get_region(target_name, player)

2
Text.py
View File

@@ -2025,6 +2025,8 @@ class TextTable(object):
text['ganon_phase_3_alt'] = CompressedTextMapper.convert("Got wax in your ears? I cannot die!") text['ganon_phase_3_alt'] = CompressedTextMapper.convert("Got wax in your ears? I cannot die!")
# 190 # 190
text['sign_east_death_mountain_bridge'] = CompressedTextMapper.convert("Glitched\ntournament\nwinners\n{HARP}\n" 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" "~~~HMG 2021~~~\nKrithel\n\n"
"~~~OWG 2019~~~\nGlan\n\n" "~~~OWG 2019~~~\nGlan\n\n"
"~~~OWG 2018~~~\nChristosOwen\nthe numpty") "~~~OWG 2018~~~\nChristosOwen\nthe numpty")