AHIT: Fix Death Wish location rules not being added properly #3455

CookieCat45 · 2024-06-03T15:10:42Z

What is this fixing or adding?

This fixes a major issue with Death Wish location rules not being added properly because the function being used to add the rules (add_dw_rules()) was not grabbing them from the dw_requirements and dw_bonus_requirements dicts at all. This is corrected by using the region name instead of the location name.

How was this tested?

By adding a print() in the add_dw_rules() function to make sure that it was actually grabbing the rules for the locations.

If this makes graphical changes, please attach screenshots.

…uldn't

# Conflicts: # worlds/ahit/Regions.py

Ixrec · 2024-06-03T15:13:33Z

Can we add a simple unit test or two like "reaching requires " so this is harder to break in the future? (unless we want to save that for a later PR)

CookieCat45 · 2024-06-03T15:18:00Z

Can we add a simple unit test or two like "reaching requires " so this is harder to break in the future? (unless we want to save that for a later PR)

If a new unit test needs to be added I would prefer to do that as a separate PR.

Exempt-Medic

Name corrections are accurate, generated seeds until hitting one with missing requirements, merged into main and generated on the same seed to see proper requirements being expected.

ScipioWright

Test gens worked fine, code looks fine

…lagoMW#3455) * duh * Fuck it * Major fixes * a * b * Even more fixes * New option - NoFreeRoamFinale * a * Hat Logic Fix * Just to be safe * multiworld.random to world.random * KeyError fix * Update .gitignore * Update __init__.py * Zoinks Scoob * ffs * Ruh Roh Raggy, more r-r-r-random bugs! * 0.9b - cleanup + expanded logic difficulty * Update Rules.py * Update Regions.py * AttributeError fix * 0.10b - New Options * 1.0 Preparations * Docs * Docs 2 * Fixes * Update __init__.py * Fixes * variable capture my beloathed * Fixes * a * 10 Seconds logic fix * 1.1 * 1.2 * a * New client * More client changes * 1.3 * Final touch-ups for 1.3 * 1.3.1 * 1.3.3 * Zero Jumps gen error fix * more fixes * Formatting improvements * typo * Update __init__.py * Revert "Update __init__.py" This reverts commit e178a7c. * init * Update to new options API * Missed some * Snatcher Coins fix * Missed some more * some slight touch ups * rewind * a * fix things * Revert "Merge branch 'main' of https://github.com/CookieCat45/Archipelago-ahit" This reverts commit a2360fe, reversing changes made to b8948bc. * Update .gitignore * 1.3.6 * Final touch-ups * Fix client and leftover old options api * Delete setup-ahitclient.py * Update .gitignore * old python version fix * proper warnings for invalid act plandos * Update worlds/ahit/docs/en_A Hat in Time.md Co-authored-by: Danaël V. <[email protected]> * Update worlds/ahit/docs/setup_en.md Co-authored-by: Danaël V. <[email protected]> * 120 char per line * "settings" to "options" * Update DeathWishRules.py * Update worlds/ahit/docs/en_A Hat in Time.md Co-authored-by: Nicholas Saylor <[email protected]> * No more loading the data package * cleanup + act plando fixes * almost forgot * Update Rules.py * a * Update worlds/ahit/Options.py Co-authored-by: Ixrec <[email protected]> * Options stuff * oop * no unnecessary type hints * warn about depot download length in setup guide * Update worlds/ahit/Options.py Co-authored-by: Ixrec <[email protected]> * typo Co-authored-by: Ixrec <[email protected]> * Update worlds/ahit/Rules.py Co-authored-by: Ixrec <[email protected]> * review stuff * More stuff from review * comment * 1.5 Update * link fix? * link fix 2 * Update setup_en.md * Update setup_en.md * Update setup_en.md * Evil * Good fucking lord * Review stuff again + Logic fixes * More review stuff * Even more review stuff - we're almost done * DW review stuff * Finish up review stuff * remove leftover stuff * a * assert item * add A Hat in Time to readme/codeowners files * Fix range options not being corrected properly * 120 chars per line in docs * Update worlds/ahit/Regions.py Co-authored-by: Aaron Wagener <[email protected]> * Update worlds/ahit/DeathWishLocations.py Co-authored-by: Aaron Wagener <[email protected]> * Remove some unnecessary option.class.value * Remove data_version and more option.class.value * Update worlds/ahit/Items.py Co-authored-by: Aaron Wagener <[email protected]> * Remove the rest of option.class.value * Update worlds/ahit/DeathWishLocations.py Co-authored-by: Aaron Wagener <[email protected]> * review stuff * Replace connect_regions with Region.connect * review stuff * Remove unnecessary Optional from LocData * Remove HatType.NONE * Update worlds/ahit/test/TestActs.py Co-authored-by: Aaron Wagener <[email protected]> * fix so default tests actually don't run * Improve performance for death wish rules * rename test file * change test imports * 1000 is probably unnecessary * a * change state.count to state.has * stuff * starting inventory hats fix * shouldn't have done this lol * make ship shape task goal equal to number of tasksanity checks if set to 0 * a * change act shuffle starting acts + logic updates * dumb * option groups + lambda capture cringe + typo * a * b * missing option in groups * c * Fix Your Contract Has Expired being placed on first level when it shouldn't * formatting * major logic bug fix for death wish --------- Co-authored-by: Danaël V. <[email protected]> Co-authored-by: Nicholas Saylor <[email protected]> Co-authored-by: Ixrec <[email protected]> Co-authored-by: Aaron Wagener <[email protected]> Co-authored-by: Fabian Dill <[email protected]>

