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: 20221101 update (#1479)

Browse Source 
This adds support to most of Varia's 20221101 update. Notably, added Options for:
- Objectives
- Tourian
- RelaxedRoundRobinCF

As well as previously unsupported Options:
- EscapeRando
- RemoveEscapeEnemies
- HideItems
This commit is contained in:
lordlou
2023-04-09 18:35:46 -04:00
committed by GitHub
parent 0bc5a3bc8d
commit 6059b5ef66
78 changed files with 3214 additions and 24689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
worlds/sm/variaRandomizer/logic/smboolmanager.py
View File

@@ -5,14 +5,16 @@ from ..logic.smbool import SMBool, smboolFalse
from ..logic.helpers import Bosses
from ..logic.logic import Logic
from ..utils.doorsmanager import DoorsManager
from ..utils.objectives import Objectives
from ..utils.parameters import Knows, isKnows
import logging
import sys
class SMBoolManager(object):
items = ['ETank', 'Missile', 'Super', 'PowerBomb', 'Bomb', 'Charge', 'Ice', 'HiJump', 'SpeedBooster', 'Wave', 'Spazer', 'SpringBall', 'Varia', 'Plasma', 'Grapple', 'Morph', 'Reserve', 'Gravity', 'XRayScope', 'SpaceJump', 'ScrewAttack', 'Nothing', 'NoEnergy', 'MotherBrain', 'Hyper'] + Bosses.Golden4()
items = ['ETank', 'Missile', 'Super', 'PowerBomb', 'Bomb', 'Charge', 'Ice', 'HiJump', 'SpeedBooster', 'Wave', 'Spazer', 'SpringBall', 'Varia', 'Plasma', 'Grapple', 'Morph', 'Reserve', 'Gravity', 'XRayScope', 'SpaceJump', 'ScrewAttack', 'Nothing', 'NoEnergy', 'MotherBrain', 'Hyper', 'Gunship'] + Bosses.Golden4() + Bosses.miniBosses()
countItems = ['Missile', 'Super', 'PowerBomb', 'ETank', 'Reserve']
percentItems = ['Bomb', 'Charge', 'Ice', 'HiJump', 'SpeedBooster', 'Wave', 'Spazer', 'SpringBall', 'Varia', 'Plasma', 'Grapple', 'Morph', 'Gravity', 'XRayScope', 'SpaceJump', 'ScrewAttack']
def __init__(self, player=0, maxDiff=sys.maxsize, onlyBossLeft = False, lastAP = 'Landing Site'):
self._items = { }
self._counts = { }
@@ -24,12 +26,13 @@ class SMBoolManager(object):
self.lastAP = lastAP
# cache related
self.cacheKey = 0
self.computeItemsPositions()
#self.cacheKey = 0
#self.computeItemsPositions()
Cache.reset()
Logic.factory('vanilla')
self.helpers = Logic.HelpersGraph(self)
self.doorsManager = DoorsManager()
self.objectives = Objectives.objDict[player]
self.createFacadeFunctions()
self.createKnowsFunctions(player)
self.resetItems()
@@ -97,8 +100,8 @@ class SMBoolManager(object):
self._items = { item : smboolFalse for item in self.items }
self._counts = { item : 0 for item in self.countItems }
self.cacheKey = 0
Cache.update(self.cacheKey)
#self.cacheKey = 0
#Cache.update(self.cacheKey)
def addItem(self, item):
# a new item is available
@@ -106,11 +109,11 @@ class SMBoolManager(object):
if self.isCountItem(item):
count = self._counts[item] + 1
self._counts[item] = count
self.computeNewCacheKey(item, count)
else:
self.computeNewCacheKey(item, 1)
#self.computeNewCacheKey(item, count)
#else:
#self.computeNewCacheKey(item, 1)
Cache.update(self.cacheKey)
#Cache.update(self.cacheKey)
def addItems(self, items):
if len(items) == 0:
@@ -120,11 +123,11 @@ class SMBoolManager(object):
if self.isCountItem(item):
count = self._counts[item] + 1
self._counts[item] = count
self.computeNewCacheKey(item, count)
else:
self.computeNewCacheKey(item, 1)
#self.computeNewCacheKey(item, count)
#else:
#self.computeNewCacheKey(item, 1)
Cache.update(self.cacheKey)
#Cache.update(self.cacheKey)
def removeItem(self, item):
# randomizer removed an item (or the item was added to test a post available)
@@ -133,12 +136,12 @@ class SMBoolManager(object):
self._counts[item] = count
if count == 0:
self._items[item] = smboolFalse
self.computeNewCacheKey(item, count)
#self.computeNewCacheKey(item, count)
else:
self._items[item] = smboolFalse
self.computeNewCacheKey(item, 0)
#self.computeNewCacheKey(item, 0)
Cache.update(self.cacheKey)
#Cache.update(self.cacheKey)
def createFacadeFunctions(self):
for fun in dir(self.helpers):
@@ -147,22 +150,51 @@ class SMBoolManager(object):
def traverse(self, doorName):
return self.doorsManager.traverse(self, doorName)
def canPassG4(self):
return self.objectives.canClearGoals(self, 'Golden Four')
def hasItemsPercent(self, percent, totalItemsCount=None):
if totalItemsCount is None:
totalItemsCount = self.objectives.getTotalItemsCount()
currentItemsCount = self.getCollectedItemsCount()
return SMBool(100*(currentItemsCount/totalItemsCount) >= percent)
def getCollectedItemsCount(self):
return (len([item for item in self._items if self.haveItem(item) and item in self.percentItems])
+ sum([self.itemCount(item) for item in self._items if self.isCountItem(item)]))
def createKnowsFunctions(self, player):
# for each knows we have a function knowsKnows (ex: knowsAlcatrazEscape()) which
# take no parameter
for knows in Knows.__dict__:
if isKnows(knows):
if player in Knows.knowsDict and knows in Knows.knowsDict[player].__dict__:
setattr(self, 'knows'+knows, lambda knows=knows: SMBool(Knows.knowsDict[player].__dict__[knows].bool,
Knows.knowsDict[player].__dict__[knows].difficulty,
knows=[knows]))
else:
# if knows not in preset, use default values
setattr(self, 'knows'+knows, lambda knows=knows: SMBool(Knows.__dict__[knows].bool,
Knows.__dict__[knows].difficulty,
knows=[knows]))
self._createKnowsFunction(knows, player)
def _setKnowsFunction(self, knows, k):
setattr(self, 'knows'+knows, lambda: SMBool(k.bool, k.difficulty,
knows=[knows]))
def _createKnowsFunction(self, knows, player):
if player in Knows.knowsDict and knows in Knows.knowsDict[player].__dict__:
self._setKnowsFunction(knows, Knows.knowsDict[player].__dict__[knows])
else:
self._setKnowsFunction(knows, Knows.__dict__[knows])
def changeKnows(self, knows, newVal):
if isKnows(knows):
self._setKnowsFunction(knows, newVal)
#Cache.reset()
else:
raise ValueError("Invalid knows "+str(knows))
def restoreKnows(self, knows):
if isKnows(knows):
self._createKnowsFunction(knows)
#Cache.reset()
else:
raise ValueError("Invalid knows "+str(knows))
def isCountItem(self, item):
return item in self.countItems
@@ -174,6 +206,12 @@ class SMBoolManager(object):
def haveItem(self, item):
#return self.state.has(item, self.player)
return self._items[item]
def haveItems(self, items):
for item in items:
if not self.haveItem(item):
return smboolFalse
return SMBool(True)
wand = staticmethod(SMBool.wand)
wandmax = staticmethod(SMBool.wandmax)
@@ -218,11 +256,11 @@ class SMBoolManagerPlando(SMBoolManager):
if isCount:
count = self._counts[item] + 1
self._counts[item] = count
self.computeNewCacheKey(item, count)
else:
self.computeNewCacheKey(item, 1)
#self.computeNewCacheKey(item, count)
#else:
#self.computeNewCacheKey(item, 1)
Cache.update(self.cacheKey)
#Cache.update(self.cacheKey)
def removeItem(self, item):
# randomizer removed an item (or the item was added to test a post available)
@@ -231,14 +269,14 @@ class SMBoolManagerPlando(SMBoolManager):
self._counts[item] = count
if count == 0:
self._items[item] = smboolFalse
self.computeNewCacheKey(item, count)
#self.computeNewCacheKey(item, count)
else:
dup = 'dup_'+item
if self._items.get(dup, None) is None:
self._items[item] = smboolFalse
self.computeNewCacheKey(item, 0)
#self.computeNewCacheKey(item, 0)
else:
del self._items[dup]
self.computeNewCacheKey(item, 1)
#self.computeNewCacheKey(item, 1)
Cache.update(self.cacheKey)
#Cache.update(self.cacheKey)