* Core: Move connection.parent_region assert to can_reach
This is how it already works for locations and it feels more correct to me to check in the place where the crash would happen.
Also update location error to be a bit more verbose
* Bring back the other assert
* Update BaseClasses.py
* Added contained games of a seed to the user content page as tooltip.
* Changed sort handling.
* Limited amount of shown games.
* Added missing dashes.
Co-authored-by: Kory Dondzila <kory.dondzila@atomicobject.com>
* Closing a-tags.
Co-authored-by: Kory Dondzila <kory.dondzila@atomicobject.com>
* Closing a-tags.
Co-authored-by: Kory Dondzila <kory.dondzila@atomicobject.com>
* Moved games list to table cell level.
Co-authored-by: Kory Dondzila <kory.dondzila@atomicobject.com>
* Moved games list to table cell level.
---------
Co-authored-by: Kory Dondzila <kory.dondzila@atomicobject.com>
* 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 e178a7c0a6904ace803241cab3021d7b97177e90.
* 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 a2360fe197e77a723bb70006c5eb5725c7ed3826, reversing
changes made to b8948bc4958855c6e342e18bdb8dc81cfcf09455.
* 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. <104455676+ReverM@users.noreply.github.com>
* Update worlds/ahit/docs/setup_en.md
Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>
* 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 <79181893+nicholassaylor@users.noreply.github.com>
* 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 <ericrhitchcock@gmail.com>
* Options stuff
* oop
* no unnecessary type hints
* warn about depot download length in setup guide
* Update worlds/ahit/Options.py
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* typo
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* Update worlds/ahit/Rules.py
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* 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 <mmmcheese158@gmail.com>
* Update worlds/ahit/DeathWishLocations.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* Remove some unnecessary option.class.value
* Remove data_version and more option.class.value
* Update worlds/ahit/Items.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* Remove the rest of option.class.value
* Update worlds/ahit/DeathWishLocations.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* 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 <mmmcheese158@gmail.com>
* 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
* yche fix
* formatting
* major logic bug fix for death wish
* Update Regions.py
* Add missing indirect connections
* Fix generation error from chapter 2 start with act shuffle off
* a
* Revert "a"
This reverts commit df58bbcd998585760cc6ac9ea54b6fdf142b4fd1.
* Revert "Fix generation error from chapter 2 start with act shuffle off"
This reverts commit 0f4d441824af34bf7a7cff19f5f14161752d8661.
* Fix option typo
* I lied, it's actually two lines
---------
Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
* 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 e178a7c0a6904ace803241cab3021d7b97177e90.
* 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 a2360fe197e77a723bb70006c5eb5725c7ed3826, reversing
changes made to b8948bc4958855c6e342e18bdb8dc81cfcf09455.
* 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. <104455676+ReverM@users.noreply.github.com>
* Update worlds/ahit/docs/setup_en.md
Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>
* 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 <79181893+nicholassaylor@users.noreply.github.com>
* 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 <ericrhitchcock@gmail.com>
* Options stuff
* oop
* no unnecessary type hints
* warn about depot download length in setup guide
* Update worlds/ahit/Options.py
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* typo
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* Update worlds/ahit/Rules.py
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
* 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 <mmmcheese158@gmail.com>
* Update worlds/ahit/DeathWishLocations.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* Remove some unnecessary option.class.value
* Remove data_version and more option.class.value
* Update worlds/ahit/Items.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* Remove the rest of option.class.value
* Update worlds/ahit/DeathWishLocations.py
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
* 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 <mmmcheese158@gmail.com>
* 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
* yche fix
* formatting
* major logic bug fix for death wish
* Update Regions.py
* Add missing indirect connections
* Fix generation error from chapter 2 start with act shuffle off
* a
* Revert "a"
This reverts commit df58bbcd998585760cc6ac9ea54b6fdf142b4fd1.
* Revert "Fix generation error from chapter 2 start with act shuffle off"
This reverts commit 0f4d441824af34bf7a7cff19f5f14161752d8661.
* fix async lag
* Update Client.py
* shop item names need this now
* fix indentation
---------
Co-authored-by: Danaël V. <104455676+ReverM@users.noreply.github.com>
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Co-authored-by: Ixrec <ericrhitchcock@gmail.com>
Co-authored-by: Aaron Wagener <mmmcheese158@gmail.com>
Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
* here you go kaito kid
* here you go kaito kid
* move reward logic in its own method
---------
Co-authored-by: Jouramie <jouramie@hotmail.com>
Co-authored-by: Jérémie Bolduc <16137441+Jouramie@users.noreply.github.com>
* Add the yacht dice (from other git) world to the yacht dice fork
* Update .gitignore
* Removed zillion because it doesn't work
* Update .gitignore
* added zillion again...
* Now you can have 0 extra fragments
* Added alt categories, also options
* Added item categories
* Extra categories are now working! 🐶
* changed options and added exceptions
* Testing if I change the generate.py
* Revert "Testing if I change the generate.py"
This reverts commit 7c2b3df6170dcf8d8f36a1de9fcbc9dccdec81f8.
* ignore gitignore
* Delete .gitignore
* Update .gitignore
* Update .gitignore
* Update logic, added multiplicative categories
* Changed difficulties
* Update offline mode so that it works again
* Adjusted difficulty
* New version of the apworld, with 1000 as final score, always
Will still need to check difficulty and weights of adding items.
Website is not ready yet, so this version is not usable yet :)
* Changed yaml and small bug fixes
Fix when goal and max are same
Options: changed chance to weight
* no changes, just whitespaces
* changed how logic works
Now you put an array of mults and the cpu gets a couple of tries
* Changed logic, tweaked a bit too
* Preparation for 2.0
* logic tweak
* Logic for alt categories properly now
* Update setup_en.md
* Update en_YachtDice.md
* Improve performance of add_distributions
* Formatting style
* restore gitignore to APMW
* Tweaked generation parameters and methods
* Version 2.0.3
manual input option
max score in logic always 2.0.3
faster gen
* Comments and editing
* Renamed setup guide
* Improved create_items code
* init of locations: remove self.event line
* Moved setting early items to generate_early
* Add my name to CODEOWNERS
* Added Yacht Dice to the readme in list of games
* Improve performance of Yacht Dice
* newline
* Improve typing
* This is actually just slower lol
* Update worlds/yachtdice/Items.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update Options.py
* Styling
* finished text whichstory option
* removed roll and rollfragments; not used
* import; worlds not world :)
* Option groups!
* ruff styling, fix
* ruff format styling!
* styling and capitalization of options
* small comment
* Cleaned up the "state_is_a_list" a little bit
* RUFF 🐶
* Changed filling the itempool for efficiency
Now, we start with 17 extra items in the item pool, it's quite likely you need at least 17 items (~80%?).
And then afterwards, we delete items if we overshoot the target of 1000, and add items if we haven't reached an achievable score of 1000 yet. Also, no need to recompute the entire logic when adding points.
* 🐶
* Removed plando "fix"
* Changed indent of score multiplier
* faster location function
* Comments to docstrings
* fixed making location closest to goal_score be goal_score
* options format
* iterate keys and values of a dict together
* small optimization ListState
* faster collection of categories
* return arguments instead of making a list (will 🐶 later)
* Instead of turning it into a tuple, you can just make a tuple literal
* remove .keys()
* change .random and used enumerate
* some readability improvements
* Remove location "0", we don't use that one
* Remove lookup_id_to_name entirely
I for sure don't use it, and as far as I know it's not one of the mandatory functions for AP, these are item_name_to_id and location_name_to_id.
* .append instead of += for single items, percentile function changed
Also an extra comment for location ids.
* remove ) too many
* Removed sorted from category list
* Hash categories (which makes it slower :( )
Maybe I messed up or misunderstood...
I'll revert this right away since it is 2x slower, probably because of sorted instead of sort?
* Revert "Hash categories (which makes it slower :( )"
This reverts commit 34f2c1aed8c8813b2d9c58896650b82a810d3578.
* temporary push: 40% faster generation test
Small changes in logic make the generation 40% faster.
I'll have to think about how big the changes are. I suspect they are rather limited.
If this is the way to go, I'll remove the temp file and redo the YachtWeights file, I'll remove the functions there and just put the new weights here.
* Add Points item category
* Reverse changes of bad idea :)
* ruff 🐶
* Use numpy and pmf function to speed up gen
Numpy has a built-in way to sum probability mass functions (pmf).
This shaves of 60% of the generation time :D
* Revert "Use numpy and pmf function to speed up gen"
This reverts commit 9290191cb323ae92321d6c2cfcfe8c27370f439b.
* Step inbetween to change the weights
* Changed the weights to make it faster
135 -> 81 seconds on 100 random yamls
* Adjusted max_dist, split dice_simulation function
* Removed nonlocal and pass arguments instead
* Change "weight-lists" to Dict[str, float]
* Removed the return from ini_locations.
Also added explanations to cat_weights
* Choice options; dont'use .value (will ruff later)
* Only put important options in slotdata
* 🐶
* Add Dict import
* Split the cache per player, limit size to 400.
* 🐶
* added , because of style
* Update apworld version to 2.0.6
2.0.5 is the apworld I released on github to be tested
I never separately released 2.0.4.
* Multiple smaller code improvements
- changed names in YachtWeights so we don't need to translate them in Rules anymore
- we now remember which categories are present in the game, and also put this in slotdata. This we do because only one of two categories is present in a game. If for some reason both are present (plando/getitem/startinventory), we now know which category to ignore
-
* 🐶 ruff
* Mostly minimize_extra_items improvements
- Change logic, generation is now even faster (0.6s per default yaml).
- Made the option 'minimize_extra_items' do a lot more, hopefully this makes the impact of Yacht Dice a little bit less, if you want that. Here's what is also does now:
- you start with 2 dice and 2 rolls
- there will be less locations/items at the start of you game
* ruff 🐶
* Removed printing options
* Reworded some option descriptions
* Yacht Dice: setup: change release-link to latest
On the installation page, link to the latest release, instead of the page with all releases
* Several fixes and changes
-change apworld version
-Removed the extra roll (this was not intended)
-change extra_points_added to a mutable list to that it actually does something
-removed variables multipliers_added and items_added
-Rules, don't order by quantity, just by mean_score
-Changed the weights in general to make it faster
* 🐶
* Revert setup to what it was (latest, without S)
* remove temp weights file, shouldn't be here
* Made sure that there is not too many step score multipliers.
Too many step score multipliers lead to gen fails too, probably because you need many categories for them to actually help a lot. So it's hard to use them at the start of the game.
* add filler item name
* Textual fixes and changes
* Remove Victory item and use event instead.
* Revert "Remove Victory item and use event instead."
This reverts commit c2f7d674d392a3acbc1db8614411164ba3b28bff.
* Revert "Textual fixes and changes"
This reverts commit e9432f92454979fcd5a31f8517586585362a7ab7.
* Remove Victory item and make it an event instead
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* set filler item
also rename "Master Stalfos' Message" to "Nothing" as it shows up in game, and "Gel" to "Zol Attack"
* fix for extra gold leaves
* fix for start_inventory
* working?
* missed one
* fix old start inventory usage
* missed global random usage
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* Quiz updates
* Enable Partial Trainersanity
* Losable Key Items Still Count
* New options api
* Type Chart Seed
* Continue switching to new options API
* Level Scaling and Quiz fixes
* Level Scaling and Quiz fixes
* Clarify that palettes are only for Super Gameboy
* Type chart seed groups use one random players' options
* remove goal option again
* Text updates
* Trainersanity Trainers ignore Blind Trainers setting
* Re-order simple connecting interiors so that directions are preserved when possible
* Dexsanity exact number
* Year update
* Dexsanity Doc update
* revert accidental file deletion
* Fixes
* Add world parameter to logic calls
* restore correct seeded random object
* missing world.options changes
* Trainersanity table bug fix
* delete entrances as well as exits when restarting door shuffle
* Do not collect route 25 item for level scaling if trainer is trainersanity
* world.options in level_scaling.py
* Update worlds/pokemon_rb/level_scaling.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update worlds/pokemon_rb/encounters.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Update worlds/pokemon_rb/encounters.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* world -> multiworld
* Fix Cerulean Cave Hidden Item Center Rocks region
* Fix Cerulean Cave Hidden Item Center Rocks region for real
* Remove "self-locking" rules
* Update worlds/pokemon_rb/regions.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
* Fossil events
* Update worlds/pokemon_rb/level_scaling.py
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
---------
Co-authored-by: alchav <alchav@jalchavware.com>
Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* make yaml_output arg a bool instead of number
* make yaml_output dump all player options as csv
* it sorts by game so swap those columns
* capitalize game and name headers
* use a list and just add an if before adding instead of sorting
* skip options that the world doesn't want displayed
* check if the class is a subclass of Removed specifically instead of the none flag
* don't create empty rows
* add a header for every game option that isn't from the common ones even if they have the same name
* add to webhost gen args so it can still gen
* WebHost: add spinner to room command
and show error message if fetch fails due to NetworkError
* WebHost: don't update room log while tab is inactive
* WebHost: don't include log for automated requests
* WebHost: refresh room also for re-spinups
and do that from javascript
* Test, WebHost: send fake user-agent where required
* WebHost: remove wrong comment in host room
* - Created a test for the "Mapping Cave Systems" book
* - Added missing rule to marlon's bedroom
* - Can kill any monster, not just green slime
* - Added a compound source structure, but I ended up deciding to not use it here. Still keeping it as it will probably be useful eventually
* - Use the compound source of the monster compoundium (ironic, I know)
* - Add required elevators
---------
Co-authored-by: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
* add a more clear error message for a missing exit
* remove portal region from the available pool
* ensure plando portals are in the correct spot in the list and it gets cleared correctly
`CollectionState.update_reachable_regions()` un-stales the state for all
players, but when checking `OOTRegion.can_reach()`, it would only update
OOT's age region accessibility when the state was stale, so if the state
was always un-staled by `update_reachable_regions()` immediately before
`OOTRegion.can_reach()`, OOT's age region accessibility would never
update.
This patch fixes the issue by replacing use of CollectionState.stale
with a separate stale state dictionary specific to OOT that is only
un-staled by `_oot_update_age_reachable_regions()`.
OOT's collect() and remove() implementations have been updated to stale
the new OOT-specific state.
Entrances to SciLab_Cyberworld and Yoka_Cyberworld had logic for being
able to reach SciLab_Overworld, but did not register this indirect
condition.
Entrances to Beach_Cyberworld had logic for being able to reach
Yoka_Overworld, but did not register this indirect condition.
Entrances to Undernet and Secret_Area had logic for having a high enough
explore score, but explore score is calculated based on the
accessibility of a number of regions and no indirect conditions were
being registered for these regions.
Felix R
NewSoupVi
Kory Dondzila
Mrks
agilbert1412
Silvris
CookieCat
Scipio Wright
Kaito Sinclaire
qwint
João Victor
Spineraks
Alex Nordstrom
digiholic
gaithern
Doug Hoskisson
Faris
Remy Jette
Alchav
jamesbrq
black-sliver
Fabian Dill
Aaron Wagener
sgrunt
Exempt-Medic
Natalie Weizenbaum
Bryce Wilson
Ziktofel
Rensen3
Mysteryem