mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 20:21:32 -06:00
SM: 20221101 update (#1479)
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
@@ -86,7 +86,7 @@ class SMWorld(World):
|
||||
|
||||
game: str = "Super Metroid"
|
||||
topology_present = True
|
||||
data_version = 2
|
||||
data_version = 3
|
||||
option_definitions = sm_options
|
||||
|
||||
item_name_to_id = {value.Name: items_start_id + value.Id for key, value in ItemManager.Items.items() if value.Id != None}
|
||||
@@ -140,8 +140,8 @@ class SMWorld(World):
|
||||
if (item in itemPool):
|
||||
itemPool.remove(item)
|
||||
|
||||
missingPool = 105 - len(itemPool) + 1
|
||||
for i in range(1, missingPool):
|
||||
missingPool = 109 - len(itemPool)
|
||||
for i in range(missingPool):
|
||||
itemPool.append(ItemManager.Items['Nothing'])
|
||||
|
||||
# Generate item pool
|
||||
@@ -209,10 +209,11 @@ class SMWorld(World):
|
||||
""" little-endian convert a 16-bit number to an array of numbers <= 255 each """
|
||||
return [w & 0x00FF, (w & 0xFF00) >> 8]
|
||||
|
||||
# used for remote location Credits Spoiler of local items
|
||||
# used for remote location Credits Spoiler of local items and Objectives' writeItemsMasks
|
||||
class DummyLocation:
|
||||
def __init__(self, name):
|
||||
self.Name = name
|
||||
self.restricted = False
|
||||
|
||||
def isBoss(self):
|
||||
return False
|
||||
@@ -337,7 +338,7 @@ class SMWorld(World):
|
||||
idx = 0
|
||||
vanillaItemTypesCount = 21
|
||||
for itemLoc in self.multiworld.get_locations():
|
||||
if itemLoc.player == self.player and locationsDict[itemLoc.name].Id != None:
|
||||
if itemLoc.player == self.player and "Boss" not in locationsDict[itemLoc.name].Class:
|
||||
# item to place in this SM world: write full item data to tables
|
||||
if isinstance(itemLoc.item, SMItem) and itemLoc.item.type in ItemManager.Items:
|
||||
itemId = ItemManager.Items[itemLoc.item.type].Id
|
||||
@@ -522,22 +523,38 @@ class SMWorld(World):
|
||||
# commit all the changes we've made here to the ROM
|
||||
romPatcher.commitIPS()
|
||||
|
||||
itemLocs = [
|
||||
ItemLocation(ItemManager.Items[itemLoc.item.type
|
||||
if isinstance(itemLoc.item, SMItem) and itemLoc.item.type in ItemManager.Items else
|
||||
'ArchipelagoItem'],
|
||||
locationsDict[itemLoc.name], True)
|
||||
for itemLoc in self.multiworld.get_locations() if itemLoc.player == self.player
|
||||
]
|
||||
romPatcher.writeItemsLocs(itemLocs)
|
||||
|
||||
itemLocs = [ItemLocation(ItemManager.Items[itemLoc.item.type], locationsDict[itemLoc.name] if itemLoc.name in locationsDict and itemLoc.player == self.player else self.DummyLocation(self.multiworld.get_player_name(itemLoc.player) + " " + itemLoc.name), True) for itemLoc in self.multiworld.get_locations() if itemLoc.item.player == self.player]
|
||||
progItemLocs = [ItemLocation(ItemManager.Items[itemLoc.item.type], locationsDict[itemLoc.name] if itemLoc.name in locationsDict and itemLoc.player == self.player else self.DummyLocation(self.multiworld.get_player_name(itemLoc.player) + " " + itemLoc.name), True) for itemLoc in self.multiworld.get_locations() if itemLoc.item.player == self.player and itemLoc.item.advancement == True]
|
||||
# progItemLocs = [ItemLocation(ItemManager.Items[itemLoc.item.type if itemLoc.item.type in ItemManager.Items else 'ArchipelagoItem'], locationsDict[itemLoc.name], True) for itemLoc in self.multiworld.get_locations() if itemLoc.player == self.player and itemLoc.item.player == self.player and itemLoc.item.advancement == True]
|
||||
|
||||
|
||||
|
||||
romPatcher.writeObjectives(itemLocs, romPatcher.settings["tourian"])
|
||||
romPatcher.writeItemsLocs(self.itemLocs)
|
||||
|
||||
# romPatcher.writeSplitLocs(self.variaRando.args.majorsSplit, itemLocs, progItemLocs)
|
||||
romPatcher.writeItemsNumber()
|
||||
if not romPatcher.settings["isPlando"]:
|
||||
romPatcher.writeSeed(romPatcher.settings["seed"]) # lol if race mode
|
||||
romPatcher.writeSpoiler(itemLocs, progItemLocs)
|
||||
romPatcher.writeRandoSettings(self.variaRando.randoExec.randoSettings, itemLocs)
|
||||
romPatcher.writeDoorConnections(romPatcher.settings["doors"])
|
||||
romPatcher.writeVersion(romPatcher.settings["displayedVersion"])
|
||||
if romPatcher.settings["ctrlDict"] is not None:
|
||||
romPatcher.writeControls(romPatcher.settings["ctrlDict"])
|
||||
if romPatcher.settings["moonWalk"] == True:
|
||||
romPatcher.enableMoonWalk()
|
||||
|
||||
romPatcher.writeMagic()
|
||||
romPatcher.writeMajorsSplit(romPatcher.settings["majorsSplit"])
|
||||
|
||||
#if self.settings["isPlando"] and self.race is None:
|
||||
# doorsPtrs = GraphUtils.getAps2DoorsPtrs()
|
||||
# self.writePlandoTransitions(self.settings["plando"]["graphTrans"], doorsPtrs,
|
||||
# self.settings["plando"]["maxTransitions"])
|
||||
# self.writePlandoAddresses(self.settings["plando"]["visitedLocations"])
|
||||
#if self.settings["isPlando"] and self.settings["plando"]["additionalETanks"] != 0:
|
||||
# self.writeAdditionalETanks(self.settings["plando"]["additionalETanks"])
|
||||
|
||||
romPatcher.end()
|
||||
|
||||
def generate_output(self, output_directory: str):
|
||||
outfilebase = self.multiworld.get_out_file_name_base(self.player)
|
||||
@@ -682,6 +699,41 @@ class SMWorld(World):
|
||||
loc.place_locked_item(item)
|
||||
loc.address = loc.item.code = None
|
||||
|
||||
def post_fill(self):
|
||||
self.itemLocs = [
|
||||
ItemLocation(ItemManager.Items[itemLoc.item.type
|
||||
if isinstance(itemLoc.item, SMItem) and itemLoc.item.type in ItemManager.Items else
|
||||
'ArchipelagoItem'],
|
||||
locationsDict[itemLoc.name], itemLoc.item.player, True)
|
||||
for itemLoc in self.multiworld.get_locations(self.player)
|
||||
]
|
||||
self.progItemLocs = [
|
||||
ItemLocation(ItemManager.Items[itemLoc.item.type
|
||||
if isinstance(itemLoc.item, SMItem) and itemLoc.item.type in ItemManager.Items else
|
||||
'ArchipelagoItem'],
|
||||
locationsDict[itemLoc.name], itemLoc.item.player, True)
|
||||
for itemLoc in self.multiworld.get_locations(self.player) if itemLoc.item.advancement
|
||||
]
|
||||
for itemLoc in self.itemLocs:
|
||||
if itemLoc.Item.Class == "Boss":
|
||||
itemLoc.Item.Class = "Minor"
|
||||
for itemLoc in self.progItemLocs:
|
||||
if itemLoc.Item.Class == "Boss":
|
||||
itemLoc.Item.Class = "Minor"
|
||||
|
||||
localItemLocs = [il for il in self.itemLocs if il.player == self.player]
|
||||
localprogItemLocs = [il for il in self.progItemLocs if il.player == self.player]
|
||||
|
||||
escapeTrigger = (localItemLocs, localprogItemLocs, 'Full') if self.variaRando.randoExec.randoSettings.restrictions["EscapeTrigger"] else None
|
||||
escapeOk = self.variaRando.randoExec.graphBuilder.escapeGraph(self.variaRando.container, self.variaRando.randoExec.areaGraph, self.variaRando.randoExec.randoSettings.maxDiff, escapeTrigger)
|
||||
assert escapeOk, "Could not find a solution for escape"
|
||||
|
||||
self.variaRando.doors = GraphUtils.getDoorConnections(self.variaRando.randoExec.areaGraph,
|
||||
self.variaRando.args.area, self.variaRando.args.bosses,
|
||||
self.variaRando.args.escapeRando)
|
||||
|
||||
self.variaRando.randoExec.postProcessItemLocs(self.itemLocs, self.variaRando.args.hideItems)
|
||||
|
||||
@classmethod
|
||||
def stage_post_fill(cls, world):
|
||||
new_state = CollectionState(world)
|
||||
|
||||
Reference in New Issue
Block a user