morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Super Mario Land 2: Logic fixes #5258

Browse Source 
Co-authored-by: alchav <alchav@jalchavware.com>
This commit is contained in:
Alchav
2025-10-17 10:32:58 -04:00
committed by GitHub
parent da519e7f73
commit 3f2942c599
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
worlds/marioland2/logic.py
View File

@@ -106,26 +106,38 @@ def tree_zone_4_midway_bell(state, player):
def tree_zone_4_coins(state, player, coins): def tree_zone_4_coins(state, player, coins):
auto_scroll = is_auto_scroll(state, player, "Tree Zone 4") auto_scroll = is_auto_scroll(state, player, "Tree Zone 4")
reachable_coins = 0 entryway = 14
hall = 4
first_trip_downstairs = 31
second_trip_downstairs = 15
downstairs_with_auto_scroll = 12
final_room = 10
reachable_coins_from_start = 0
reachable_coins_from_bell = 0
if has_pipe_up(state, player): if has_pipe_up(state, player):
reachable_coins += 14 reachable_coins_from_start += entryway
if has_pipe_right(state, player): if has_pipe_right(state, player):
reachable_coins += 4 reachable_coins_from_start += hall
if has_pipe_down(state, player): if has_pipe_down(state, player):
reachable_coins += 10 if auto_scroll:
if not auto_scroll: reachable_coins_from_start += downstairs_with_auto_scroll
reachable_coins += 46 else:
elif state.has("Tree Zone 4 Midway Bell", player): reachable_coins_from_start += final_room + first_trip_downstairs + second_trip_downstairs
if not auto_scroll: if state.has("Tree Zone 4 Midway Bell", player):
if has_pipe_left(state, player): if has_pipe_down(state, player) and (auto_scroll or not has_pipe_left(state, player)):
reachable_coins += 18 reachable_coins_from_bell += final_room
elif has_pipe_left(state, player) and not auto_scroll:
if has_pipe_down(state, player): if has_pipe_down(state, player):
reachable_coins += 10 reachable_coins_from_bell += first_trip_downstairs
if has_pipe_right(state, player):
reachable_coins_from_bell += entryway + hall
if has_pipe_up(state, player): if has_pipe_up(state, player):
reachable_coins += 46 reachable_coins_from_bell += second_trip_downstairs + final_room
elif has_pipe_down(state, player): else:
reachable_coins += 10 reachable_coins_from_bell += entryway + hall
return coins <= reachable_coins return coins <= max(reachable_coins_from_start, reachable_coins_from_bell)
def tree_zone_5_boss(state, player): def tree_zone_5_boss(state, player):
@@ -239,12 +251,9 @@ def pumpkin_zone_4_coins(state, player, coins):
def mario_zone_1_normal_exit(state, player): def mario_zone_1_normal_exit(state, player):
if has_pipe_right(state, player): return has_pipe_right(state, player) and (not is_auto_scroll(state, player, "Mario Zone 1")
if state.has_any(["Mushroom", "Fire Flower", "Carrot", "Mario Zone 1 Midway Bell"], player): or state.has_any(["Mushroom", "Fire Flower", "Carrot",
return True "Mario Zone 1 Midway Bell"], player))
if is_auto_scroll(state, player, "Mario Zone 1"):
return True
return False
def mario_zone_1_midway_bell(state, player): def mario_zone_1_midway_bell(state, player):