* enable some upstream settings
* flashing just disabled, no setting
* just enable fast text
* noflash and textmode as hidden options
* typo
* drop whitespace changes
* add hard mode to slot data
* textmode adjustments
fast text default (fixing mistake)
remove no text option (its buggy)
* unhide options
* Update worlds/ladx/Options.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* adjustments
* Also indents plando_connections properly
* Adding apostrophe quotes around item, location, entrance/exit and boss names to make errors more readable
* Update plando_en.md
* Fixing test in Lufia II
When running Generate.py, uncaught exceptions are logged once to a file and twice to the console due to keeping the original excepthook. We can avoid this by filtering the file log out of the stream handler.
The `REGION_DEWFORD_TOWN/MAIN -> REGION_ROUTE109/BEACH` and
`REGION_ROUTE109/BEACH -> REGION_DEWFORD_TOWN/MAIN` entrances require
access to the
`REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN -> REGION_DEWFORD_TOWN/MAIN`
entrance in their access rules, so require indirect conditions for the
parent_region of the entrance: `REGION_ROUTE104_MR_BRINEYS_HOUSE/MAIN`.
* synonyms to new file, many added
* handle singular rupee
* remove redundant map and compass entries
* automatic pluralization
* add guardian acorn and piece of power
* move phrases to ItemIconGuessing.py
* organize, comment
* fix tab spacing
* fix
* add tunic and noita synonyms
* remove triangle instrument synonym
* reorganize, add some matches
* add tunic lucky up
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update worlds/ladx/ItemIconGuessing.py
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* handle camelCase and single rupee
* add indicate_progression option
Adds alternative system for foreign item icons that simply indicates whether or not the item is a progression item.
* improve splitting
drops some more characters, and also dont bother with rejoined stuff in name_cache because our splitting is better
* the witness stuff
* forbid more
* remove boost and surge
* Update worlds/ladx/ItemIconGuessing.py
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* match by game name
look at the name of the foreign game and only use game-specific entries for that game
* show message for all key drops
* updates from async test
* vi suggestions
* Adding FNAFW suggestions from @lolz1190 (#40)
* Adding FNAFW suggestions from @lolz1190
* missing comma
---------
Co-authored-by: threeandthreee <a.l.nordstrom@gmail.com>
---------
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: palex00 <32203971+palex00@users.noreply.github.com>
* Docs: Dev FAQ - About indirect conditions
I wrote up a big effortpost about indirect conditions for nex on the [DS3 3.0 PR](https://github.com/ArchipelagoMW/Archipelago/pull/3128#discussion_r1693843193).
The version I'm [PRing to the world API document](https://github.com/ArchipelagoMW/Archipelago/pull/3552) is very brief and unnuanced, because I'd rather people use too many indirect conditions than too few.
But that might leave some devs wanting to know more.
I think that comment on nex's DS3 PR is probably the best detailed explanation for indirect conditions that exists currently.
So I think it's good if it exists somewhere. And the FAQ doc seems like the best place right now, because I don't want to write an entirely new doc at the moment.
* Actually copy in the text
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: qwint <qwint.42@gmail.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: qwint <qwint.42@gmail.com>
* Update apworld_dev_faq.md
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update apworld_dev_faq.md
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update apworld_dev_faq.md
* Update docs/apworld_dev_faq.md
Co-authored-by: qwint <qwint.42@gmail.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: qwint <qwint.42@gmail.com>
* fix the last couple of wording issues I have with the indirect condition section to apworld dev faq doc
* I didn't like that wording
* Apply suggestions from code review
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Apply suggestions from code review
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update docs/apworld_dev_faq.md
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Update docs/apworld_dev_faq.md
* Update docs/apworld_dev_faq.md
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* Add panel hunt plando option
* Keys are strs
* oops
* better message
* ,
* this doesn ot need to be here
* don't replace pre picked panels
* Update options.py
* rebase error
* rebase error
* oops
* Mypy
* ruff
* another rebase error
* actually this is a stupid change too
* bring over that change™️
* Update entity_hunt.py
* Update entity_hunt.py
* Update entity_hunt.py
Generation on Python 3.12 would print SyntaxWarnings due to invalid '\d'
escape sequences added in #3832.
Use raw strings to avoid `\` being used to escape characters.
* sm64ex: Rework logic for 100 Coins
* sm64ex: 100 Coins Vanilla Option
* sm64ex: Avoiding raw int comparisons for 100 coin option
* sm64ex: Change 100 coin option from toggle to choice
* sm64ex: use snake_case for 100 coin option
* just use "vanilla" for option comparison (exempt-medic feedback)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* sm64ex: remove vanilla 100 coins from item pool to remove overfilling stars
* yeah
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Remove range condition (35 is the min for total stars)
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Add the cotm package with working seed playthrough generation.
* Add the proper event flag IDs for the Item codes.
* Oooops. Put the world completion condition in!
* Adjust the game name and abbreviations.
* Implement more settings.
* Account for too many start_inventory_from_pool cards with Halve DSS Cards Placed.
* Working (albeit very sloooooooooooow) ROM patching.
* Screw you, bsdiff! AP Procedure Patch for life!
* Nuke stage_assert_generate as the ROM is no longer needed for that.
* Working item writing and position adjusting.
* Fix the magic item graphics in Locations wherein they can be fixed.
* Enable sub-weapon shuffle
* Get the seed display working.
* Get the enemy item drop randomization working. Phew!
* Enemy drop rando and seed display fixes.
* Functional Countdown + Early Double setting
* Working multiworld (yay!)
* Fix item links and demo shenanigans.
* Add Wii U VC hash and a docs section explaining the rereleases.
* Change all client read/writes to EWRAM instead of Combined WRAM.
* Custom text insertion foundations.
* Working text converter and word wrap detector.
* More refinements to the text wrap system.
* Well and truly working sent/received messages.
* Add DeathLink and Battle Arena goal options.
* Add tracker stuff, unittests, all locations countdown, presets.
* Add to README, CODEOWNERS, and inno_setup
* Add to README, CODEOWNERS, and inno_setup
* Address some suggestions/problems.
* Switch the Items and Locations to using dataclasses.
* Add note about the alternate classes to the Game Page.
* Oooops, typo!
* Touch up the Options descriptions.
* Fix Battle Arena flag being detected incorrectly on connection and name the locked location/item pairs better.
* Implement option groups
* Swap the Lizard-man Locations into their correct Regions.
* Local start inventory, better DeathLink message handling, handle receiving over 255 of an item.
* Update the PopTracker pack links to no longer point to the Releases page.
* Add Skip Dialogues option.
* Update the presets for the accessibility rework.
* Swap the choices in the accessibility preset options.
* Uhhhhhhh...just see the apworld v4 changelog for this one.
* Ooops, typo!
* .
* Bunch of small stuff
* Correctly change "Fake" to "Breakable" in this comment.
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Make can_touch_water one line.
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Make broke_iron_maidens one line.
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Fix majors countdown and make can_open_ceremonial_door one line.
* Make the Trap AP Item less obvious.
* Add Progression + Useful stuff, patcher handling for incompatible versions, and fix some mypy stuff.
* Better option groups.
* Change Early Double to Early Escape Item.
* Update DeathLink description and ditch the Menu region.
* Fix the Start Broken choice for Iron Maiden Behavior
* Remove the forced option change with Arena goal + required All Bosses and Arena.
* Update the Game Page with the removal of the forced option combination change.
* Fix client potential to send packets nonstop.
* More review addressing.
* Fix the new select_drop code.
* Fix the new select_drop code for REAL this time.
* Send another LocationScout if we send Location checks without having the Location info.
---------
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: Exempt-Medic <ExemptMedic@Gmail.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Add more panels that should be panels
* Make it so the caves panel items don't exist in early caves
* Remove unused import
* oops
* Remove Jungle to Monastery Garden from usefulification list
* Add a basic test
* ruff
---------
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
* proguseful
* ruff
* variable rename
* variable rename
* Better (?) comment
* Better way to do this? I guess
* sure
* ruff
* Eh, it's not worth it. Here's the much simpler version
* don't need this now
* Improve some classification checks while we're at it
* Only proguseful obelisk keys if eps are individual
* Vi don't forget about itemlinks challenge difficulty impossible
* People other than Vi also don't forget about ItemLinks challenge difficulty impossible
This PR is mainly refactoring. Here is what changed:
- Changing item names so that each words are capitalized (`Energy Form` instead of `Energy form`)
- Removing duplication of string literal by using:
- Constants for items and locations,
- Region's name attribute for entrances,
- Clarify some documentations,
- Adding some region to be more representative of the game and to remove listing of locations in the rules (prioritize entrance rules over individual location rules).
This is the other minor modifications that are not refactoring:
- Adding an early bind song option since that can be used to exit starting area.
- Changing Sun God to Lumerean God to be coherent with the other gods.
- Changing Home Water to Home Waters and Open Water to Open Waters to be coherent with the game.
- Removing a rules to have an attack to go in Mithalas Cathedral since you can to get some checks in it without an attack.
- Adding some options to slot data to be used with Poptracker.
- Fixing a little but still potentially logic breaking bug.
* Raft: Place locked items in create_items and fix get_pre_fill_items
`pre_fill` runs after item plando, and item plando could place an item
at a location where Raft was intending to place a locked item, which
would crash generation.
This patch moves the placement of these locked items earlier, into
`create_items`.
Setting items into `multiworld.raft_frequencyItemsPerPlayer` for each
player has been replaced with passing `frequencyItems` to the new
`place_frequencyItems` function.
`setLocationItem` and `setLocationItemFromRegion` have been moved into
the new `place_frequencyItems` function so that they can capture the
`frequencyItems` argument variable.
The `get_pre_fill_items` function could return a list of all previously
placed items across the entire multiworld which was not correct. It
should have returned the items in
`multiworld.raft_frequencyItemsPerPlayer[self.player]`. Now that these
items are placed in `create_items` instead of `pre_fill`,
`get_pre_fill_items` is no longer necessary and has been removed.
* self.multiworld.get_location -> self.get_location
Changed the occurences in the modified code.
* Saving Princess: initial commit
* settings -> options
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* settings -> options
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* replace RegionData class with List[str]
RegionData was only wrapping a List[str], so we can directly use List[str]
* world: MultiWorld -> multiworld: MultiWorld
* use world's random instead of multiworld's
* use state's has_any and has_all where applicable
* remove unused StartInventory import
* reorder PerGameCommonOptions
* fix relative AutoWorld import
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
* clean up double spaces
* local commands -> Local Commands
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* remove redundant which items section
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
* game info rework
* clean up item count redundancy
* add game to readme and codeowners
* fix get_region_entrance return type
* world.multiworld.get -> world.get
* add more events
added events for the boss kills that open the gate, as well as for system power being restored
these only apply if expanded pool is not selected
* add client/autoupdater to launcher
* reorder commands in game info
* update docs with automated installation info
* add quick links to doc
* Update setup_en.md
* remove standalone saving princess client
* doc fixes
* code improvements and redundant default removal
as suggested by @Exempt-Medic
this includes the removal of events from the item/location name to id, as well as checking for the player name being ASCII
* add option to change launch coammnd
the LaunchCommand option is filled to either the executable or wine with the necessary arguments based on Utils.is_windows
* simplify valid install check
* mod installer improvements
now deletes possible existing files before installing the mod
* add option groups and presets
* add required client version
* update docs about cheat items pop-ups
items sent directly by the server (such as with starting inventory) now have pop-ups just like any other item
* add Steam Input issue to faq
* Saving Princess: BRAINOS requires all weapons
* Saving Princess: Download dll and patch together
Previously, gm-apclientpp.dll was downloaded from its own repo
With this update, the dll is instead extracted from the same zip as the game's patch
* Saving Princess: Add URI launch support
* Saving Princess: goal also requires all weapons
given it's past brainos
* Saving Princess: update docs
automatic connection support was added, docs now reflect this
* Saving Princess: extend([item]) -> append(item)
* Saving Princess: automatic connection validation
also parses the slot, password and host:port into parameters for the game
* Saving Princess: change subprocess .run to .Popen
This keeps the game from freezing the launcher while it is running
---------
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Fully updates requirements.py to live LADXR (#19)
* Updates dungeon2.py to LADXR-Live (#20)
No logic changes or bugfix are in this file. It is only code cleanup.
* Update dungeon1.py (#21)
- The Three of a Kind with Bomb is moved from Normal to Hard Logic
The rest is code cleanup.
lines 22-25 | 22-26 & 33 | 34 remain different in AP | Upstream with no effective difference
* Fully updates dungeon3.py to LADXR-live (#22)
Logic Changes:
- Hard mode now considers killing the enemies in the top room with pot
Everything else is cleanup.
* Fully update dungeon4.py to LADXR-live logic (#23)
Logic Changes:
- Hard Logic: Removes Feather requirement from grabbing the Pit Key
- Hell logic: new hookshot clip (line 64)
- Hell logic: hookshot spam over the first pit of crossroads, then buffer down (line 69)
- Hell logic: push block left of keyblock up, then shaq jump off the left wall and pause buffer to land on keyblock.
- Hell logic: split zol for more entities, and clip through the block left of keyblock by hookshot spam
The rest is code cleanup
* Updates dungeon5.py mostly to LADXR-Live Logic (#24)
Logic Changes:
- Hell logic: use zoomerang dashing left to get an unclipped boots superjump off the right wall over the block. reverse is push block (line 69)
The rest is cleanup.
The upstream splits the post_gohma region into pre_gohma, gohma and post_gohma. I did not implement this yet as I do not know the implications. To port this the following lines need to be changed (AP | LADXR):
18 | 18-20;
55 | 58;
65 | 68-69
* Fully update dungeon6.py logic (#25)
Logic Changes:
- Hard logic: allow damage boosting past the mini thwomps
- Glitched logic: bomb triggering elephants in two cases
Everything else is cleanup
* Fully update dungeon7.py to LADXR-live logic (#26)
Logic Changes:
- Hard logic: Three of a Kind is now possible with bombs only
Everything else is code cleanup
* Fully updates dungeon8.py to LADXR-live (#27)
Logic change:
- Hard logic: allows to drop the Gibdos into holes as a way to kill them
- Glitched logic: underground section with fire balls jumping up out of lava. Use boots superjump off left wall to jump over the pot blocking the way
The rest is code cleanup
* Fully update dungeonColor.py to LADXR-live (#28)
Logic changes:
- Normal logic: Karakoros now need power bracelet to put them into their holes
- Hard logic: Karakoros without power bracelet but with weapon
- Hell logic: Karakoros with only bombs
Everything else is code cleanup
* Updating overworld.py (#29)
* Updating overworld.py
This tries to update all logic of the Overworld.
Logic changes include:
- Normal logic: requires hookshot or shield to traverse Armos Cave
- Hard logic: Traverse Armos Cave with nothing (formerly normal logic)
- Hard logic: get the animal village bomb cave check with jump and boomerang
- Hard logic: use rooster to go to D7
- Lots of Jesus Rooster Jumps
I stopped counting and need to go over this again.
Also, please investigate line 474 AP because it's removed in LADXR-Upstream and I don't know why.
* remove featherless fisher under bridge from hard
it was moved to hell upstream and its already present in our code
---------
Co-authored-by: Alex Nordstrom <a.l.nordstrom@gmail.com>
* fixes
* add test messages
* Adds Pegasus Boots to the test (#31)
* Fix d6 boss_key logic (#30)
* restore hardmode logic
* higher logic fixes
* add bush requirement to the raft
in case the player needs to farm rupees to play again
---------
Co-authored-by: palex00 <32203971+palex00@users.noreply.github.com>
* add groups and a preset
* formatting
* typing
* alias groups for progressive items
* add bush breakers item group
* fix typo
* some manual location groups
* drop dummy dungeon items from groups
* text shuffle exclusions
Exclude owl statues, library books, goal sign, signpost maze, and various rupee prices from text shuffle
* clearer variable name
threeandthreee
palex00
Scipio Wright
Louis M
Bryce Wilson
NewSoupVi
qwint
Benjamin S Wolf
Mysteryem
josephwhite
LiquidCat64
Justus Lind
Jouramie
Exempt-Medic
Star Rauchenberger
black-sliver
Fabian Dill
LeonarthCG
Nicholas Saylor
nmorale5