morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

SM and SMZ3 apworld support (#1677)

Browse Source
This commit is contained in:
lordlou
2023-04-08 16:52:34 -04:00
committed by GitHub
parent f4035b8621
commit 84402a1b55
86 changed files with 522 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/smz3/TotalSMZ3/Item.py
View File

@@ -3,7 +3,7 @@ import re
import copy
from typing import List
from worlds.smz3.TotalSMZ3.Config import Config, SMLogic
from .Config import Config, SMLogic
class ItemType(Enum):
Nothing = 0
@@ -787,15 +787,15 @@ class Progression:
return self.Flute and self.CanLiftHeavy()
def CanAccessMaridiaPortal(self, world):
import worlds.smz3.TotalSMZ3.Region
from .Region import RewardType
if (world.Config.SMLogic == SMLogic.Normal):
return self.MoonPearl and self.Flippers and \
self.Gravity and self.Morph and \
(world.CanAcquire(self, worlds.smz3.TotalSMZ3.Region.RewardType.Agahnim) or self.Hammer and self.CanLiftLight() or self.CanLiftHeavy())
(world.CanAcquire(self, RewardType.Agahnim) or self.Hammer and self.CanLiftLight() or self.CanLiftHeavy())
else:
return self.MoonPearl and self.Flippers and \
(self.CanSpringBallJump() or self.HiJump or self.Gravity) and self.Morph and \
(world.CanAcquire(self, worlds.smz3.TotalSMZ3.Region.RewardType.Agahnim) or self.Hammer and self.CanLiftLight() or self.CanLiftHeavy())
(world.CanAcquire(self, RewardType.Agahnim) or self.Hammer and self.CanLiftLight() or self.CanLiftHeavy())
# Start of AP integration
items_start_id = 84000