mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-29 13:23:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
7,004 Commits 122 Branches 55 Tags
81fd1ae88d495b1a4fa057834ecdcfe699203a81
Commit Graph

7004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scipio Wright
81fd1ae88d Remove blank line 2024-08-17 14:08:31 -04:00
Scipio Wright
6dad2fe490 Fix bug in ladder storage rules 2024-08-17 13:17:45 -04:00
Scipio Wright
2527b0f950 Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing 
# Conflicts:
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/items.py
 2024-08-16 19:53:38 -04:00
Scipio Wright
667a2fc82c Make it so the shops show up in the entrance hints 2024-08-16 19:17:51 -04:00
Bryce Wilson
f5218faea7 Pokemon Emerald: Ensure dig tutor is always usable (#3660) 
* Pokemon Emerald: Ensure dig tutor is always usable

* Pokemon Emerald: Clarify comment

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

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
 2024-08-16 22:23:47 +02:00
Exempt-Medic
81092247c6 Core: early_local != local_early #3780 2024-08-16 22:20:20 +02:00
Kaito Sinclaire
ca96e7e294 Fix !remaining for cross-world items (#3732) 
* Fix !remaining for other worlds

* Typing fixes for the previous change

* Update LocationStore test to match what get_remaining now returns
 2024-08-16 22:20:02 +02:00
digiholic
c014c5a54a [OSRS] Fixes Incorrect filler item names causing failures on tests. (#3768) 
* Updates filler item names to match the actual item names

* Adds more descriptive error message in case this error comes back

* Properly raises exception instead of just text

* Replaces exception with assert
 2024-08-16 22:10:30 +02:00
Emily
e9c863dffd Docs: Update 'tag' documentation (#3632) 
* Add tag docs for HintGame

* Apply suggestions from code review

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

* Make Tracker/TextOnly consistent with previous commit

* Apply suggestion

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

* fix spacing

* Apply suggestion

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

* apply suggestion correcting footnotes

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

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
 2024-08-16 21:04:23 +02:00
Mysteryem
7eda4c47f8 TLOZ: Fix non-deterministic item pool generation (#3779) 
* TLOZ: Fix non-deterministic item pool generation

The way the item pool was constructed involved iterating unions of sets.
Sets are unordered, so the order of iteration of these combined sets
would be non-deterministic, resulting in the items in the item pool
being generated in a different order with the same seed.

Rather than creating unions of sets at all, the original code has been
replaced with using Counter objects. As a dict subclass, Counter
maintains insertion order, and its update() method makes it simple to
combine the separate item dictionaries into a single dictionary with the
total count of each item across each of the separate item dictionaries.

Fixes #3664 - After investigating more deeply, the only differences I
could find between generations of the same seed was the order of items
created by TLOZ, so this patch appears to fix the non-deterministic
generation issue. I did manage to reproduce the non-deterministic
behaviour with just TLOZ in the end, but it was very rare. I'm not
entirely sure why generating with SMZ3 specifically would cause the
non-deterministic behaviour in TLOZ to be frequently present, whereas
generating with other games or multiple TLOZ yamls would not.

* Change import order

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
 2024-08-16 20:57:04 +02:00
Scipio Wright
474a3181c6 TUNIC: Give the fox a gun (in logic) (very small PR) (#3790) 
* Add bomb wall logic

* Remove option call from can_shop

* Gun for the envoy blocking Quarry

* has_sword -> can_shop on cube cave entrance region
 2024-08-16 20:53:54 +02:00
Star Rauchenberger
4af6927e23 Lingo: Fixed Initiated-side Eight Door not opening (#3793) 2024-08-16 20:52:16 +02:00
Exempt-Medic
06df072095 Core: Require excluded locations to be reachable with full/locations accessibility (#3802) 
* Make excludeds reachable

* Update all_state tests
 2024-08-16 20:49:37 +02:00
Scipio Wright
f04f99cf3b Fix typo from merge 2024-08-15 18:15:13 -04:00
Scipio Wright
a2db2cec68 Merge branch 'main' into tunc-portal-direction-pairing 2024-08-14 23:14:46 -04:00
agilbert1412
56aabe51b8 Stardew Valley: Add Quality Bobber in the logic rules for fish quality gold and above #3792 2024-08-14 17:07:06 +02:00
Scipio Wright
5e5f24cdd2 TUNIC: Add off and on aliases for the Entrance Rando option #3794 2024-08-14 16:55:02 +02:00
Exempt-Medic
9fbaa6050f I have no idea (#3791) 2024-08-14 00:21:42 -04:00
Scipio Wright
4c2ef0a633 Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing 
# Conflicts:
#	worlds/tunic/__init__.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/rules.py
 2024-08-13 21:02:16 -04:00
Scipio Wright
f75a4e8a4f multiworld. to world. 2024-08-13 20:59:41 -04:00
Scipio Wright
0af31c71e0 TUNIC: Swap from multiworld.get to world.get for applicable things (#3789) 
* Swap from multiworld.get to world.get for applicable things

* Why was this even here in the first place?
 2024-08-14 02:35:08 +02:00
Aaron Wagener
169da1b1e0 Tests: fix the all games multiworld test (#3788) 2024-08-14 00:31:26 +02:00
Aaron Wagener
8e7ea06f39 Core: dump all item placements for generation failures. (#3237) 
* Core: dump all item placements for generation failures

* pass the multiworld from remaining fill

* change how the args get handled to fix formatting

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
 2024-08-14 00:17:42 +02:00
Aaron Wagener
96d48a923a Core: recontextualize CollectionState.collect (#3723) 
* Core: renamed `CollectionState.collect` arg from `event` to `prevent_sweep` and remove forced collection

* Update TestDungeon.py

---------

Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
 2024-08-13 22:28:05 +02:00
Exempt-Medic
dcaa2f7b97 Core: Two Small Fixes (#3782) 2024-08-13 18:02:09 +02:00
NewSoupVi
50330cf32f Core: Remove broken unused code from Options.py (#3781) 
"Unused" is a baseless assertion, but this code path has been crashing on the first statement for 6 months and noone's complained
 2024-08-12 19:32:14 +02:00
Exempt-Medic
67520adcea Core: Error on empty options.as_dict (#3773) 
* Error on empty options.as_dict

* ValueError instead

* Apply suggestions from code review

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>

---------

Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
 2024-08-12 02:13:45 +02:00
Exempt-Medic
a3e54a951f Undertale: Fix slot_data and options.as_dict() (#3774) 
* Undertale: Fixing slot_data

* Booleans were difficult
 2024-08-12 01:53:40 +02:00
qwint
ae0abd3821 Core: change start inventory from pool to warn when nothing to remove (#3158) 
* makes start inventory from pool warn and fixes the itempool to match when it can not find a matching item to remove

* calc the difference correctly

* save new filler and non-removed items differently so we don't remove existing items at random
 2024-08-12 00:57:59 +02:00
Scipio Wright
21bbf5fb95 TUNIC: Add note to Universal Tracker stuff #3772 2024-08-12 00:24:30 +02:00
Jarno
09e052c750 Timespinner: Fix eels check logic #3777 2024-08-12 00:24:09 +02:00
Scipio Wright
68a92b0c6f Clique: Update to new options API (#3759) 2024-08-11 14:47:17 +02:00
Scipio Wright
55a51acb5b Actually make UT work 2024-08-10 19:29:47 -04:00
Scipio Wright
de77886115 Remove debug print 2024-08-10 19:28:00 -04:00
Scipio Wright
2fa2bf7036 Fix parsing shop names in UT 2024-08-10 19:23:34 -04:00
Scipio Wright
8685758702 Merge branch 'main' into tunc-portal-direction-pairing 2024-08-10 15:13:47 -04:00
Scipio Wright
defb5ec280 Add note to fixed shop 2024-08-10 15:04:39 -04:00
Silvris
8e06ab4f68 Core: fix invalid __package__ of zipped worlds (#3686) 
* fix invalid package fix

* add comment describing fix
 2024-08-10 13:49:32 +02:00
black-sliver
9dba39b606 SoE: fix determinism (#3745) 
Fixes randomly placed ingredients not being deterministic (depending on settings)
and in turn also fixes logic not being deterministic if they get replaced by fragments.
 2024-08-10 13:08:24 +02:00
Scipio Wright
6f20c8a262 Fix weird edge case that is technically user error 2024-08-09 21:33:29 -04:00
Scipio Wright
b559422450 Make seed groups in decoupled with overlapping but not fully overlapped plando connections interact nicely without messing with what the entrances look like in the spoiler log 2024-08-09 20:59:03 -04:00
Scipio Wright
df0aa3c181 Remove extra plando connections definition in options 2024-08-09 18:59:38 -04:00
Scipio Wright
7ce43df0b6 Remove unused safety thing 2024-08-09 18:10:30 -04:00
Scipio Wright
fc80375cdd Add todo note 2024-08-09 17:33:36 -04:00
Scipio Wright
ccaedd8fe6 Add some more comments 2024-08-09 17:25:04 -04:00
Exempt-Medic
a6f376b02e TLOZ: world: multiworld (#3752) 2024-08-09 22:38:42 +02:00
Kaito Sinclaire
c66a8605da DOOM, DOOM II: Update steam URLs (#3746) 2024-08-09 17:04:59 +02:00
Mysteryem
ac7590e621 HK: fix iterating all worlds instead of only HK worlds in stage_pre_fill (#3750) 
Would cause generation to fail when generating with HK and another game.

Mistake in 6803c373e5.
 2024-08-09 17:02:41 +02:00
Scipio Wright
56e3b12f68 Fix exception text to be shorter 2024-08-09 10:37:46 -04:00
Scipio Wright
58be6d2077 Fix typo 2024-08-09 10:30:53 -04:00