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

Jump to bottom

Mega Man 2: Implement New Game #3256

Merged
merged 172 commits into from
Aug 20, 2024
Merged

Mega Man 2: Implement New Game #3256

Changes from 1 commit
Commits
Show all changes
172 commits
Select commit Hold shift + click to select a range
b3bafd1
initial (broken) commit
Silvris May 17, 2023
b77a168
small work on init
Silvris May 21, 2023
92367b3
Update Items.py
Silvris May 21, 2023
25ec499
beginning work, some rom patches
Silvris Jul 3, 2023
44c28e6
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Jul 7, 2023
9a0c9c4
commit progress from bh branch
Silvris Aug 16, 2023
3d7b22f
Merge branch 'main' into mm2
Silvris Aug 16, 2023
beabf37
deathlink, fix soft-reset kill, e-tank loss
Silvris Aug 21, 2023
b8c6a5d
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Oct 3, 2023
b7f3dac
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Oct 3, 2023
4a02645
begin work on targeting new bhclient
Silvris Oct 4, 2023
6d989da
write font
Silvris Oct 9, 2023
994f33c
Merge branch 'ArchipelagoMW:main' into mm2
Silvris Nov 29, 2023
a79d66d
definitely didn't forget to add the other two hashes no
Silvris Dec 2, 2023
9eb6ae9
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Jan 7, 2024
b9bfd56
update to modern options, begin colors
Silvris Jan 7, 2024
e6f0a03
fix 6th letter bug
Silvris Jan 18, 2024
0688aa1
palette shuffle + logic rewrite
Silvris Feb 18, 2024
058cf42
fix a bunch of pointers
Silvris Feb 19, 2024
758e0ee
fix color changes, deathlink, and add wily 5 req
Silvris Feb 22, 2024
e40918c
adjust weapon weakness generation
Silvris Feb 25, 2024
de81bc2
Update Rules.py
Silvris Mar 2, 2024
78b7f9e
attempt wily 5 softlock fix
Silvris Mar 7, 2024
44aaccc
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Mar 7, 2024
6fb7daf
add explicit test for rbm weaknesses
Silvris Mar 7, 2024
858a6f3
fix difficulty and hard reset
Silvris Mar 8, 2024
3c49e1a
fix connect deathlink and off by one item color
Silvris Mar 8, 2024
636bf8d
fix atomic fire again
Silvris Mar 9, 2024
9144f26
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Mar 9, 2024
33bd75d
de-jank deathlink
Silvris Mar 9, 2024
2446bac
rewrite wily5 rule
Silvris Mar 10, 2024
5cd2b05
fix rare solo-gen fill issue, hopefully
Silvris Mar 15, 2024
956266c
Update Client.py
Silvris Mar 15, 2024
9cd54ff
fix wily 5 requirements
Silvris Mar 16, 2024
633f59f
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Mar 16, 2024
ed145a8
undo fill hook
Silvris Mar 16, 2024
736d9d9
fix picopico-kun rules
Silvris Mar 20, 2024
4d05c5e
for real this time
Silvris Mar 20, 2024
8cb7ddd
update minimum damage requirement
Silvris Mar 29, 2024
3184954
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Mar 29, 2024
40410d7
begin move to procedure patch
Silvris Mar 29, 2024
1d1f129
finish move to APPP, allow rando boobeam, color updates
Silvris Apr 3, 2024
8e3d39b
fix color bug, UT support?
Silvris Apr 3, 2024
3a667d5
what do you mean I forgot the procedure
Silvris Apr 3, 2024
43071a4
fix UT?
Silvris Apr 4, 2024
0179ea3
plando weakness and fixes
Silvris Apr 4, 2024
946c0b6
sfx when item received, more time stopper edge cases
Silvris Apr 4, 2024
5c16f80
Update test_weakness.py
Silvris Apr 7, 2024
ec6ba7e
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Apr 7, 2024
2f1a626
fix rules and color bug
Silvris Apr 7, 2024
04694a5
fix color bug, support reduced flashing
Silvris Apr 8, 2024
a621f8c
major world overhaul
Silvris Apr 11, 2024
baececd
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Apr 11, 2024
17025d8
Update Locations.py
Silvris Apr 11, 2024
cc91cc8
fix first found bugs
Silvris Apr 11, 2024
8821412
mypy cleanup
Silvris Apr 12, 2024
78b25f1
headerless roms
Silvris Apr 12, 2024
8410049
Update Rom.py
Silvris Apr 12, 2024
4be1122
further cleanup
Silvris Apr 12, 2024
5836410
work on energylink
Silvris Apr 13, 2024
a56aee5
el fixes
Silvris Apr 14, 2024
f0f5b6f
update to energylink 2.0 packet
Silvris Apr 14, 2024
fdddb5d
energylink balancing
Silvris Apr 14, 2024
2f6301a
potentially break other clients, more balancing
Silvris Apr 14, 2024
e3c21e9
Update Items.py
Silvris Apr 14, 2024
476b08e
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Apr 14, 2024
75abfe3
remove startup change from basepatch
Silvris Apr 14, 2024
a7cf6dd
el balancing and feedback
Silvris Apr 15, 2024
c92188e
hopefully less test failures?
Silvris Apr 15, 2024
2042127
implement world version check
Silvris Apr 15, 2024
ac37226
add weapon/health option
Silvris Apr 15, 2024
b47c480
Update Rom.py
Silvris Apr 15, 2024
d872e33
x/x2
Silvris Apr 15, 2024
ae6fc2f
specials
Silvris Apr 15, 2024
d8f9430
Update Color.py
Silvris Apr 15, 2024
495b9e3
Update Options.py
Silvris Apr 15, 2024
d00eea0
finally apply location groups
Silvris Apr 15, 2024
89f2cbe
bump minor version number instead
Silvris Apr 15, 2024
c4bde5e
fix duplicate stage sends
Silvris Apr 17, 2024
05155ec
validate wily 5, tests
Silvris Apr 17, 2024
4d80bae
see if renaming fixes
Silvris Apr 17, 2024
465828f
add shuffled weakness
Silvris Apr 17, 2024
5dec7ac
remove passwords
Silvris Apr 18, 2024
9e7d9ab
refresh rbm select, fix wily 5 validation
Silvris Apr 18, 2024
96e3900
forgot we can't check 0
Silvris Apr 18, 2024
5674610
oops I broke the basepatch (remove failing test later)
Silvris Apr 18, 2024
b103b1c
fix solo gen fill error?
Silvris Apr 20, 2024
fb28d87
fix webhost patch recognition
Silvris Apr 20, 2024
c39ddc9
fix imports, basepatch
Silvris Apr 20, 2024
1d5b3e3
move to flexibility metric for boss validation
Silvris Apr 20, 2024
272ba87
special case boobeam trap
Silvris Apr 20, 2024
4e05fc3
block strobe on stage select init
Silvris Apr 20, 2024
37cf6f6
more energylink balancing
Silvris Apr 21, 2024
26768c2
bump world version
Silvris Apr 21, 2024
556a77b
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Apr 21, 2024
e47f4a0
wily HP inaccurate in validation
Silvris Apr 21, 2024
c363320
fix validation edge case
Silvris Apr 21, 2024
5625a09
save last completed wily to data storage
Silvris Apr 21, 2024
a4108cd
mypy and pep8 cleanup
Silvris Apr 21, 2024
fd62563
fix file browse validation
Silvris Apr 26, 2024
6ff1c63
fix test failure, add enemy weakness
Silvris Apr 27, 2024
2479fa4
remove test seed
Silvris Apr 27, 2024
6e09cc8
update enemy damage
Silvris Apr 29, 2024
9315b33
inno setup
Silvris Apr 30, 2024
c457b77
Update en_Mega Man 2.md
Silvris Apr 30, 2024
9c1fe48
setup guide
Silvris Apr 30, 2024
7d761ad
Update en_Mega Man 2.md
Silvris Apr 30, 2024
dc31fa7
finish plando weakness section
Silvris Apr 30, 2024
b881df0
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Apr 30, 2024
01963b8
starting rbm edge case
Silvris May 2, 2024
efa6bb4
Merge remote-tracking branch 'upstream/main' into mm2
Silvris May 3, 2024
99f2d38
remove * imports
Silvris May 3, 2024
781be64
properly wrap later weakness additions in regen playthrough
Silvris May 3, 2024
03fd1ec
fix import
Silvris May 3, 2024
d5b9056
forgot readme
Silvris May 3, 2024
0346ef5
remove time stopper special casing
Silvris May 3, 2024
5536277
properly type added locations
Silvris May 3, 2024
b08446a
Merge branch 'main' into mm2
Silvris May 5, 2024
3e528ff
Update CODEOWNERS
Silvris May 6, 2024
09069f4
Merge branch 'main' into mm2
Silvris May 6, 2024
60dac37
Merge branch 'main' into mm2
Silvris May 18, 2024
1658e9c
add animation reduction
Silvris May 21, 2024
bac14d9
Merge branch 'main' into mm2
Silvris May 28, 2024
d5db9ea
deprioritize Time Stopper in rush checks
Silvris May 31, 2024
a5c400d
special case wily phase 1
Silvris May 31, 2024
d9bf59e
fix key error
Silvris May 31, 2024
c5a4035
forgot the test
Silvris May 31, 2024
5a82c82
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Jun 1, 2024
c8769c3
Merge branch 'ArchipelagoMW:main' into mm2
Silvris Jul 4, 2024
c7285a7
music and general cleanup
Silvris Jul 25, 2024
02934a7
the great rename
Silvris Jul 25, 2024
093dc5c
fix import
Silvris Jul 25, 2024
4984adc
thanks pycharm
Silvris Jul 25, 2024
dcca27e
reorder palette shuffle
Silvris Jul 25, 2024
6f09bcb
Merge remote-tracking branch 'upstream/main' into mm2
Silvris Jul 25, 2024
87d5dd8
account for alien on shuffled weakness
Silvris Jul 25, 2024
e1e8186
apply suggestions
Silvris Jul 25, 2024
fd94e40
fix seedbleed
Silvris Jul 25, 2024
f196854
fix invalid buster passthrough
Silvris Jul 25, 2024
a17ca2d
fix weakness landing beneath required amount
Silvris Jul 25, 2024
d96b0fb
fix failsafe
Silvris Jul 25, 2024
1050496
finish music
Silvris Jul 25, 2024
94d4ae6
Merge branch 'main' into mm2
Silvris Aug 8, 2024
ce87e56
Merge branch 'main' into mm2
Silvris Aug 9, 2024
36e1cef
fix Time Stopper on Flash/Alien
Silvris Aug 9, 2024
0272133
asar pls
Silvris Aug 10, 2024
712a172
Apply suggestions from code review
Silvris Aug 15, 2024
353d750
world helpers
Silvris Aug 16, 2024
123d5f7
init cleanup
Silvris Aug 16, 2024
7537947
apostrophes
Silvris Aug 16, 2024
3c46e76
clearer wording
Silvris Aug 16, 2024
ba132d9
mypy and cleanup
Silvris Aug 16, 2024
5f004cf
options doc cleanup
Silvris Aug 16, 2024
c8ac1ba
Update rom.py
Silvris Aug 16, 2024
89a58bd
rules cleanup
Silvris Aug 16, 2024
d209e30
Update __init__.py
Silvris Aug 16, 2024
7af5a6f
Update __init__.py
Silvris Aug 16, 2024
02070b8
move to defaultdict
Silvris Aug 16, 2024
2faefd0
cleanup world helpers
Silvris Aug 16, 2024
4d01321
Merge branch 'main' into mm2
Silvris Aug 16, 2024
948fd09
Update __init__.py
Silvris Aug 16, 2024
b14c02e
Merge branch 'mm2' of https://github.com/Silvris/Archipelago into mm2
Silvris Aug 16, 2024
ac96ce6
Merge branch 'main' into mm2
Silvris Aug 19, 2024
ea1da22
remove unnecessary line from fill hook
Silvris Aug 19, 2024
5348438
Merge branch 'mm2' of https://github.com/Silvris/Archipelago into mm2
Silvris Aug 19, 2024
2d31b24
forgot the other one
Silvris Aug 19, 2024
7d7b838
apply code review
Silvris Aug 19, 2024
0cf3549
remove collect
Silvris Aug 19, 2024
39e5985
Update rules.py
Silvris Aug 19, 2024
8633866
forgot another
Silvris Aug 19, 2024
47cd820
Merge branch 'main' into mm2
Silvris Aug 19, 2024
29ee838
Merge branch 'main' into mm2
Silvris Aug 20, 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
Prev Previous commit
Next Next commit
Merge branch 'main' into mm2
  • Loading branch information
@Silvris
Silvris authored Aug 16, 2024
commit 4d01321893007e0d3a7feba19e4b41cac0026823

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.