From 46903470b5f9daefa058b9ab217dfe7848f36dd1 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 3 Jan 2023 16:14:42 -0700 Subject: [PATCH 1/6] Fix typo for door "Sewers Key Rat E" --- Doors.py | 2 +- Main.py | 2 +- RELEASENOTES.md | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doors.py b/Doors.py index a7c1d9f3..c137983f 100644 --- a/Doors.py +++ b/Doors.py @@ -104,7 +104,7 @@ def create_doors(world, player): create_door(player, 'Sewers Dark Cross Key Door N', Nrml).dir(No, 0x32, Mid, High).small_key().pos(0), create_door(player, 'Sewers Water S', Nrml).dir(So, 0x22, Mid, High).small_key().pos(0).portal(Z, 0x22), create_door(player, 'Sewers Water W', Nrml).dir(We, 0x22, Bot, High).pos(1), - create_door(player, 'Sewers Key Rat E', Nrml).dir(Ea, 0x21, Bot, High).pos(1), + create_door(player, 'Sewers Key Rat E', Nrml).dir(Ea, 0x21, Bot, High).pos(2), create_door(player, 'Sewers Key Rat Key Door N', Nrml).dir(No, 0x21, Right, High).small_key().pos(0), create_door(player, 'Sewers Secret Room Key Door S', Nrml).dir(So, 0x11, Right, High).small_key().pos(2).portal(X, 0x02), create_door(player, 'Sewers Rat Path WS', Intr).dir(We, 0x11, Bot, High).pos(1), diff --git a/Main.py b/Main.py index 506fe985..e1a86313 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.2-dev' +__version__ = '1.1.3-dev' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 831368e8..924fdaa5 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.3 + * Fixed a typo on a door near the key rat * 1.1.2 * Fixed a logic bug with GT Refill room not requiring boots to access the pots in there. * 1.1.1 From beb7f8074b8f9d7f1cb9656c3797eb242800d4c3 Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Sat, 7 Jan 2023 14:58:24 -0600 Subject: [PATCH 2/6] remove hard requirement of tkinter when using CLI --- source/meta/check_requirements.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/meta/check_requirements.py b/source/meta/check_requirements.py index 680dfe8f..6976f707 100644 --- a/source/meta/check_requirements.py +++ b/source/meta/check_requirements.py @@ -1,6 +1,4 @@ import importlib.util -import webbrowser -from tkinter import Tk, Label, Button, Frame def check_requirements(console=False): @@ -26,6 +24,9 @@ def check_requirements(console=False): logger.error('See the step about "Installing Platform-specific dependencies":') logger.error('https://github.com/aerinon/ALttPDoorRandomizer/blob/DoorDev/docs/BUILDING.md') else: + import webbrowser + from tkinter import Tk, Label, Button, Frame + master = Tk() master.title('Error') frame = Frame(master) From 9bf73159045601238015de013235f6392db55e2b Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Thu, 9 Feb 2023 13:08:36 -0600 Subject: [PATCH 3/6] Remove a bad triforce text It was brought up on the ALTTPR Discord that this Triforce text can feel really bad to see at the end of a long race. I think it's best we give it a permanent vacation. --- Text.py | 1 - 1 file changed, 1 deletion(-) diff --git a/Text.py b/Text.py index 4da86b4c..27d27f1d 100644 --- a/Text.py +++ b/Text.py @@ -91,7 +91,6 @@ Triforce_texts = [ 'Who stole the fourth triangle?', 'Trifource?\nMore Like Tritrice, am I right?' '\n Well Done!', - 'You just wasted 2 hours of your life.', 'This was meant to be a trapezoid', # these ones are from web randomizer "\n G G", From fe0e0805ad94b34f1fb979e3a8fc564d98a7c5f6 Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 15 Feb 2023 08:41:08 -0700 Subject: [PATCH 4/6] Fix for Desert Tiles 1 --- RoomData.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RoomData.py b/RoomData.py index f3c82576..eae844ef 100644 --- a/RoomData.py +++ b/RoomData.py @@ -103,7 +103,7 @@ def create_rooms(world, player): Room(player, 0x60, 0x51309).door(Position.NorthE2, DoorKind.NormalLow2).door(Position.East2, DoorKind.NormalLow2).door(Position.East2, DoorKind.ToggleFlag).door(Position.EastN, DoorKind.Normal).door(Position.SouthE, DoorKind.Normal).door(Position.SouthE, DoorKind.IncognitoEntrance), Room(player, 0x61, 0x51454).door(Position.West2, DoorKind.NormalLow).door(Position.West2, DoorKind.ToggleFlag).door(Position.East2, DoorKind.NormalLow).door(Position.East2, DoorKind.ToggleFlag).door(Position.South2, DoorKind.NormalLow).door(Position.South2, DoorKind.IncognitoEntrance).door(Position.WestN, DoorKind.Normal), Room(player, 0x62, 0x51577).door(Position.West2, DoorKind.NormalLow2).door(Position.West2, DoorKind.ToggleFlag).door(Position.NorthW2, DoorKind.NormalLow2).door(Position.North, DoorKind.Normal).door(Position.SouthW, DoorKind.Normal).door(Position.SouthW, DoorKind.IncognitoEntrance), - Room(player, 0x63, 0xf88ed).door(Position.NorthE, DoorKind.StairKey).door(Position.InteriorW, DoorKind.TrapTriggerable).door(Position.SouthW, DoorKind.DungeonEntrance), # looked like a huge typo - I had to guess on StairKey + Room(player, 0x63, 0xf88ed).door(Position.NorthW, DoorKind.StairKey).door(Position.InteriorW, DoorKind.TrapTriggerable).door(Position.SouthW, DoorKind.DungeonEntrance), # looked like a huge typo - I had to guess on StairKey Room(player, 0x64, 0xfda53).door(Position.InteriorS, DoorKind.Trap2), Room(player, 0x65, 0xfdac5).door(Position.InteriorS, DoorKind.Normal), Room(player, 0x66, 0xfa01b).door(Position.InteriorE2, DoorKind.Waterfall).door(Position.SouthW2, DoorKind.NormalLow2).door(Position.SouthW2, DoorKind.ToggleFlag).door(Position.InteriorW2, DoorKind.NormalLow2), From afac655de2bfa82fb72e23f50e3f0b352bc91cbd Mon Sep 17 00:00:00 2001 From: aerinon Date: Thu, 29 Dec 2022 19:39:13 -0700 Subject: [PATCH 5/6] Fixed door position typo --- Doors.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doors.py b/Doors.py index c137983f..f89696c6 100644 --- a/Doors.py +++ b/Doors.py @@ -773,7 +773,7 @@ def create_doors(world, player): create_door(player, 'Ice Freezors Hole', Hole), create_door(player, 'Ice Freezors Bomb Hole', Hole), # combine these two? -- they have to lead to the same spot create_door(player, 'Ice Freezors Ledge Hole', Hole), - create_door(player, 'Ice Freezors Ledge ES', Intr).dir(Ea, 0x7e, Bot, High).pos(2), + create_door(player, 'Ice Freezors Ledge ES', Intr).dir(Ea, 0x7e, Bot, High).pos(1), create_door(player, 'Ice Tall Hint WS', Intr).dir(We, 0x7e, Bot, High).pos(1), create_door(player, 'Ice Tall Hint EN', Nrml).dir(Ea, 0x7e, Top, High).pos(2), create_door(player, 'Ice Tall Hint SE', Nrml).dir(So, 0x7e, Right, High).small_key().pos(0).portal(X, 0x02), From 5f8be831ec96184dfd031f16cb8e5d7e8180707a Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 15 Feb 2023 14:25:00 -0700 Subject: [PATCH 6/6] Version bump and release notes --- Main.py | 2 +- RELEASENOTES.md | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Main.py b/Main.py index e1a86313..11138c65 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.3-dev' +__version__ = '1.1.4-dev' from source.classes.BabelFish import BabelFish diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 924fdaa5..fd66faff 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -181,6 +181,10 @@ Same as above but both small keys and bigs keys of the dungeon are not allowed o # Bug Fixes and Notes +* 1.1.4 + * Removed a Triforce text + * Fix for Desert Tiles 1 key door + * Fix for Ice Freezors Ledge door position * 1.1.3 * Fixed a typo on a door near the key rat * 1.1.2