Skip to content

KH2: Version 2 #2009

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

Merged
merged 117 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from 114 commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
11c23f5
regions rework and init cleanup
JaredWeakStrike May 17, 2023
34d0102
update
JaredWeakStrike Jun 4, 2023
035352b
filling regions
JaredWeakStrike Jun 7, 2023
a2b8081
fixed cups names and connection
JaredWeakStrike Jun 7, 2023
17c30df
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Jun 7, 2023
fb3892f
fixed list out of index
JaredWeakStrike Jun 7, 2023
8a139a6
Merge branch 'kh2-regionrework' of https://github.com/JaredWeakStrike…
JaredWeakStrike Jun 7, 2023
7e9c0cc
Update TestFormLogic.py
JaredWeakStrike Jun 7, 2023
967304d
Update TestFormLogic.py
JaredWeakStrike Jun 7, 2023
f2a9337
Lets try this test instead of doing extra
JaredWeakStrike Jun 7, 2023
8ef7173
cant fail if its not there
JaredWeakStrike Jun 7, 2023
87bfabc
ah
JaredWeakStrike Jun 17, 2023
1228bb3
stuff
JaredWeakStrike Jun 27, 2023
fab0b1f
Update Rules.py
JaredWeakStrike Jun 29, 2023
0cd8ceb
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Jun 30, 2023
9178120
no more get_rules copy pasting
JaredWeakStrike Jul 1, 2023
6b8fa7e
twtnw,cor and cups left
JaredWeakStrike Jul 1, 2023
92c36b9
Finished Logic
JaredWeakStrike Jul 2, 2023
39ba25d
hopefully fixing final form default failing
JaredWeakStrike Jul 2, 2023
be4692b
actually doing it
JaredWeakStrike Jul 2, 2023
bf6d06a
we breaking stuff
JaredWeakStrike Jul 3, 2023
e8d7731
made items.py not grotesque
JaredWeakStrike Jul 3, 2023
43e1e06
cleaned it up to be even better
JaredWeakStrike Jul 3, 2023
c4d0fff
cleaned up locations some
JaredWeakStrike Jul 3, 2023
3e545f2
cleaned up even more
JaredWeakStrike Jul 4, 2023
d180785
made the event item names
JaredWeakStrike Jul 4, 2023
dd82edb
event_item:none
JaredWeakStrike Jul 4, 2023
3e9581f
cleaned up locations and regions
JaredWeakStrike Jul 5, 2023
05e650c
Revert "cleaned up locations and regions"
JaredWeakStrike Jul 5, 2023
e0c2b3d
removed starting crit and level 1.
JaredWeakStrike Jul 5, 2023
db6d165
started mapping locations to events
JaredWeakStrike Jul 5, 2023
fbe5af8
finished events placing
JaredWeakStrike Jul 7, 2023
b617b25
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Jul 7, 2023
36420e8
cleaned up stuff and fixed the client some
JaredWeakStrike Jul 7, 2023
e652fa3
Merge branch 'kh2-regionrework' of https://github.com/JaredWeakStrike…
JaredWeakStrike Jul 7, 2023
332620e
cleaned up client a lot
JaredWeakStrike Jul 11, 2023
c4c66b9
atlantica support
JaredWeakStrike Jul 11, 2023
d6ada50
smooooooooooooooooooooooooth brain
JaredWeakStrike Jul 11, 2023
ffba6d9
now its ap world
JaredWeakStrike Jul 11, 2023
df1257a
moved mod.yml to openkh for apworld
JaredWeakStrike Jul 11, 2023
46b87e8
cleaned up locations to be per world
JaredWeakStrike Jul 11, 2023
f53beae
fixed final xemnas and data_version
JaredWeakStrike Jul 12, 2023
2d0e81d
fixed 100 acres not having logic
JaredWeakStrike Jul 13, 2023
9232709
a lot of stuff
JaredWeakStrike Jul 14, 2023
86b3503
data version 0
JaredWeakStrike Jul 14, 2023
f5f715c
fixed keyblades and cleaned up rules
JaredWeakStrike Jul 15, 2023
bbdf220
quantity items support
JaredWeakStrike Jul 15, 2023
103d806
hitlist rework goal rework
JaredWeakStrike Jul 15, 2023
ff8e643
client now supports hitlist+lucky
JaredWeakStrike Jul 15, 2023
09d8af0
added back 3 proofs because of complaining
JaredWeakStrike Jul 15, 2023
db4f76f
fixed three proofs
JaredWeakStrike Jul 15, 2023
5f18a9d
fixed generation failing. Read desc
JaredWeakStrike Jul 17, 2023
3811a70
add atlantica toggle and cleaned up some stuff
JaredWeakStrike Jul 17, 2023
cb162bc
fixed client and added summon level locations
JaredWeakStrike Jul 17, 2023
1e2dfcc
add summon7 bounty
JaredWeakStrike Jul 17, 2023
10ac78c
fixed summons and party statsanity
JaredWeakStrike Jul 17, 2023
8febb76
added some stuff and fixed levels
JaredWeakStrike Jul 18, 2023
46ed187
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Jul 18, 2023
aa05772
cor fight logic and movement logic
JaredWeakStrike Jul 22, 2023
a03feae
finished cor logic and cor skip logic
JaredWeakStrike Jul 22, 2023
bc39f43
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Jul 22, 2023
d473a1a
fixed locking party gebonuses and data_version
JaredWeakStrike Jul 22, 2023
44b4bf9
Merge branch 'kh2-regionrework' of https://github.com/JaredWeakStrike…
JaredWeakStrike Jul 22, 2023
e5173d6
fixed client disconnecting sometimes
JaredWeakStrike Jul 23, 2023
ae37269
Added a version number to slot data, new Set message for current world
JDProchaska Jul 25, 2023
fabbb27
Merge pull request #2 from JDProchaska/Feature/Poptracker-Changes
JaredWeakStrike Jul 25, 2023
ce9d4c8
made the client backwards compatabile
JaredWeakStrike Jul 25, 2023
5f3fb58
fixed magic
JaredWeakStrike Jul 26, 2023
0f28aa5
list comprehension for creating regions
JaredWeakStrike Jul 27, 2023
8623eb8
get source region and add_exits instead of names
JaredWeakStrike Jul 27, 2023
111de8e
cleaned up imports and fixed regions
JaredWeakStrike Jul 27, 2023
5e40287
removed unneeded code in connecting regions
JaredWeakStrike Aug 6, 2023
01858b0
cleaned up some imports and typing
JaredWeakStrike Aug 19, 2023
b2fa61c
cleaned up the client
JaredWeakStrike Aug 21, 2023
5e1dd4a
first step to removing the json and chache it all
JaredWeakStrike Aug 26, 2023
e4965f3
removed a lot from the seed save and cache it
JaredWeakStrike Aug 27, 2023
a8122ef
cleaned up the client and almost itemdict
JaredWeakStrike Aug 28, 2023
f7980ef
change burner mining drill
JaredWeakStrike Aug 28, 2023
3a082d4
did all suggested changes and added custom item pool
JaredWeakStrike Aug 28, 2023
d43385e
cleaned up regions even more
JaredWeakStrike Aug 28, 2023
c91d9c2
added antiform and local filler items toggle
JaredWeakStrike Aug 28, 2023
e4823d3
forgot forms in itempool option
JaredWeakStrike Aug 28, 2023
d067c90
tells the players if they are stupid
JaredWeakStrike Aug 28, 2023
696ac9c
Merge branch 'main' into kh2-regionrework
JaredWeakStrike Aug 28, 2023
dc04d67
magic is my enemy
JaredWeakStrike Aug 29, 2023
bd1fd2f
fixed swapping bounties
JaredWeakStrike Aug 29, 2023
b133bcc
some cleanup and fixed donoofy fill
JaredWeakStrike Aug 31, 2023
93961e9
fixed levels and now have jank formatting
JaredWeakStrike Aug 31, 2023
3179e35
mapped out ability to slots
JaredWeakStrike Aug 31, 2023
1a69746
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Sep 3, 2023
635c786
now remote kh2
JaredWeakStrike Sep 3, 2023
7793e77
fixed plando breaking weapon slots and client
JaredWeakStrike Sep 4, 2023
06114e6
fixed abilities on current
JaredWeakStrike Sep 9, 2023
e0a0ad1
no exp tells level depth option
JaredWeakStrike Sep 9, 2023
64621ba
summon level toggle
JaredWeakStrike Sep 10, 2023
4044631
fixed bounties if summons are off
JaredWeakStrike Sep 10, 2023
1cf063d
update the poptracker version
JaredWeakStrike Sep 11, 2023
499a28c
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Sep 27, 2023
2599e10
fix abilities being global between players
JaredWeakStrike Sep 27, 2023
9a62f49
fix spooky cave region name
JaredWeakStrike Sep 27, 2023
b8da48e
backwards compatibility and invo fix
JaredWeakStrike Oct 4, 2023
b3433ab
launch without the exe using launcher
JaredWeakStrike Oct 4, 2023
08266ac
fixed goofy
JaredWeakStrike Oct 7, 2023
89b90d8
fixes auto master logic
JaredWeakStrike Oct 8, 2023
a7114d0
Merge branch 'main' into kh2-regionrework
JaredWeakStrike Oct 19, 2023
b1a6a38
Merge branch 'main' into kh2-regionrework
JaredWeakStrike Oct 23, 2023
5db8afa
updated to apworldapi and cleaned up imports
JaredWeakStrike Oct 23, 2023
7387c23
fixed client not opening because of bad import
JaredWeakStrike Oct 24, 2023
2655e7f
cleaned up init and cleaned up some names
JaredWeakStrike Oct 29, 2023
8bcd879
missed some multiworld.optionname
JaredWeakStrike Oct 29, 2023
94fb49f
big refactor from treble's suggestions
JaredWeakStrike Oct 29, 2023
7dc781e
everything trebel said except test form thing
JaredWeakStrike Nov 4, 2023
28c77f9
Merge branch 'ArchipelagoMW:main' into kh2-regionrework
JaredWeakStrike Nov 22, 2023
30c97f0
Merge branch 'kh2-regionrework' of https://github.com/JaredWeakStrike…
JaredWeakStrike Nov 25, 2023
c938e88
dont need this
JaredWeakStrike Nov 25, 2023
1127ce4
some more of treble's suggestions
JaredWeakStrike Nov 25, 2023
48223ee
hitlist+luckyemblem removes it once
JaredWeakStrike Nov 25, 2023
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
892 changes: 3 additions & 889 deletions KH2Client.py

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@
"Clique",
"DLCQuest",
"Final Fantasy",
"Kingdom Hearts 2",
"Lufia II Ancient Cave",
"Meritous",
"Ocarina of Time",
Expand Down
881 changes: 881 additions & 0 deletions worlds/kh2/Client.py

Large diffs are not rendered by default.

1,352 changes: 514 additions & 838 deletions worlds/kh2/Items.py

Large diffs are not rendered by default.

2,458 changes: 1,021 additions & 1,437 deletions worlds/kh2/Locations.py

Large diffs are not rendered by default.

Loading