-
Notifications
You must be signed in to change notification settings - Fork 909
KH2 game implementation #1438
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
Berserker66
merged 231 commits into
ArchipelagoMW:main
from
JaredWeakStrike:KH2-Game-Implementation
Mar 20, 2023
Merged
KH2 game implementation #1438
Changes from 220 commits
Commits
Show all changes
231 commits
Select commit
Hold shift + click to select a range
c5e9b52
Add files via upload
JaredWeakStrike 9ad0431
Delete kh2 directory
JaredWeakStrike 3e0f848
Add files via upload
JaredWeakStrike fc45d87
fixed output
JaredWeakStrike 725a71d
Fixing output again
JaredWeakStrike 2d5cce1
Tom wanted to see my code
JaredWeakStrike fee3883
Adding Location ID and Item ID To their object
JaredWeakStrike b519e42
Locations and Regions fixed
JaredWeakStrike 63f0263
changed alot
JaredWeakStrike fdf8757
Fixing Logic
JaredWeakStrike 6fc502f
forsm now have logic
JaredWeakStrike 44a3a43
made rules for option visit locking
JaredWeakStrike afa4bd2
dummy push
JaredWeakStrike 8beea87
Up to date ap
JaredWeakStrike ab1c1c7
Merge branch 'main' of https://github.com/JaredWeakStrike/Archipelago
JaredWeakStrike b9f5bf3
etg
JaredWeakStrike 8b552a7
Revert "etg"
JaredWeakStrike bc38e8d
I hate github
JaredWeakStrike 2682268
lets see if this works
JaredWeakStrike d054843
github is confusing
JaredWeakStrike b3b90c1
Fixed the git push schnanigens as well makde lvup work (still need to…
JaredWeakStrike f4dba2a
Lets try this again
JaredWeakStrike a4e6db2
I Hate Github
JaredWeakStrike c9e6a41
A lot of things
JaredWeakStrike 2ec7739
More Clean
JaredWeakStrike dd77a57
Added file output
JaredWeakStrike 4564ab6
fixed levels again
JaredWeakStrike 8933799
Thanks bulcon and key
JaredWeakStrike d0e76a8
Added Crit starting items and schmovement
JaredWeakStrike 9d64487
Donald/Goofy Abilites
JaredWeakStrike 9603e56
Refortmating and make options for promise charm
JaredWeakStrike 1585266
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike cf312bd
client debugging
JaredWeakStrike 5cc9922
Merge branch 'main' of https://github.com/JaredWeakStrike/Archipelago
JaredWeakStrike 7afec61
Beginning of lua tracking
JaredWeakStrike 0af3990
Memory addresses for locations
JaredWeakStrike e1622f8
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 43ad32a
Client Pymem thingy
JaredWeakStrike a8085d6
lets try running game to ap now
JaredWeakStrike 8c90d77
Passed all the tests
JaredWeakStrike 9ccdd27
Uptodate testing
JaredWeakStrike cdc340b
fixxed location.address and items.code
JaredWeakStrike 0d37238
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike a434ca9
cleaned up every file
JaredWeakStrike d14131f
Merge branch 'main' of https://github.com/JaredWeakStrike/Archipelago
JaredWeakStrike a41939f
Read description a lot of stuff
JaredWeakStrike 5ef3575
Fixed reports and limit form bitshift
JaredWeakStrike 861bd3d
fixed growth being recived
JaredWeakStrike 6f26282
fixed level conditional having unfilled locations
JaredWeakStrike cbc9bc6
fixed forms and multi kh2 generation
JaredWeakStrike c18f756
fixed forms maybe
JaredWeakStrike 8fc54ef
fixed a few report bits and staffs in the pool
JaredWeakStrike 148ebe0
hopefully fixed receiveing movement
JaredWeakStrike 0a33f87
Fixed movement overflow check desc
JaredWeakStrike ec1d22b
fixed back of invo and logic keys name
JaredWeakStrike 7e6d629
Fixed growth and village cave
JaredWeakStrike 8de4fdc
fixed levels and goa
JaredWeakStrike 4757847
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 2f680c1
fixed me being stupid and keyblade slots
JaredWeakStrike 6154a27
fixed client crashing when the game crashes
JaredWeakStrike cde5398
Merge branch 'main' of https://github.com/JaredWeakStrike/Archipelago
JaredWeakStrike a3d5d06
first data org test. added second visit locking support
JaredWeakStrike 2c3aa46
forgot somthing in the client
JaredWeakStrike 14a4572
maybe fixed final xemnas tracking
JaredWeakStrike 440707d
fixed all locaitons name and read descrio
JaredWeakStrike 921607d
fixed all the chests
JaredWeakStrike fbd8c83
hopefully added not autotracking while not being connected
JaredWeakStrike 975423c
Fixed tt2/3 logic and updated a lot of names
JaredWeakStrike 72b39c3
The Great Item and Location Refractor
JaredWeakStrike bec5267
fixed some items qunatity and logic
JaredWeakStrike 18d403b
this is holding my breakfast hostage
JaredWeakStrike 1c2ce00
Added data tracking. Cleaned up code
JaredWeakStrike d4dc4f5
fixed data axel bit
JaredWeakStrike decc5ec
fixed a few location names
JaredWeakStrike 8dcf7e9
hopefully fixed the death item bug
JaredWeakStrike ef7abca
fixed death items and final xemnas mem address
JaredWeakStrike 33dacec
Useful,More Options, Fixed Id's
JaredWeakStrike 0827b24
actually add blacklist keyblade abilities
JaredWeakStrike 0bca9fe
hopefully fixed magic crashing
JaredWeakStrike 94f7485
fixed itemcode being bad
JaredWeakStrike bb2fd8e
fixed the try
JaredWeakStrike 1f0aec8
fixed schmovement,party member abilites and added victory support
JaredWeakStrike 5507ac8
added 0 schmovement
JaredWeakStrike 8c2d91a
added support for game completetion
JaredWeakStrike 309bd73
fixed starting invo read des
JaredWeakStrike b6c6f7d
read descp tldr fixed giving stuff on load
JaredWeakStrike 3070e7f
actually fixed stuff with the client
JaredWeakStrike 66474d8
added oc demyx to popups
JaredWeakStrike b6c02a2
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 9846923
fixed bug in random keyblade stats
JaredWeakStrike 529bc2b
Added Local Website support
JaredWeakStrike 8f4db53
fixed me being stupid
JaredWeakStrike 88ce8bc
fixed some imports that were not used
JaredWeakStrike 7835b1d
fixed file name for the seed
JaredWeakStrike 8292a56
Added kh2saves to the client
JaredWeakStrike eaba2fe
make it so if the client closes it makes the save
JaredWeakStrike 37a6bd9
fixed some client stuff and cleaned up openkh
JaredWeakStrike 5adb90e
the great pycharm pep8 refactor
JaredWeakStrike 552bd08
added a lot of stuff (read desc)
JaredWeakStrike 04c5516
fixed things and actually pushed the client changes
JaredWeakStrike 7446623
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike c7cd4e9
removed abn and added lucky emblem wincon
JaredWeakStrike b47fee2
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike aead69c
added hitlist support
JaredWeakStrike 5e08500
forgot a few things
JaredWeakStrike 76bfb08
fixed even more
JaredWeakStrike ef11d41
cleaned up code and added more hitlist stuff
JaredWeakStrike a6593b8
added alot for visit locking (read desc)
JaredWeakStrike f1fadb3
added struggle weapons draws
JaredWeakStrike b8d8d6d
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 821a638
fixed magic crashes and added logic support for visit locking
JaredWeakStrike 4804b42
gotta commit
JaredWeakStrike 7b34bec
revert
JaredWeakStrike e761c81
Update __init__.py
JaredWeakStrike 67fdfba
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 638d050
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike 0cf792a
fixed bad changes
JaredWeakStrike e3e66b9
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 354d9a8
moved static stuff to qol mod and fixed tabbing
JaredWeakStrike 73161f2
Update __init__.py
JaredWeakStrike aa090c6
fixed magic crashing finally and move
JaredWeakStrike 72fa270
Merge branch 'main' of https://github.com/JaredWeakStrike/Archipelago
JaredWeakStrike 811bcf8
updated some things to go with the ap companion
JaredWeakStrike 051b675
updated some stuff
JaredWeakStrike 44d6a89
update the client
JaredWeakStrike ced220e
added more logic and cleaned up cups
JaredWeakStrike b5de7ea
fixed the client self.now bug and cup option
JaredWeakStrike afc4d36
Added more logic and options
JaredWeakStrike 41ef9fa
added logic for transport and as removal
JaredWeakStrike 761bf89
fixed client and added docs
JaredWeakStrike 6134b5b
trying to fix level balancing #take 1
JaredWeakStrike bb54a22
Delete connect-to-ap-server.png
JaredWeakStrike 8aa80b2
cleaned up the docs
JaredWeakStrike 4fd12f3
cleaned up the docs
JaredWeakStrike f016a87
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 627fd01
changed level region and removed firstvisitlocking
JaredWeakStrike 2bbf88b
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 9ac6a0b
now need to room transition twice to get magic
JaredWeakStrike f3349bf
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike c50d0ca
changed magic to on pause and changed deathstate
JaredWeakStrike b8467e8
fixed proofs being sent on kill final xemnas and twtnw region
JaredWeakStrike 70038e7
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike d355341
fixed regions after main pull
JaredWeakStrike f56553c
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 245cece
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 11a42c8
cleaned up some code and fixed datapackage
JaredWeakStrike 63e2c4b
fixed cups
JaredWeakStrike 80c99be
fixed cups again
JaredWeakStrike 61c3d24
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike aaa5f92
linked autotracking to connection
JaredWeakStrike 9f66e0f
Update __init__.py
JaredWeakStrike 9fca26f
removed max logic option
JaredWeakStrike f55f49f
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike f7f459b
fixed twtnw region logic
JaredWeakStrike a222aac
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 6e82807
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 1f0ca83
added kh2client to setup guide
JaredWeakStrike a2bf16f
Merge branch 'KH2-Game-Implementation'
JaredWeakStrike 268c7cd
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 9cbebab
import * from items
JaredWeakStrike c8b1217
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike e9686b6
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike d880c71
Update __init__.py
JaredWeakStrike 528e2e8
updated setup guides and hopefully fixed magic
JaredWeakStrike 04a3874
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike b5e767b
Merge branch 'KH2-Game-Implementation'
JaredWeakStrike e33877d
Update __init__.py
JaredWeakStrike 0e42b68
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 378cae5
Merge branch 'ArchipelagoMW:main' into KH2-Game-Implementation
JaredWeakStrike 538ef61
cleaned up imports and changed tt2/3 locking
JaredWeakStrike 1e7f2fa
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 6241437
Update __init__.py
JaredWeakStrike 3fa552f
actually removing picture and poster
JaredWeakStrike 10f7589
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike 9cb3790
hopefully fixed magic this time
JaredWeakStrike 4b5f179
lets try this again for the magic
JaredWeakStrike 3411cb4
accidently removed the int cast
JaredWeakStrike 648363c
me stupid and had the wrong address
JaredWeakStrike 432638b
actually fixed it
JaredWeakStrike 24f1e63
okay actually fixed magic this time for sure
JaredWeakStrike 176545c
Update __init__.py
JaredWeakStrike 9c54f76
fixed summons not being added to the json
JaredWeakStrike cfbdd35
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike ec8626c
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike aea7a78
cleaned up init and added cups logic
JaredWeakStrike f68508d
added tests and itemgroups
JaredWeakStrike 0436f45
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike b41a2b0
Update __init__.py
JaredWeakStrike 0506468
fixed dupes on death when forfeit
JaredWeakStrike 3743057
lets try death stuff again
JaredWeakStrike 9348c6a
okay actually fixed it this time
JaredWeakStrike 8c164e1
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 87d394e
actually fixed the client
JaredWeakStrike 0723d90
Read Desc. (removed none in json name)
JaredWeakStrike 54c4f15
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 47b5a1e
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 2ecab1c
fixed levels
JaredWeakStrike d70ecce
Merge branch 'KH2-Game-Implementation'
JaredWeakStrike 5c97a40
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 005a408
fixed getting twtnw checks on the starting movie
JaredWeakStrike a4c7da9
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike e7e1c5a
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 5eee172
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 67b5a20
Update __init__.py
JaredWeakStrike 500c237
update to the setup and docs
JaredWeakStrike 1813fba
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike ff7e58b
Merge branch 'KH2-Game-Implementation'
JaredWeakStrike a1e44a3
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 7afbf50
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike 8875cce
item duping fix maybe
JaredWeakStrike 5235857
reverted changes and hopefully fixed duping
JaredWeakStrike 25f7a8f
hopefully fixed item duping with a dict
JaredWeakStrike b6fdb2b
updated requirements to add pymem
JaredWeakStrike bce41c0
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 6bbf568
Update requirements.txt
JaredWeakStrike a4d7061
Read Desc; A weeks worth
JaredWeakStrike db335ec
Merge branch 'KH2-Game-Implementation' of https://github.com/JaredWea…
JaredWeakStrike e44aec6
Merge branch 'ArchipelagoMW:main' into main
JaredWeakStrike aa402ca
Merge branch 'ArchipelagoMW:main' into KH2-Game-Implementation
JaredWeakStrike 8a9e150
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 40450fa
A lot. Read Description
JaredWeakStrike 3155b3d
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike 761db3e
cleaned up some comments
JaredWeakStrike 7943f7e
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike c3e6e19
fixed some more overlook because im blind
JaredWeakStrike 5e618c2
data_version wasnt at 1
JaredWeakStrike 6dd026f
forgot to change this
JaredWeakStrike 5497de5
Merge branch 'main' into KH2-Game-Implementation
JaredWeakStrike a8507f2
Update __init__.py
JaredWeakStrike 282b54b
accidently added .bak to the gitignore
JaredWeakStrike 12178ae
Merge branch 'main' into KH2-Game-Implementation
Berserker66 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,4 +5,5 @@ jellyfish>=0.9.0 | |
jinja2>=3.1.2 | ||
schema>=0.7.5 | ||
kivy>=2.1.0 | ||
bsdiff4>=1.2.2 | ||
bsdiff4>=1.2.2 | ||
Pymem>=1.10.0 | ||
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
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.
your world specific requirements go into your world folder's requirements.txt
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.
resolved