LADX: Add "boots controls" option #2085

zig-for · 2023-08-06T02:29:57Z

What is this fixing or adding?

Adds options for boots controls (open to better names...quick boots?)

class BootsControls(Choice):
    """
    Adds additional button to activate Pegasus Boots (does nothing if you haven't picked up your boots!)
    [Vanilla] Nothing changes, you have to equip the boots to use them
    [Bracelet] Holding down the button for the bracelet also activates boots (somewhat like Link to the Past)
    [Press A] Holding down A activates boots
    [Press B] Holding down B activates boots
    """
    option_vanilla = 0
    option_bracelet = 1
    option_press_a = 2
    option_press_b = 3

How was this tested?

Beyond the work done in the development (incl the better part of a day trying to figure out how to fit it all in LADX's original controls handler, was seriously short one byte), genned a seed and played around some. Feels good.

If this makes graphical changes, please attach screenshots.

Look ma, no boots equipped.

worlds/ladx/LADXR/patches/bank3e.asm/chest.asm

worlds/ladx/Options.py

zig-for · 2023-12-03T01:48:06Z

Actually - don't merge this, it has a bug in multiworld gen, will fix

Eijebong · 2023-12-03T21:39:31Z

We ran into this today:

Uncaught exception
Traceback (most recent call last):
  File "/home/eijebong/code/ap_emerald/Generate.py", line 653, in <module>
    multiworld = main()
                 ^^^^^^
  File "/home/eijebong/code/ap_emerald/Generate.py", line 239, in main
    return callback(erargs, seed)
           ^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/Main.py", line 418, in main
    future.result()
  File "/usr/lib/python3.11/concurrent/futures/_base.py", line 449, in result
    return self.__get_result()
           ^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/concurrent/futures/_base.py", line 401, in __get_result
    raise self._exception
  File "/usr/lib/python3.11/concurrent/futures/thread.py", line 58, in run
    result = self.fn(*self.args, **self.kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 140, in call_single
    raise e
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 133, in call_single
    ret = _timed_call(method, *args, multiworld=multiworld, player=player)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 119, in _timed_call
    ret = method(*args)
          ^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/ladx/__init__.py", line 474, in generate_output
    rom = generator.generateRom(
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/generator.py", line 247, in generateRom
    patches.core.addBootsControls(rom, ap_settings['boots_controls'])
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/patches/core.py", line 559, in addBootsControls
    assembler.const(c, v)
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/assembler.py", line 760, in const
    assert name not in CONST_MAP
           ^^^^^^^^^^^^^^^^^^^^^
AssertionError
Exception in <bound method LinksAwakeningWorld.generate_output of <worlds.ladx.LinksAwakeningWorld object at 0x7f221346c210>> for player 13, named ThirstlaDX.
Traceback (most recent call last):
  File "/home/eijebong/code/ap_emerald/Generate.py", line 653, in <module>
    multiworld = main()
                 ^^^^^^
  File "/home/eijebong/code/ap_emerald/Generate.py", line 239, in main
    return callback(erargs, seed)
           ^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/Main.py", line 418, in main
    future.result()
  File "/usr/lib/python3.11/concurrent/futures/_base.py", line 449, in result
    return self.__get_result()
           ^^^^^^^^^^^^^^^^^^^
  File "/usr/lib/python3.11/concurrent/futures/_base.py", line 401, in __get_result
    raise self._exception
  File "/usr/lib/python3.11/concurrent/futures/thread.py", line 58, in run
    result = self.fn(*self.args, **self.kwargs)
             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 140, in call_single
    raise e
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 133, in call_single
    ret = _timed_call(method, *args, multiworld=multiworld, player=player)
          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/AutoWorld.py", line 119, in _timed_call
    ret = method(*args)
          ^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/ladx/__init__.py", line 474, in generate_output
    rom = generator.generateRom(
          ^^^^^^^^^^^^^^^^^^^^^^
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/generator.py", line 247, in generateRom
    patches.core.addBootsControls(rom, ap_settings['boots_controls'])
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/patches/core.py", line 559, in addBootsControls
    assembler.const(c, v)
  File "/home/eijebong/code/ap_emerald/worlds/ladx/LADXR/assembler.py", line 760, in const
    assert name not in CONST_MAP
           ^^^^^^^^^^^^^^^^^^^^^
AssertionError
Exception in <bound method LinksAwakeningWorld.generate_output of <worlds.ladx.LinksAwakeningWorld object at 0x7f221346c210>> for player 13, named ThirstlaDX.

Might be the bug you were talking about. Bug only present with 2 people running LADX with the boots option on.

ThePhar · 2023-12-03T21:57:20Z

Actually - don't merge this, it has a bug in multiworld gen, will fix

I'd recommend making this PR as Draft then for now.

zig-for · 2023-12-04T01:12:09Z

I have a one line fix, tested last night. Will push it once I’m home tonight.Sent from my iPhoneOn Dec 3, 2023, at 1:57 PM, Zach Parks ***@***.***> wrote: Actually - don't merge this, it has a bug in multiworld gen, will fix I'd recommend making this PR as Draft then for now. —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>

zig-for · 2023-12-06T07:25:52Z

IIRC I pushed this Sent from my iPhoneOn Dec 3, 2023, at 5:12 PM, ***@***.*** wrote:I have a one line fix, tested last night. Will push it once I’m home tonight.Sent from my iPhoneOn Dec 3, 2023, at 1:57 PM, Zach Parks ***@***.***> wrote: Actually - don't merge this, it has a bug in multiworld gen, will fix I'd recommend making this PR as Draft then for now. —Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you authored the thread.Message ID: ***@***.***>

zig-for · 2024-03-26T03:43:16Z

Hey this is actually not waiting on author please merge it

Berserker66 · 2024-04-14T01:14:12Z

worlds/ladx/LADXR/assembler.py

@@ -757,7 +757,7 @@ def getLabels(self) -> ItemsView[str, int]:

 def const(name: str, value: int) -> None:
    name = name.upper()
-    assert name not in CONST_MAP
+    assert name not in CONST_MAP or CONST_MAP[name] == value


Suggested change

assert name not in CONST_MAP or CONST_MAP[name] == value

assert name not in CONST_MAP or CONST_MAP[name] == value, "I'd recommend putting a message here, so that you get more than a mere AssertionError on webhost."

zig-for added 5 commits August 4, 2023 00:45

gotit

7df7ee9

working

6e9870f

comments

3b820f0

invert

5e2dd29

foobar

322046e

zig-for changed the title ~~Add boots controls~~ LADX: Add "boots controls" option Aug 8, 2023

ThePhar added the is: enhancement Issues requesting new features or pull requests implementing new features. label Aug 16, 2023

zig-for added 2 commits October 22, 2023 19:47

Merge branch 'main' into zig/ladx/lttp_controls

b7c4889

Merge branch 'main' into zig/ladx/lttp_controls

7b85d3a

ThePhar reviewed Nov 22, 2023

View reviewed changes

worlds/ladx/LADXR/patches/bank3e.asm/chest.asm Outdated Show resolved Hide resolved

ThePhar requested changes Nov 22, 2023

View reviewed changes

worlds/ladx/Options.py Show resolved Hide resolved

zig-for added 2 commits December 2, 2023 16:17

display name

58c2077

Merge remote-tracking branch 'ap/main' into zig/ladx/lttp_controls

84998e3

zig-for requested a review from ThePhar December 3, 2023 00:23

argh

8b44652

ScipioWright added the waiting-on: author Issue/PR is waiting for feedback or changes from its author. label Feb 16, 2024

Merge branch 'main' into zig/ladx/lttp_controls

debb944

Exempt-Medic added waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. and removed waiting-on: author Issue/PR is waiting for feedback or changes from its author. labels Apr 5, 2024

Merge branch 'main' into zig/ladx/lttp_controls

5718484

Berserker66 reviewed Apr 14, 2024

View reviewed changes

Berserker66 approved these changes Apr 14, 2024

View reviewed changes

Berserker66 merged commit ca5c0d9 into ArchipelagoMW:main Apr 14, 2024
15 checks passed

EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024

LADX: Add "boots controls" option (ArchipelagoMW#2085)

715676f

EmilyV99 pushed a commit to EmilyV99/Archipelago that referenced this pull request Apr 15, 2024

LADX: Add "boots controls" option (ArchipelagoMW#2085)

fa0505c

qwint pushed a commit to qwint/Archipelago that referenced this pull request Jun 24, 2024

LADX: Add "boots controls" option (ArchipelagoMW#2085)

91feb99

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

LADX: Add "boots controls" option #2085

LADX: Add "boots controls" option #2085

zig-for commented Aug 6, 2023 •

edited

Loading

zig-for commented Dec 3, 2023

Eijebong commented Dec 3, 2023

ThePhar commented Dec 3, 2023

zig-for commented Dec 4, 2023 via email

zig-for commented Dec 6, 2023 via email

zig-for commented Mar 26, 2024

Berserker66 Apr 14, 2024

	assert name not in CONST_MAP or CONST_MAP[name] == value
	assert name not in CONST_MAP or CONST_MAP[name] == value, "I'd recommend putting a message here, so that you get more than a mere AssertionError on webhost."

LADX: Add "boots controls" option #2085

LADX: Add "boots controls" option #2085

Conversation

zig-for commented Aug 6, 2023 • edited Loading

What is this fixing or adding?

How was this tested?

If this makes graphical changes, please attach screenshots.

zig-for commented Dec 3, 2023

Eijebong commented Dec 3, 2023

ThePhar commented Dec 3, 2023

zig-for commented Dec 4, 2023 via email

zig-for commented Dec 6, 2023 via email

zig-for commented Mar 26, 2024

Berserker66 Apr 14, 2024

Choose a reason for hiding this comment

zig-for commented Aug 6, 2023 •

edited

Loading