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

Super Mario land 2: implement new game #2730

Open
wants to merge 135 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
63cf1e1
Super Mario Land 2!
Alchav Dec 5, 2023
08b27a4
Bring in features from SML2R
Alchav Dec 9, 2023
df5b3e1
Many things
Alchav Dec 10, 2023
f76215e
Auto scroll option fixes
Alchav Dec 11, 2023
0453a15
Vanilla coins built into rom
Alchav Dec 11, 2023
d3d651e
Bosses location name group
Alchav Dec 11, 2023
42b4150
Add host.yaml settings for rom name
Alchav Dec 11, 2023
e97633c
Auto Scroll Trap
Alchav Dec 11, 2023
bb2622a
Exclude Level 10 from auto scroll
Alchav Dec 12, 2023
d280a3f
Mario Land 2 second release
Alchav Dec 15, 2023
e7057d5
Golden Coins Required option and midway bells protection
Alchav Dec 18, 2023
6361e95
Open World, third release
Alchav Dec 21, 2023
8830077
Super Mario Land 2 version 4 release
Alchav Dec 27, 2023
32a3ea2
Super Mario Land 2 version 5 release
Alchav Dec 27, 2023
c020676
Docs and finishing touches
Alchav Dec 28, 2023
5b5d7a0
Fix Hippo Zone
Alchav Dec 31, 2023
8b55b53
Pipe Traversal
Alchav Dec 31, 2023
1d6ce1a
EnergyLink
Alchav Dec 31, 2023
7bc39b1
Fix EnergyLink hopefully
Alchav Jan 1, 2024
9adf476
Fix Tree Zone 2 midway bell item
Alchav Jan 4, 2024
450e758
Version 9 release: shuffle secret exits
Alchav Jan 7, 2024
0df91e6
SML2R Sprite Randomizer fix
Alchav Jan 8, 2024
0e6475a
Fix Pumpkin Zone secret levels
Alchav Jan 10, 2024
09d6461
Update SML2 Docs
Alchav Jan 12, 2024
7d0e9a9
Special Thanks
Alchav Jan 12, 2024
4ea35a4
Fix Macro Zone 1 Secret Exit
Alchav Jan 12, 2024
07a5b82
SML2 finishing touches
Alchav Jan 16, 2024
f94da4c
Update worlds/marioland2/docs/en_Super Mario Land 2.md
Alchav Jan 16, 2024
c63cba9
Update worlds/marioland2/docs/setup_en.md
Alchav Jan 16, 2024
46900e0
Update worlds/marioland2/docs/setup_en.md
Alchav Jan 16, 2024
e648a74
Update readme and codeowners
Alchav Jan 19, 2024
2a1e7be
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Alchav Jan 20, 2024
6076bbf
Python 3.8 compatibility fix
Alchav Jan 20, 2024
33b197e
Pumpkin Zone 2 secret exit fix
Alchav Jan 20, 2024
3c542e3
Fix client bug when energy link disabled
Alchav Jan 21, 2024
9b8f1ce
Add SML2 description
Alchav Feb 5, 2024
ce26609
Merge branch 'main' into mario-land-2
Alchav Feb 10, 2024
7185952
remove backwards compatibility energy link test
Alchav Feb 10, 2024
cf0417a
remove unnecessary logic
Alchav Feb 10, 2024
22b80a4
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Alchav Feb 10, 2024
ce6bb78
Merge branch 'main' into mario-land-2
Alchav Mar 4, 2024
9318b71
Options dataclass
Alchav Mar 4, 2024
8ee62b5
Merge branch 'main' into mario-land-2
Alchav Mar 15, 2024
d9e261b
Coinsanity!
Alchav Mar 30, 2024
195c93a
Re-order options
Alchav Apr 1, 2024
3d87fc0
Random coinsanity checks instead of exact divisions
Alchav Apr 1, 2024
d6815ea
Rename Coinsanity to Shuffle Golden Coins
Alchav Apr 1, 2024
a4c78d6
Item Name Group fix
Alchav Apr 1, 2024
2882669
Location Name Group fix
Alchav Apr 1, 2024
a72bd17
Auto Scroll Mode
Alchav Apr 9, 2024
732dc12
Macro Zone 1 logic
Alchav Apr 11, 2024
d1ff939
Move space zone 2 boss logic to logic file
Alchav Apr 12, 2024
7c7c406
Write second auto scroll table if not trapped
Alchav Apr 12, 2024
bb1284d
Add item name groups
Alchav Apr 12, 2024
2444096
Rename options and fix up some things
Alchav Apr 12, 2024
c512b5c
Traps or Cancel Items
Alchav Apr 13, 2024
21edc9f
Adjust Mushroom Zone logic
Alchav Apr 13, 2024
0d94b12
Merge branch 'main' into mario-land-2-coinsanity
Alchav Apr 14, 2024
a1ec2cd
Begin sprite randomizer rewrite
Alchav Apr 16, 2024
354accd
Randomize platforms
Alchav Apr 16, 2024
d21f710
Mario's Castle Midway Bell
Alchav May 3, 2024
8c6e31c
Chaos auto scroll option
Alchav May 6, 2024
457c44d
Code cleanup
Alchav May 7, 2024
b818846
Sprite Randomizer fixes
Alchav May 21, 2024
7260d22
Space Zone Secret Course coin logic function name fix
Alchav May 21, 2024
cdee96d
1 Coin locations logic fix
Alchav May 21, 2024
a40ecca
Swim renamed to Water Physics
Alchav May 21, 2024
946ffd5
Merge branch 'mario-land-2-coinsanity' into mario-land-2
Alchav May 21, 2024
0049db8
Merge branch 'main' into mario-land-2
Alchav May 21, 2024
7bf1c3d
Update worlds/marioland2/docs/setup_en.md
Alchav May 21, 2024
df92408
Update worlds/marioland2/docs/setup_en.md
Alchav May 21, 2024
3b4bc52
Update worlds/marioland2/options.py
Alchav May 21, 2024
3e31f93
Remove hard logic comment
Alchav May 21, 2024
2402e26
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Alchav May 21, 2024
e295011
Check randomize enemies/platform options
Alchav May 25, 2024
cde24f6
Logic updates
Alchav May 25, 2024
3f5f25a
Turtle Zone 2 coin logic adjustment
Alchav May 28, 2024
4981e0d
Merge branch 'main' into mario-land-2
Alchav Jun 2, 2024
0824b53
Remove BizHawkClientContext import
Alchav Jun 2, 2024
7d7a577
Can't reach some coins without water physics if you are small
Alchav Jun 17, 2024
1e4ad7f
Fix item name mistakes
Alchav Jun 17, 2024
c42b746
Merge branch 'mario-land-2-coinsanity' into mario-land-2
Alchav Jun 25, 2024
ff896ad
Update worlds/marioland2/options.py
Alchav Jun 25, 2024
3f83955
Update README.md
Alchav Jun 25, 2024
a668a23
Update worlds/marioland2/docs/en_Super Mario Land 2.md
Alchav Jun 25, 2024
380418c
Update worlds/marioland2/options.py
Alchav Jun 25, 2024
fbf5f19
Update worlds/marioland2/options.py
Alchav Jun 26, 2024
d0d51bb
Reformat docstrings
Alchav Jun 26, 2024
0620ca5
Reformat Location Rules
Alchav Jun 26, 2024
8ef9388
Further fix Turtle Zone 2 logic
Alchav Jul 14, 2024
e4261dd
Macro Zone 3 Midway Bell coin logic
Aug 5, 2024
b363b69
Update worlds/marioland2/docs/en_Super Mario Land 2.md
Alchav Aug 7, 2024
7702088
Merge branch 'main' into mario-land-2
Alchav Aug 7, 2024
8b0f92d
Merge branch 'refs/heads/main' into mario-land-2
Sep 3, 2024
973f614
Fix Tree Zone 4 coin logic
Sep 3, 2024
6cdfd80
Move all location access rule logic to logic.py
Sep 3, 2024
3394101
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Sep 3, 2024
877b0b9
Double Quotes
Sep 3, 2024
e7d4e5a
Locations -> Full
Sep 3, 2024
d3cceca
More Locations -> Full
Sep 3, 2024
b70dbdf
use has_from_list_unique
Alchav Sep 3, 2024
bc558d7
use self.player_name
Alchav Sep 3, 2024
e8c5f8a
More self.player_name
Sep 3, 2024
d53431c
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Sep 3, 2024
6691a3c
Merge branch 'main' into mario-land-2
Alchav Sep 3, 2024
859f3bc
Fix unbeatable scroll levels not being forced cancellable on chaos
Sep 3, 2024
e71c226
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Sep 3, 2024
aae1b28
Update auto_scroll_max
Sep 3, 2024
f7c3a8c
Update worlds/marioland2/logic.py
Alchav Sep 3, 2024
7fabe1c
Fix Space Zone 1 coin logic
Sep 3, 2024
52fea1f
Fix non-coin rule function name generation
Sep 6, 2024
da43bda
Tree zone 4 exit rewrite
Alchav Sep 7, 2024
4c53035
Update worlds/marioland2/logic.py
Alchav Sep 7, 2024
2892855
Logic fixes
Sep 9, 2024
7c39ea9
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Sep 9, 2024
c27f5be
Pumpkin Zone Secret Course 1 return false
Sep 9, 2024
c1504c7
Macro Zone 2 return false
Sep 9, 2024
7d5a682
Update worlds/marioland2/__init__.py
Alchav Sep 10, 2024
94e58b2
Update worlds/marioland2/__init__.py
Alchav Sep 10, 2024
010c96a
Update worlds/marioland2/logic.py
Alchav Sep 10, 2024
da3a7c5
Update worlds/marioland2/logic.py
Alchav Sep 10, 2024
2e6226f
Update worlds/marioland2/logic.py
Alchav Sep 10, 2024
6126df2
Cleanup
Sep 10, 2024
d9914fe
Merge remote-tracking branch 'origin/mario-land-2' into mario-land-2
Sep 10, 2024
5519685
increase number of filler coin items
Sep 10, 2024
47a3ee3
Adjust Mario Zone 3 auto scroll max
Sep 10, 2024
34676d2
ItemsAccessibility
Sep 10, 2024
bafe770
Corrections to Mario Zone 4 logic and Pumpkin Zone 1 auto scroll max
Sep 10, 2024
d1f136b
Pumpkin Zone 1 unbeatable with Midway Bells unshuffled
Sep 16, 2024
89fb55c
Merge branch 'refs/heads/main' into mario-land-2
Sep 16, 2024
74c6e9f
SML2: whole lotta coin items
Dec 5, 2024
9ca800e
Start at ID 1
Dec 5, 2024
f9d8f3d
Merge branch 'refs/heads/main' into mario-land-2
Dec 5, 2024
fc5af14
Merge branch 'main' into mario-land-2
Alchav Dec 5, 2024
6c2b4e5
fix merge conflict mistake
Alchav Dec 5, 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
Update worlds/marioland2/docs/setup_en.md
Co-authored-by: Nicholas Saylor <79181893+nicholassaylor@users.noreply.github.com>
Alchav and nicholassaylor authored Jan 16, 2024
commit c63cba983b42a92554529304ca2891c79892f12d
2 changes: 1 addition & 1 deletion worlds/marioland2/docs/setup_en.md
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ an experience customized for their taste, and different players in the same mult

### Where do I get a YAML file?

You can generate a yaml or download a template by visiting the [Super Mario Land 2 Player Settings Page](/games/Super%20Mario%20Land%202/player-settings)
You can generate a yaml or download a template by visiting the [Super Mario Land 2 Player Options Page](/games/Super%20Mario%20Land%202/player-options)

## Joining a MultiWorld Game