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

DKC3 Client Refactor #2

Merged
merged 5 commits into from
Jul 20, 2022
Merged

DKC3 Client Refactor #2

merged 5 commits into from
Jul 20, 2022

Conversation

PoryGone
Copy link

No description provided.

@PoryGone PoryGone merged commit c979fb0 into dkc3-main Jul 20, 2022
@PoryGone PoryGone deleted the dkc3-client-refactor branch August 16, 2022 02:37
PoryGone pushed a commit that referenced this pull request Nov 4, 2022
* OoT: ER improvements
Include dungeon rewards in itempool to allow for ER improvement
Better validate_world function by checking for multi-entrance incompatibility more efficiently
Fix some generation failures by ensuring all entrances placed with logic
Introduce bias to some interior entrance placement to improve generation rate

* OoT: fix overworld ER spoiler information

* OoT: rewrite dungeon item placement algorithm
in particular, no longer assumes that exactly the number of vanilla keys is present, which lets it place more or fewer items.

* OoT: auto-send more locations
Now should autosend cows, DMT/DMC great fairies, medigoron, and bombchu salesman
This should be every check autosending. these ones are super weird for some reason and didn't get fixed with the others

* OoT: add items forced local by settings to AP's local_items

* OoT: fast-fill shop junk items

* OoT: ensure that Kokiri Shop is always reachable immediately in closed forest
hence Deku Shield can be bought to leave the forest

* OoT: randomize internal connect name
Connect name is now a random 16-character string.
This should prevent any issues with connecting to a room with the wrong ROM with probability almost 1.

* OoT: introduce TrackRandomRange for trials hint and mq dungeon maps

* OoT: enable proper itemlinking of songs and dungeon items, with restricted placements according to player settings

* OoT: barren hint oversight fix

* OoT: allow NL + ER to roll properly

* OoT: 3.8 compatibility
set and list builtins don't have proper typing support until 3.9, apparently

* OoT: remove Gerudo Membership Card location from the pool if fortress open and card not randomized
another long-standing bug squished

* OoT: exclude locations in the itemlink song fill if they aren't also priority

* OoT: prevent data bleed when client isn't closed between different game connections
I don't understand why people keep doing this

* OoT: linter appeasement
it was a real error though

* fixing merge conflicts is hard

* oot merge update #2

* OoT: removed accidentally duplicated code
PoryGone pushed a commit that referenced this pull request Dec 2, 2023
* Initial v2 files

they work on AP 0.4.3

* Removed code used for debugging

* Reverted EasyEarlyLevels option

* Location name adjustments

* Reverted added logic for Funky

* Removed easy early levels option

* Removed options for junk item weights

* Reworked the vertical scroll hack

* Change item names from the init file

* trimming

* Blocksanity data is now computed from the json file instead of using a bin file

* Added a missing blocksanity location

* Bring back import settings and related code

* Bring back more settings... again!

* Attempt to solve merge conflict

* Bring back ROM expansion

* Attempt #2 to fix merge conflicts

* Changed junk item "15 coins" to "50 coins"

* Remove unused things

* Configured the vertical scroll setting table

* Modified the map indicator for Hidden 1-Ups

* Adjusted some palettes

* Changed 1-Up Checkpoint references to Hidden 1-Up

Also changed some of the options' descriptions
... and changed the name of a location in Donut Ghost House

* Fixed the logic for a block that could be either a green or yellow switch palace block

* Make impossible to receive checks during boss battles

* Several palette fixes

arbustos

* Rework palette shuffle options
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant