-
Notifications
You must be signed in to change notification settings - Fork 723
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
Yacht Dice: Textual fixes and changes (Docs / yaml description) #3967
Merged
Merged
Changes from 134 commits
Commits
Show all changes
135 commits
Select commit
Hold shift + click to select a range
89b6d2e
Add the yacht dice (from other git) world to the yacht dice fork
spinerak 10ea81d
Update .gitignore
spinerak fe196db
Removed zillion because it doesn't work
spinerak 4903fb8
Update .gitignore
spinerak c94f231
added zillion again...
spinerak 59e8f30
Now you can have 0 extra fragments
spinerak f19689f
Added alt categories, also options
spinerak 55821d0
Added item categories
spinerak ae68fa0
Extra categories are now working! :dog:
spinerak 7c1a68a
changed options and added exceptions
spinerak 7c2b3df
Testing if I change the generate.py
spinerak d39f665
Revert "Testing if I change the generate.py"
spinerak 49c6983
ignore gitignore
spinerak 5820b1f
Delete .gitignore
spinerak bc5b064
Update .gitignore
spinerak 343dce1
Update .gitignore
spinerak aed6696
Update logic, added multiplicative categories
spinerak d854023
Changed difficulties
spinerak 796b17b
Update offline mode so that it works again
spinerak 807405c
Adjusted difficulty
spinerak 1a8d807
New version of the apworld, with 1000 as final score, always
spinerak 43d102b
Changed yaml and small bug fixes
spinerak 65e8703
no changes, just whitespaces
spinerak 979f30f
changed how logic works
spinerak b51dcfb
Changed logic, tweaked a bit too
spinerak 67fb4fb
Preparation for 2.0
spinerak c687368
logic tweak
spinerak 975fd04
Logic for alt categories properly now
spinerak 8b558bd
Update setup_en.md
spinerak 7f2df9f
Update en_YachtDice.md
spinerak 7355bfa
Merge pull request #1 from ArchipelagoMW/main
spinerak 3da552d
Improve performance of add_distributions
spinerak 2604054
Formatting style
spinerak d570ba6
restore gitignore to APMW
spinerak 0464631
Tweaked generation parameters and methods
spinerak be65762
Version 2.0.3
spinerak 1e935fb
Comments and editing
spinerak e8aaf22
Merge pull request #2 from ArchipelagoMW/main
spinerak 97c37a3
Renamed setup guide
spinerak 93e6715
Improved create_items code
spinerak 864e36c
init of locations: remove self.event line
spinerak 1aff595
Moved setting early items to generate_early
spinerak 29b8ced
Add my name to CODEOWNERS
spinerak 41cd899
Added Yacht Dice to the readme in list of games
spinerak 3e8d89f
Improve performance of Yacht Dice
NewSoupVi 3d7f23b
newline
NewSoupVi a3c9fb7
Improve typing
NewSoupVi 676e876
This is actually just slower lol
NewSoupVi 7fa48ea
Merge pull request #3 from NewSoupVi/pr/3482
spinerak 78c198b
Update worlds/yachtdice/Items.py
spinerak f6fbf22
Apply suggestions from code review
spinerak c647c89
Update Options.py
spinerak 3d30b3b
Merge branch 'main' of https://github.com/spinerak/ArchipelagoYachtDice
spinerak 064c929
Styling
spinerak 17402a5
finished text whichstory option
spinerak 526733d
removed roll and rollfragments; not used
spinerak 25df8e5
import; worlds not world :)
spinerak 6250923
Option groups!
spinerak da820cc
ruff styling, fix
spinerak 99dbcb0
ruff format styling!
spinerak 2d66fd8
styling and capitalization of options
spinerak 0d35411
small comment
spinerak 2c3a4da
Merge branch 'main' into main
spinerak 13340aa
Cleaned up the "state_is_a_list" a little bit
spinerak 4e56a07
RUFF :dog:
spinerak 5188d78
Changed filling the itempool for efficiency
spinerak 7f298e6
:dog:
spinerak d31d6b2
Removed plando "fix"
spinerak 5bb2883
Changed indent of score multiplier
spinerak 06f105e
faster location function
spinerak a1acff3
Comments to docstrings
spinerak a823962
fixed making location closest to goal_score be goal_score
spinerak da26408
options format
spinerak aa0886c
iterate keys and values of a dict together
spinerak 4839bf4
small optimization ListState
spinerak 93812bb
faster collection of categories
spinerak 03ba657
return arguments instead of making a list (will :dog: later)
spinerak e2f0567
Instead of turning it into a tuple, you can just make a tuple literal
spinerak 17d9f66
remove .keys()
spinerak 570af1a
change .random and used enumerate
spinerak 40ef9aa
some readability improvements
spinerak 0aa2b31
Remove location "0", we don't use that one
spinerak 3626525
Remove lookup_id_to_name entirely
spinerak 7a9b3e2
.append instead of += for single items, percentile function changed
spinerak b1ed50e
remove ) too many
spinerak 42e9af2
Removed sorted from category list
spinerak 34f2c1a
Hash categories (which makes it slower :( )
spinerak 12ecd9f
Revert "Hash categories (which makes it slower :( )"
spinerak 353a676
temporary push: 40% faster generation test
spinerak cd68860
Add Points item category
spinerak e11aba1
Reverse changes of bad idea :)
spinerak 1789824
ruff :dog:
spinerak 9290191
Use numpy and pmf function to speed up gen
spinerak 5e8a219
Revert "Use numpy and pmf function to speed up gen"
spinerak 5ce9194
Step inbetween to change the weights
spinerak 42034af
Changed the weights to make it faster
spinerak 4a5a799
Adjusted max_dist, split dice_simulation function
spinerak 3c9c16d
Removed nonlocal and pass arguments instead
spinerak 5269312
Change "weight-lists" to Dict[str, float]
spinerak 18897e8
Removed the return from ini_locations.
spinerak b5c596a
Choice options; dont'use .value (will ruff later)
spinerak 5089df1
Only put important options in slotdata
spinerak 6342335
Merge branch 'main' into main
spinerak 0c020d9
:dog:
spinerak e8fd7ca
Add Dict import
spinerak 090859a
Split the cache per player, limit size to 400.
spinerak 7d21ec9
:dog:
spinerak 2018406
added , because of style
spinerak 0327b60
Merge branch 'main' into main
spinerak 17ac22e
Update apworld version to 2.0.6
spinerak d122181
Merge branch 'main' into main
spinerak 577fb74
Multiple smaller code improvements
spinerak d93e62b
:dog: ruff
spinerak 1b570d4
Merge branch 'main' into main
spinerak 36c1c8d
Mostly minimize_extra_items improvements
spinerak 676dfd4
ruff :dog:
spinerak 19966a4
Removed printing options
spinerak 45776e1
Reworded some option descriptions
spinerak fd1997a
Merge branch 'main' into main
NewSoupVi ee2f6c8
Yacht Dice: setup: change release-link to latest
spinerak 43b081f
Several fixes and changes
spinerak a3e4ec4
:dog:
spinerak 0a61ef1
Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago i…
spinerak 74522c7
Merge pull request #5 from spinerak/ArchipelagoMW-main
spinerak dc831eb
Revert setup to what it was (latest, without S)
spinerak 09b26e2
remove temp weights file, shouldn't be here
spinerak d8cc7f6
Made sure that there is not too many step score multipliers.
spinerak 1626605
Merge pull request #6 from ArchipelagoMW/main
spinerak 7a5a3f8
add filler item name
spinerak 59eadb0
Merge pull request #7 from ArchipelagoMW/main
spinerak e9432f9
Textual fixes and changes
spinerak c2f7d67
Remove Victory item and use event instead.
spinerak f983f74
Revert "Remove Victory item and use event instead."
spinerak b807717
Changed order of options
spinerak 7061e8c
Rephrase the offline-play part
spinerak File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why this change? Is it because the download is "technically" already offline? I'd still say it's fair to say you can do it offline with the downloaded version tbh.
If you want to keep this change though you need to change
have
tohas
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair! I've changed it to:
Both options also have a "Solo play" mode
Which I think makes sense because that's what the mode is called on the website.