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

Bumper Stickers and Meritous: Options and world: multiworld fixes (#3281)

Browse Source 
* Update Options.py

* Update __init__.py

* Correct case

* Correct case

* Update Meritous and actually use Options

* Oops

* Fixing world: multiworld
This commit is contained in:
Exempt-Medic
2024-05-12 12:52:34 -04:00
committed by GitHub
parent 701fbab837
commit f38655d6b6
6 changed files with 59 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
worlds/meritous/__init__.py
View File

@@ -7,7 +7,7 @@ from BaseClasses import Item, MultiWorld, Tutorial
from Fill import fill_restrictive
from .Items import item_table, item_groups, MeritousItem
from .Locations import location_table, MeritousLocation
from .Options import meritous_options, cost_scales
from .Options import MeritousOptions, cost_scales
from .Regions import create_regions
from .Rules import set_rules
from ..AutoWorld import World, WebWorld
@@ -49,10 +49,11 @@ class MeritousWorld(World):
# NOTE: Remember to change this before this game goes live
required_client_version = (0, 2, 4)
option_definitions = meritous_options
options: MeritousOptions
options_dataclass = MeritousOptions
def __init__(self, world: MultiWorld, player: int):
super(MeritousWorld, self).__init__(world, player)
def __init__(self, multiworld: MultiWorld, player: int):
super(MeritousWorld, self).__init__(multiworld, player)
self.goal = 0
self.include_evolution_traps = False
self.include_psi_keys = False
@@ -97,11 +98,11 @@ class MeritousWorld(World):
return "Crystals x2000"
def generate_early(self):
self.goal = self.multiworld.goal[self.player].value
self.include_evolution_traps = self.multiworld.include_evolution_traps[self.player].value
self.include_psi_keys = self.multiworld.include_psi_keys[self.player].value
self.item_cache_cost = self.multiworld.item_cache_cost[self.player].value
self.death_link = self.multiworld.death_link[self.player].value
self.goal = self.options.goal.value
self.include_evolution_traps = self.options.include_evolution_traps.value
self.include_psi_keys = self.options.include_psi_keys.value
self.item_cache_cost = self.options.item_cache_cost.value
self.death_link = self.options.death_link.value
def create_regions(self):
create_regions(self.multiworld, self.player)