CookieCat45 and others added 30 commits August 27, 2023 18:46

duh

45ccb99

Fuck it

173896b

Major fixes

cbdf4d9

a

5c49cca

b

6442c40

Even more fixes

906c412

New option - NoFreeRoamFinale

1fd2a21

a

b5475ac

Hat Logic Fix

6d9bfbc

Just to be safe

149a42b

multiworld.random to world.random

2b44619

KeyError fix

0dc211f

Update .gitignore

c0adc90

Update __init__.py

e338826

Zoinks Scoob

a7190b6

ffs

a3fd865

Ruh Roh Raggy, more r-r-r-random bugs!

949f152

0.9b - cleanup + expanded logic difficulty

d673b87

Update Rules.py

77ac8a7

Update Regions.py

2ef4422

Merge branch 'ArchipelagoMW:main' into main

127ce1d

AttributeError fix

1f916e8

0.10b - New Options

215594d

1.0 Preparations

1daafff

Docs

02087ed

Docs 2

32561dd

Fixes

6c56f79

Update __init__.py

da20a77

Fixes

c5b8113

variable capture my beloathed

6cedbe8

CookieCat45 and others added 15 commits May 17, 2024 12:13

dumb

0fcb1a6

Merge branch 'main' into main

b299d96

option groups + lambda capture cringe + typo

3b75bb0

a

f4c7531

b

a543a3a

missing option in groups

6f6bf41

Merge branch 'ArchipelagoMW:main' into main

85b9794

c

2c7ff4b

Merge branch 'main' into main

acdc41e

Fix Your Contract Has Expired being placed on first level when it sho…

445afb9

…uldn't

Merge remote-tracking branch 'origin/main'

b3b2432

Merge remote-tracking branch 'origin/main'

322f482

# Conflicts: # worlds/ahit/Regions.py

formatting

63411f6

major logic bug fix for death wish

814eee2

Merge branch 'ArchipelagoMW:main' into main

238022e

github-actions bot added the waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. label Jun 3, 2024

Exempt-Medic approved these changes Jun 3, 2024

View reviewed changes

Exempt-Medic added the is: bug/fix Issues that are reporting bugs or pull requests that are fixing bugs. label Jun 3, 2024

ScipioWright approved these changes Jun 3, 2024

View reviewed changes

ScipioWright added waiting-on: core-review Issue/PR has been peer-reviewed and is ready to be merged or needs input from a core maintainer. and removed waiting-on: peer-review Issue/PR has not been reviewed by enough people yet. labels Jun 3, 2024

NewSoupVi approved these changes Jun 4, 2024

View reviewed changes

NewSoupVi merged commit 16ae844 into ArchipelagoMW:main Jun 4, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AHIT: Fix Death Wish location rules not being added properly #3455

AHIT: Fix Death Wish location rules not being added properly #3455

CookieCat45 commented Jun 3, 2024

Ixrec commented Jun 3, 2024

CookieCat45 commented Jun 3, 2024

Exempt-Medic left a comment

ScipioWright left a comment

AHIT: Fix Death Wish location rules not being added properly #3455

AHIT: Fix Death Wish location rules not being added properly #3455

Conversation

CookieCat45 commented Jun 3, 2024

What is this fixing or adding?

How was this tested?

If this makes graphical changes, please attach screenshots.

Ixrec commented Jun 3, 2024

CookieCat45 commented Jun 3, 2024

Exempt-Medic left a comment

Choose a reason for hiding this comment

ScipioWright left a comment

Choose a reason for hiding this comment