Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from ArchipelagoMW:main #46

Merged
merged 120 commits into from
Nov 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
a0f49dd
Noita: Add the useful classification to important perks, making them …
ScipioWright Oct 17, 2024
ff297f2
[Aquaria] Adds Poptracker Pack to the Aquaria Setup Guides (#4037)
palex00 Oct 17, 2024
63d4715
Pokemon Emerald: Add flag for shoal cave to bounces (#4021)
Zunawe Oct 17, 2024
ede59ef
WebHost: Fix NamedRange option dropdown being blank instead of custom…
remyjette Oct 17, 2024
af14045
Yacht Dice: Proguseful items: Dice and 100 Points #4070
spinerak Oct 19, 2024
c6d2971
WebHost: optimize WebHost theme PNGs (#4071)
black-sliver Oct 20, 2024
f709d61
WebHost: optimize header-logo.svg (#4073)
black-sliver Oct 20, 2024
703e339
Yacht Dice: Fix logic (again) so that score doesn't drop when receivi…
spinerak Oct 22, 2024
049a878
Core: fix pickling plando connections (#4054)
Silvris Oct 22, 2024
05ec14e
HK: Replace "Hook" in PreciseMovement description to "Claw" (#4078)
Nocallia Oct 22, 2024
33daebe
TUNIC: Add prog + useful to some items #4066
ScipioWright Oct 23, 2024
77ee6d7
Setup: more typing (#4089)
black-sliver Oct 25, 2024
af77b76
Core: fix item links for alternate menu regions #4097
qwint Oct 26, 2024
cd7b1df
OoT: fix plando/item links (again) #4098
Silvris Oct 26, 2024
5d4684f
WebHost: restore fragment links for glossary and faq and make titles …
black-sliver Oct 26, 2024
d61a76f
Setup: SNI: separate win7/non-win7 build, update macos naming (#4088)
black-sliver Oct 26, 2024
daad3d0
SM64ex: Add links to documentation for makeflags and patches #4092
nicholassaylor Oct 26, 2024
579abb3
Properly fall back to a world's `rich_text_options_doc` (#4109)
nex3 Oct 27, 2024
b27f667
Core: Add Version string to Launcher title (#4107)
PoryGone Oct 28, 2024
d15fa57
Yacht Dice: Textual fixes and changes (Docs / yaml description) (#3967)
spinerak Oct 28, 2024
9b5a2be
[KH2] Add new Poptracker Pack to the KH2 Setup Guide (#4104)
palex00 Oct 28, 2024
382a5df
macos: fix crash when 'Open Patch' is used (#4108)
black-sliver Oct 28, 2024
3f6754d
Docs: Update Information about Running Unittests (#4093)
nicholassaylor Oct 28, 2024
f10eb85
Pokemon Emerald: Add some warnings to option descriptions (#4114)
Zunawe Oct 28, 2024
594a832
TUNIC: Add link to logic tricks doc (#4087)
ScipioWright Oct 28, 2024
f3c5981
Lingo: Update documentation for panel shuffle (#4086)
hatkirby Oct 28, 2024
edacc07
OSRS: Add missing indirect conditions (#4029)
Mysteryem Oct 28, 2024
4dde3a2
[DS3] Remind players to remove the old dinput8.dll (#4034)
nex3 Oct 28, 2024
b6c58c5
TUNIC: Minor revision to IG and LS option descriptions #4115
ScipioWright Oct 29, 2024
1541f46
oc2: Reduce calls to meets_requirements (#4060)
Zannick Oct 29, 2024
14c7b22
Pokemon Emerald: Update changelog (#4112)
Zunawe Oct 29, 2024
4503ba7
Pokemon Emerald: Link to Rom Changes in Game Page (#4090)
nicholassaylor Oct 29, 2024
ad40acd
Lingo: Mark Eight Room -> The Incomparable as a warp (#4119)
hatkirby Oct 29, 2024
f00975c
Tests: Add a test that weights file generates different results per p…
alwaysintreble Oct 30, 2024
aaf25f8
Tests: add test that option classes aren't reused (#3530)
alwaysintreble Oct 30, 2024
0b5c7fe
HK: fix grubhunt required grubs count (#4094)
qwint Oct 30, 2024
085b655
SNIClient: log exceptions and keep task alive (#3911)
beauxq Oct 30, 2024
f7b9ac9
WebHost: improve image asset loading performance (#4123)
black-sliver Oct 31, 2024
1323474
Tests: Update test_fill.py to use Options API (#4128)
nicholassaylor Nov 1, 2024
931e335
Generate: Prevent ini Files from Being Included in YAML Discovery (#4…
nicholassaylor Nov 1, 2024
0486589
Core: The Item Links fix to end them all (for now, hopefully) (#4096)
NewSoupVi Nov 3, 2024
96abc32
SC2: Small bugfix for SC2 logic #4126
Ziktofel Nov 3, 2024
504ecea
Pokemon Emerald: Prevent evolution fanfare from being replaced with f…
Zunawe Nov 3, 2024
d1dee22
Launcher: Add link to the official site #4091
nicholassaylor Nov 3, 2024
a64548a
ChecksFinder: Update description (#4145)
SunCatMC Nov 4, 2024
6d0f0d2
LTTP: Update tests to use bases.py #4140
nicholassaylor Nov 4, 2024
72d2a33
Lufia 2: Update tests to bases.py #4136
nicholassaylor Nov 4, 2024
08b99b8
LADX: Update tests to use bases.py #4139
nicholassaylor Nov 4, 2024
e2e5c51
Rogue Legacy: Remove item/location id overlap rejection code. (#3893)
ThePhar Nov 5, 2024
5dfb2c5
DLC Quest: Update tests to use bases.py #4141
nicholassaylor Nov 6, 2024
9082ce7
Pokemon Emerald: Update tests to use bases.py #4142
nicholassaylor Nov 6, 2024
1cba694
Bumper Stickers: Update tests to bases.py #4137
nicholassaylor Nov 6, 2024
7449bf6
ALttP: Use auto indirect conditions (#4153)
Mysteryem Nov 7, 2024
a0207e0
Setup: exclude zstandard (#4155)
black-sliver Nov 7, 2024
345d515
WebHost: fix missing timezone in tracker if-modified-since handling (…
black-sliver Nov 7, 2024
a29205b
Core: Add Item.excludable helper function (#4080)
NewSoupVi Nov 7, 2024
639b959
sm64ex: Make the Exclamation Boxes option a Toggle (#4152)
remyjette Nov 7, 2024
2bdc1e0
Checksfinder: clean up setup guide intro and change ownership #4147
SunCatMC Nov 7, 2024
f52d65a
Pokemon RB: make stage_post_fill deterministic (#4008)
Mysteryem Nov 8, 2024
f407283
TUNIC: Add Shop indirect condition (#4160)
Mysteryem Nov 8, 2024
aae8b16
CV64: Remove multiworld random usage #4156
LiquidCat64 Nov 8, 2024
930529e
DS3: Update tests to use bases.py (#4138)
nicholassaylor Nov 9, 2024
6b4f6eb
Update to Muse Dash v4.9.0 [Ensemble Arcanum] (#4095)
DeamonHunter Nov 9, 2024
fa93bc5
The Witness: Get rid of Menu region, prepare for other worlds to chan…
NewSoupVi Nov 9, 2024
9be996b
Core: downgrade websockets and minor fixes (#4166)
black-sliver Nov 10, 2024
b3e5ef8
WebHost: update werkzeug (#4167)
black-sliver Nov 10, 2024
f3413e9
Factorio: support 2.0 update (#4110)
Berserker66 Nov 11, 2024
432d8fa
[PKMN RB] Adds slot data that tells the tracker V5 logic should be co…
palex00 Nov 11, 2024
10bc05a
Update codeQL to v3 (#4143)
nicholassaylor Nov 11, 2024
74f922e
MMBN3: Typo for SloGauge (#3457)
Hexadigital Nov 11, 2024
17f03bb
Stardew valley: Fixed furnace logic bug (#4163)
agilbert1412 Nov 12, 2024
8b87e20
DLCQuest: Use options API for campaign and remove unused imports in t…
nicholassaylor Nov 12, 2024
85159a4
Factorio: Fix satellite goal (#4183)
CaitSith2 Nov 13, 2024
c295926
Landstalker: remove global ref to multiworld (#4175)
Zannick Nov 13, 2024
eac3e3c
Tests: Add ignore filter to s2clientprotocol warnings (#4180)
nicholassaylor Nov 13, 2024
8f60a4a
Core: Detect and account for apworlds being downloaded with a (1) in …
silasary Nov 14, 2024
c9e63a8
CV64: Fix some textbox message truncation issues #4157
LiquidCat64 Nov 14, 2024
7916d1e
CV64: Fix DeathLink Nitro explosions hitting you at times they should…
LiquidCat64 Nov 14, 2024
dd659de
DS3: List compatible static randomizer versions in slot data (#4178)
nex3 Nov 14, 2024
6c9b7ec
Core: Fix Template Yamls for games with colon in name (#4106)
gurglemurgle5 Nov 14, 2024
70b9b97
[PKMN RB] Fixes faulty logic in Victory Road 1 #4191
palex00 Nov 14, 2024
2a85026
docs: Add @BrandenEK as codeowner (#4177)
BrandenEK Nov 14, 2024
a734d25
PKMN R/B: Don't change classification of items from other worlds #4192
Exempt-Medic Nov 15, 2024
f9c6ecc
Webhost: fix doc and yaml filenames / install paths (#4193)
black-sliver Nov 15, 2024
9ba6132
Launcher: change import order to fix ModuleUpdate (#4194)
black-sliver Nov 16, 2024
5141f36
WebHost: Fix 500 server errors for hints involving ItemLink slots on …
ThePhar Nov 16, 2024
66314de
Subnautica: compose DeathLink custom text instead of overwriting (#4172)
Berserker66 Nov 16, 2024
73146ef
Tests: Use Option.from_any instead of Option() in test_pickle_dumps, …
NewSoupVi Nov 17, 2024
7eb1217
Core: Fix empty rule comparisons with subclasses (#4201)
Mysteryem Nov 17, 2024
a3d6036
Factorio: energy link bridge improvements (#4182)
CaitSith2 Nov 17, 2024
75e18e3
Aquaria: Fixing no progression bug (#4199)
tioui Nov 17, 2024
9c102da
The Witness: Allow setting the puzzle randomization seed yourself (#4…
NewSoupVi Nov 18, 2024
baf291d
TLOZ: Assorted Logic Fixes (#4203)
t3hf1gm3nt Nov 18, 2024
bd5c8ec
MM2: minor bugfixes (#4190)
Silvris Nov 18, 2024
4b80b78
Stardew Valley: Removed Walnutsanity and Filler buffs from the all ra…
agilbert1412 Nov 18, 2024
01c6037
TUNIC: Fix a few missing tricks in logic (#4132)
ScipioWright Nov 18, 2024
3ae8992
Clients: fix high CPU usage when launched via MultiProcessing (#4209)
black-sliver Nov 18, 2024
85a7137
Tests: have option preset validation test do full validation (#4208)
alwaysintreble Nov 18, 2024
48ea274
MultiServer: persist hints even if previously found (#4214)
qwint Nov 19, 2024
124ce13
Core: improve error message for missing "game" entry in yaml (#4185)
beauxq Nov 20, 2024
859ae87
Launcher: ports the _stop fix in the Launcher kivy App to handle_url …
qwint Nov 21, 2024
d4b1351
Aquaria: Remove BaseException handling from create_item (#4218)
Mysteryem Nov 21, 2024
2424b79
OSRS: Fixes to Logic errors related to Max Skill Level determining wh…
digiholic Nov 22, 2024
ba50c94
AHiT: Fix reconnecting rift access regions for starting and plando ac…
Mysteryem Nov 22, 2024
5729b78
TUNIC: Fix it so item linked locations are correct in slot data (#4105)
ScipioWright Nov 23, 2024
03b90cf
Timespinner: Re-added missing enmemy rando option #4235
Jarno458 Nov 24, 2024
36f1711
Kingdom Hearts: Minor Logic Fixes (#4236)
gaithern Nov 24, 2024
a650e90
TUNIC: Add clarifying comment to item links handling #4233
ScipioWright Nov 24, 2024
e6e31a2
SC2: Fix Nondeterministic Behavior (#4246)
Exempt-Medic Nov 25, 2024
0ad5b0a
[FFMQ] Fix all checks sending on hard reset + stronger read validatio…
wildham0 Nov 25, 2024
d3a3c29
Landstalker: Fix Nondeterministic Behavior #4245
Exempt-Medic Nov 25, 2024
41a7d7e
HK: Fix Nondeterministic Behavior #4244
Exempt-Medic Nov 25, 2024
6073d5e
Lufia2: Fix Nondeterministic Behavior #4243
Exempt-Medic Nov 25, 2024
fcaba14
Zillion: Add display_name to ZillionSkill #4241
Exempt-Medic Nov 25, 2024
0dade05
SC2: Fix wrongly classified location type (#4249)
Ziktofel Nov 25, 2024
7562404
Stardew Valley: Make progressive movie theater a progression trap (#3…
agilbert1412 Nov 26, 2024
dbf284d
The Witness: Give an actual name to the new option (lol) #4238
NewSoupVi Nov 27, 2024
e882c68
Stardew Valley - Update documentation 5.x.x links into 6.x.x links #4255
agilbert1412 Nov 27, 2024
6c939d2
The Witness: Rename "Panel Hunt Settings" to "Panel Hunt Options" (#4…
NewSoupVi Nov 27, 2024
334781e
Core: purge py3.8 and py3.9 (#3973)
Berserker66 Nov 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
OSRS: Fixes to Logic errors related to Max Skill Level determining wh…
…en Regions are accessible (ArchipelagoMW#4188)

* Removes explicit indirect conditions

* Changes special rules function add rule instead of setting, and call it unconditionally

* Fixes issues in rule generation that have been around but unused the whole time

* Finally moves rules out into a separate file. Fixes level-related logic

* Removes redundant max skill level checks on canoes, since they're in the skill training rules now

* For some reason, canoe logic assumed you could always walk from lumbridge to south varrock without farms. This has been fixed

* Apply suggestions from code review

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

* Quests now respect skill limits and can be excluded. Tasks that take multiple skills how actually check all skills

* Adds alternative route for cooking that doesn't require fishing

* Remove debug code

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 22, 2024
commit 2424b79626ee4e227ce3579c6c2d4a8cee7dca86
6 changes: 3 additions & 3 deletions worlds/osrs/LogicCSV/locations_generated.py
Original file line number Diff line number Diff line change
@@ -57,11 +57,11 @@
LocationRow('Catch a Swordfish', 'fishing', ['Lobster Spot', ], [SkillRequirement('Fishing', 50), ], [], 12),
LocationRow('Bake a Redberry Pie', 'cooking', ['Redberry Bush', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 10), ], [], 0),
LocationRow('Cook some Stew', 'cooking', ['Bowl', 'Meat', 'Potato', ], [SkillRequirement('Cooking', 25), ], [], 0),
LocationRow('Bake an Apple Pie', 'cooking', ['Cooking Apple', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 30), ], [], 2),
LocationRow('Bake an Apple Pie', 'cooking', ['Cooking Apple', 'Wheat', 'Windmill', 'Pie Dish', ], [SkillRequirement('Cooking', 32), ], [], 2),
LocationRow('Bake a Cake', 'cooking', ['Wheat', 'Windmill', 'Egg', 'Milk', 'Cake Tin', ], [SkillRequirement('Cooking', 40), ], [], 6),
LocationRow('Bake a Meat Pizza', 'cooking', ['Wheat', 'Windmill', 'Cheese', 'Tomato', 'Meat', ], [SkillRequirement('Cooking', 45), ], [], 8),
LocationRow('Burn some Oak Logs', 'firemaking', ['Oak Tree', ], [SkillRequirement('Firemaking', 15), ], [], 0),
LocationRow('Burn some Willow Logs', 'firemaking', ['Willow Tree', ], [SkillRequirement('Firemaking', 30), ], [], 0),
LocationRow('Burn some Oak Logs', 'firemaking', ['Oak Tree', ], [SkillRequirement('Firemaking', 15), SkillRequirement('Woodcutting', 15), ], [], 0),
LocationRow('Burn some Willow Logs', 'firemaking', ['Willow Tree', ], [SkillRequirement('Firemaking', 30), SkillRequirement('Woodcutting', 30), ], [], 0),
LocationRow('Travel on a Canoe', 'woodcutting', ['Canoe Tree', ], [SkillRequirement('Woodcutting', 12), ], [], 0),
LocationRow('Cut an Oak Log', 'woodcutting', ['Oak Tree', ], [SkillRequirement('Woodcutting', 15), ], [], 0),
LocationRow('Cut a Willow Log', 'woodcutting', ['Willow Tree', ], [SkillRequirement('Woodcutting', 30), ], [], 0),
2 changes: 1 addition & 1 deletion worlds/osrs/Names.py
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ class RegionNames(str, Enum):
Mudskipper_Point = "Mudskipper Point"
Karamja = "Karamja"
Corsair_Cove = "Corsair Cove"
Wilderness = "The Wilderness"
Wilderness = "Wilderness"
Crandor = "Crandor"
# Resource Regions
Egg = "Egg"
Loading