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.

Sign up for GitHub

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

Kirby's Dream Land 3: Implement New Game #2119

Merged
merged 229 commits into from
Mar 5, 2024
Merged

Kirby's Dream Land 3: Implement New Game #2119

Changes from 1 commit
Commits
Show all changes
229 commits
Select commit Hold shift + click to select a range
eee9551
begin work
Silvris Mar 9, 2023
1e9e3a0
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Mar 10, 2023
dee4184
further work
Silvris Mar 13, 2023
6e0fb28
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Mar 13, 2023
8f94a5d
adjust logic to require being able to reach stage 6 before leaving a …
Silvris Mar 13, 2023
79f4f18
allow client to send checks past level 1, startup safeguards
Silvris Mar 13, 2023
544dd36
fix mama pitch logic
Silvris Mar 13, 2023
1856ad1
remove unnecessary ricks
Silvris Mar 13, 2023
42dacac
3-5 logic
Silvris Mar 13, 2023
d0767fe
shuffle boss requirement order
Silvris Mar 13, 2023
fa51e86
typo, duplicate location name, unnecessary rick
Silvris Mar 14, 2023
94be3cb
rob logic, lost the rick 50/50
Silvris Mar 14, 2023
d47fd03
wrong name, 5-4 logic, ado not checked correctly
Silvris Mar 14, 2023
45d551a
basic level shuffle
Silvris Mar 16, 2023
d9eda8f
level shuffle and rudimentary palette support
Silvris Mar 16, 2023
0c9ed0a
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Mar 16, 2023
0090587
webhost cleanup, re-enable custom palettes
Silvris Mar 16, 2023
9babd71
bad option title, fix pattern shuffle
Silvris Mar 16, 2023
69bf348
add marshmallow, add sfx on received item, boss plando fix
Silvris Mar 19, 2023
d3977ba
dedede fix, hs graphic fix attempt 1
Silvris Mar 20, 2023
c603535
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Mar 21, 2023
f2b58f7
3-5 logic fix
Silvris Mar 22, 2023
87458b2
fix pattern, support JP rom
Silvris Mar 25, 2023
4335f92
fix gen, ensure Nago can be reached before 5-5 HS in logic
Silvris Mar 25, 2023
5a9d778
add placeholder setup guide, fix webhost not showing game info
Silvris Mar 26, 2023
a79a447
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Mar 28, 2023
c089927
move to 0xffff bwram, correct invin time
Silvris Mar 29, 2023
5e11827
tentative animal friends rewrite
Silvris Mar 29, 2023
92623ce
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Mar 31, 2023
fad5897
implement mg5 and jumping goals
Silvris Apr 1, 2023
29bdda5
enforce at least one heart star required
Silvris Apr 1, 2023
569a280
hotfix zero goal
Silvris Apr 3, 2023
21796da
fix deathlink and item receive bugs
Silvris Apr 5, 2023
228bd67
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Apr 5, 2023
b9fc58a
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Apr 12, 2023
9500094
begin documenting for consumable checks
Silvris Apr 12, 2023
1f42851
write validation info to BWRAM
Silvris Apr 16, 2023
25fa6b0
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Apr 16, 2023
a9dfd27
Update LocationName.py
Silvris Apr 20, 2023
90fd5a6
move existing variables out of base bwram
Silvris Apr 21, 2023
260296e
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Apr 21, 2023
e8a156b
finish consumables, fix 5-4 hs logic
Silvris Apr 22, 2023
dcbd08b
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Apr 22, 2023
0c0c359
consumable hint fix and 2-4 consumable name fix
Silvris Apr 25, 2023
b05d0bb
fix 5-6 sound bug, add fast goal, fix 5-6 logic
Silvris Apr 30, 2023
1665520
fix 3-5 not being blocked from being placed at 1-1
Silvris May 2, 2023
3374658
rewrite color conversion to fix math error
Silvris May 5, 2023
dfe6887
reduce 4-4 consumable logic
Silvris May 6, 2023
0dda27b
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris May 6, 2023
3f49f17
add gooey palette functionality
Silvris May 6, 2023
37a5410
fix fast minigame bug
Silvris May 6, 2023
1a9ac7c
fix inverted labelling of copy ability/purification patches
Silvris May 8, 2023
91df55b
goal tests and resulting cleanup
Silvris May 8, 2023
aa03b8c
allow custom gooey, more gooey pal
Silvris May 14, 2023
a55feb6
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris May 16, 2023
2f8e923
begin on strict boss setting
Silvris May 22, 2023
4651eb3
fix plando connections (for now, until change occurs on main)
Silvris May 22, 2023
b8231d8
strict bosses, fix purification check off-by-one
Silvris May 22, 2023
7208132
fix purification result
Silvris May 22, 2023
e42f1a7
fix strict bosses patch
Silvris May 24, 2023
4605ed5
boss shuffle description
Silvris May 24, 2023
f1f7f3e
utils fix, fix strict bosses (final)
Silvris May 27, 2023
b0b511c
enable bubblegum kirby and cherry gooey
Silvris May 27, 2023
047aacd
stage sprites and open world
Silvris Jun 4, 2023
9e6c823
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jun 15, 2023
13ba20a
open world, traps, music shuffle
Silvris Jun 15, 2023
7fd3407
kirby and gooey palettes finished
Silvris Jun 15, 2023
92798b6
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Jun 15, 2023
e2f5363
music shuffle, general cleanup, tests
Silvris Jun 16, 2023
3c423f4
Add KDL3 to apworlds list
Silvris Jun 16, 2023
66c6c7e
revert host.yaml changes from testing
Silvris Jun 16, 2023
6a07bee
docs cleanup
Silvris Jun 16, 2023
6816d39
fix open world allowing checks to be sent by doing nothing
Silvris Jun 16, 2023
f949e02
block custom random color, bb bosses
Silvris Jun 17, 2023
92d2043
forgot return in presets
Silvris Jun 17, 2023
6b7dc70
docs and options update, goal is now displayed on level select
Silvris Jun 27, 2023
7dfee5a
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Jun 27, 2023
426425c
raise min heart stars to 5, rename visual for max hs option
Silvris Jun 27, 2023
8b52d35
webhost cleanup
Silvris Jun 27, 2023
c921e7e
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jun 28, 2023
dd96c07
option access cleanup
Silvris Jun 28, 2023
c15f5d3
typing and pep cleanup
Silvris Jun 30, 2023
08a02ed
consumable and heart star sprites
Silvris Jul 1, 2023
f220157
fix patch issue and added to launchercomponents
Silvris Jul 1, 2023
a696971
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Jul 1, 2023
db2a876
inno setup
Silvris Jul 3, 2023
5ef29d7
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 3, 2023
6878acf
swap inno to use snesmd5 function
Silvris Jul 3, 2023
a0c6a4e
fix utils, fix incorrect plando boss list
Silvris Jul 3, 2023
7a4b401
cleanup zip function, pep8
Silvris Jul 3, 2023
6cdc32f
open world fixes and optimization
Silvris Jul 3, 2023
d4d23c4
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 4, 2023
939eedf
Add KDL3 to README
Silvris Jul 4, 2023
0acb0d5
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Jul 4, 2023
cc8bc58
fix rare hs 1-up glitch, jp-en compat
Silvris Jul 4, 2023
f815f47
JP-EN interaction fixes
Silvris Jul 4, 2023
436def1
rom docs, block deathlink and checks in demo
Silvris Jul 5, 2023
b50ff6a
collect stage completion (doesn't unlock next stage)
Silvris Jul 5, 2023
09ec83f
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 5, 2023
4b29800
fix vanilla heart star sprites on minigames
Silvris Jul 5, 2023
dd1921f
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Jul 5, 2023
7c6d6c0
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 5, 2023
30d1644
update for auto host yaml
Silvris Jul 5, 2023
2f47552
typing and cleanup
Silvris Jul 5, 2023
eba4b74
hotfix for 0.4.1 support
Silvris Jul 5, 2023
6388ffb
beginning work on room logic refactor
Silvris Jul 7, 2023
127670b
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 13, 2023
fe2bff6
initial base for room logic, animal rando
Silvris Jul 13, 2023
6948e45
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Jul 13, 2023
a08a29b
Add player to spoiler writing
Silvris Jul 15, 2023
831df7b
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Jul 19, 2023
b0a20fa
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Jul 23, 2023
355af8d
small optimization for animal writing
Silvris Jul 23, 2023
ba2283c
fill_restrictive animals, vc fixes
Silvris Jul 29, 2023
e0ab024
begin work on copy ability shuffle
Silvris Jul 31, 2023
dc4595c
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Aug 1, 2023
d915aa7
add miniboss ability rando, tests
Silvris Aug 2, 2023
f1044c0
make angel rules smarter
Silvris Aug 3, 2023
75f6995
fix tests, finish rob test
Silvris Aug 4, 2023
2515298
fix failing test, start copy ability rules
Silvris Aug 4, 2023
67ab09a
water rules finished
Silvris Aug 4, 2023
2d8d434
clean dead code
Silvris Aug 4, 2023
8913dae
fix bug where SNI Client dies if an item actually makes it to the ite…
Silvris Aug 4, 2023
5739ff1
hs visual bugfixes
Silvris Aug 5, 2023
347e2d9
general cleanup
Silvris Aug 7, 2023
941ccd1
actually implement plus minus
Silvris Aug 7, 2023
077ae0c
typing, gen valid rom CRC
Silvris Aug 7, 2023
cf5005a
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Aug 7, 2023
e4b375b
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Aug 12, 2023
449c046
differentiate between filler and progression consumables
Silvris Aug 12, 2023
6187297
pause icons, edge cases, fix client
Silvris Aug 16, 2023
f5d3483
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Aug 16, 2023
9072035
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Aug 19, 2023
94dd61e
client cleanup
Silvris Aug 19, 2023
d3197b1
cleanup, change open_world to default true
Silvris Aug 19, 2023
d683974
remove mutually exclusive brr and strict bosses
Silvris Aug 19, 2023
65c3d89
fix failing tests from changed default
Silvris Aug 19, 2023
82525aa
forgot one
Silvris Aug 19, 2023
47d8a74
block client spamming when not connected
Silvris Aug 20, 2023
a0ea84a
plando guide update
Silvris Aug 20, 2023
a707ae2
minor change on plando guide
Silvris Aug 21, 2023
511dd67
increment data version
Silvris Aug 21, 2023
7378511
de-indent rooms json
Silvris Aug 21, 2023
dd8a26c
Apply suggestions from code review
Silvris Aug 21, 2023
db3acfd
clean bukiset rules
Silvris Aug 21, 2023
0e1e051
pep8 and clean unused imports
Silvris Aug 21, 2023
865d898
initial removal of events for non-open_world
Silvris Aug 21, 2023
237cbf6
re-order pre_fill to properly handle animal fill
Silvris Aug 22, 2023
5be0f6a
clean tests
Silvris Aug 24, 2023
d0ec94e
adjust rob rule
Silvris Aug 25, 2023
5ad4389
some cleaning from type checking and linting
beauxq Aug 26, 2023
b81d1c3
re-order pre_fill to properly handle animal fill
Silvris Aug 22, 2023
ec67f7f
clean tests
Silvris Aug 24, 2023
383d1c9
adjust rob rule
Silvris Aug 25, 2023
05d6cf3
clean imports
Silvris Aug 26, 2023
aa9640c
pep8 and typing cleanup
Silvris Aug 26, 2023
03d26b8
Merge branch 'kdl3' into silvris/kdl3
Silvris Aug 26, 2023
f4ca2ed
Merge pull request #1 from beauxq/silvris/kdl3
Silvris Aug 26, 2023
3d169d1
fix typing issues from pr
Silvris Aug 26, 2023
3247d45
fix usage of dict in typing
Silvris Aug 26, 2023
5c1abf5
Merge branch 'kdl3' into kdl3_test
Silvris Aug 30, 2023
9ddb73f
fix missing import from merge commit
Silvris Aug 30, 2023
a8d711a
fix non-deterministic generation
Silvris Aug 30, 2023
b4bb367
fix non-deterministic generation
Silvris Aug 30, 2023
0cbffa8
sending gifts
Silvris Sep 4, 2023
ab0dcab
receiving gifts, writing rom, option
Silvris Sep 4, 2023
619887c
fix gooey respawning too quickly
Silvris Sep 13, 2023
19f0f40
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Sep 19, 2023
51e4886
Merge remote-tracking branch 'upstream/main' into kdl3_test
Silvris Sep 20, 2023
6a23c09
slow fix
Silvris Sep 28, 2023
21008ac
Merge branch 'main' into kdl3
Silvris Oct 3, 2023
1d154bb
Merge remote-tracking branch 'upstream/main' into kdl3_test
Silvris Oct 10, 2023
1e85dc4
remove the slow
Silvris Oct 10, 2023
f1a6371
Merge branch 'kdl3' into kdl3_test
Silvris Oct 10, 2023
c5d4728
Merge remote-tracking branch 'upstream/main' into kdl3_test
Silvris Oct 10, 2023
d1595b7
begin move to world options
Silvris Oct 12, 2023
60b699b
fix test failures
Silvris Oct 13, 2023
2d721a2
rename room
Silvris Oct 25, 2023
66d0a3e
Merge remote-tracking branch 'upstream/main' into kdl3_test
Silvris Oct 29, 2023
372dd75
Merge branch 'ArchipelagoMW:main' into kdl3_test
Silvris Nov 5, 2023
d4ca900
fix hs visual misreporting
Silvris Nov 5, 2023
46a9cbc
general world cleanup
Silvris Nov 9, 2023
1e87336
Merge remote-tracking branch 'upstream/main' into kdl3_test
Silvris Nov 9, 2023
b1cba1c
Update CODEOWNERS
Silvris Nov 9, 2023
d12d31b
Merge branch 'main' into kdl3
Silvris Nov 11, 2023
9633d2a
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Nov 11, 2023
a522b8a
Merge branch 'main' into kdl3
Silvris Nov 12, 2023
8a75570
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Nov 18, 2023
f6a3530
Merge branch 'main' into kdl3
Silvris Nov 24, 2023
61b13e2
Merge branch 'main' into kdl3
Silvris Nov 25, 2023
84228e5
Merge branch 'main' into kdl3
Silvris Nov 26, 2023
bc425f6
Add presets and deathlink messages
Silvris Nov 26, 2023
cd47ee5
Merge branch 'kdl3' of https://github.com/Silvris/Archipelago into kdl3
Silvris Nov 26, 2023
07407bc
Merge branch 'ArchipelagoMW:main' into kdl3
Silvris Dec 5, 2023
c4ce05b
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Dec 8, 2023
2861ea1
fix fxpak, add snes9x-nwa
Silvris Dec 17, 2023
e20dd1c
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Jan 7, 2024
88227c9
Merge branch 'main' into kdl3
Silvris Jan 12, 2024
5ad46d6
star implementation, needs logic
Silvris Jan 16, 2024
7501e01
set rules and fix non-star generation
Silvris Jan 21, 2024
1e030cb
add stars to generation
Silvris Jan 21, 2024
c338e48
Merge remote-tracking branch 'upstream/main' into kdl3_stars
Silvris Feb 3, 2024
85241fa
fix hint extension, needs testing
Silvris Feb 3, 2024
9bc6d1f
move to assembled basepatch, needs repairing
Silvris Feb 10, 2024
c36c2e7
fix basepatch, add gifting patch
Silvris Feb 11, 2024
b87fb60
Merge branch 'kdl3_gifting' into kdl3_stars
Silvris Feb 11, 2024
67ee035
client refactor, attempt gooey fix
Silvris Feb 12, 2024
31c73c1
fix hint information
Silvris Feb 12, 2024
7d53e6e
return to explicit gooey
Silvris Feb 12, 2024
06d0fbf
gifting cleanup, fix options, star sprites
Silvris Feb 12, 2024
b7cad19
Merge remote-tracking branch 'upstream/main' into kdl3_stars
Silvris Feb 12, 2024
52fd4be
actually fix hint extension this time
Silvris Feb 12, 2024
b3ecc45
de-indent json again
Silvris Feb 12, 2024
4480051
Update setup_en.md
Silvris Feb 12, 2024
146a881
fix entrance rules not accounting for animal/ability access
Silvris Feb 15, 2024
d44d751
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Feb 17, 2024
9ccd420
update to gifting API version 2
Silvris Feb 21, 2024
78a4512
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Feb 21, 2024
6fb8258
world cleanup
Silvris Feb 21, 2024
5eb45dd
Merge branch 'main' into kdl3
Berserker66 Feb 24, 2024
fd2e977
Merge remote-tracking branch 'upstream/main' into kdl3
Silvris Feb 25, 2024
54cce42
fix rare test failure, spoiler cleanup
Silvris Feb 25, 2024
e1e41b2
fix stars not working when consumables are disabled
Silvris Feb 25, 2024
e6ea365
block game watcher until slot exists, re-add plando link
Silvris Feb 26, 2024
21cf675
Update worlds/kdl3/Aesthetics.py
Silvris Feb 26, 2024
60ac369
Update worlds/kdl3/Options.py
Silvris Feb 26, 2024
b648729
Apply suggestions from code review
Silvris Feb 26, 2024
834b098
further changes from code review
Silvris Feb 26, 2024
2cb2f76
Update Items.py
Silvris Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion worlds/kdl3/data/Rooms.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading