From 24802d64c75bb1a7ffadda17f2e90db4e99bf92e Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Tue, 7 Sep 2021 09:22:12 -0500 Subject: [PATCH] Reverted some changes --- worlds/ror2/Items.py | 2 +- worlds/ror2/Options.py | 6 ------ worlds/ror2/__init__.py | 12 ++++++------ 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/worlds/ror2/Items.py b/worlds/ror2/Items.py index 0e993404..35992e1f 100644 --- a/worlds/ror2/Items.py +++ b/worlds/ror2/Items.py @@ -2,7 +2,7 @@ from BaseClasses import Item import typing -class RiskOfRain2Item(Item): +class RiskOfRainItem(Item): game: str = "Risk of Rain 2" # 37000 - 38000 diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index ae84a82f..f8b109b6 100644 --- a/worlds/ror2/Options.py +++ b/worlds/ror2/Options.py @@ -118,12 +118,6 @@ class Equipment(Range): default = 25 -class WeightPresets(Choice): - """Preset item weight options.""" - displayname = "Item Weight Preset" - option_default = 0 - - ror2_weights: typing.Dict[str, type(Option)] = { "green_scrap": GreenScrap, "red_scrap": RedScrap, diff --git a/worlds/ror2/__init__.py b/worlds/ror2/__init__.py index eff407a5..c3d2b7fc 100644 --- a/worlds/ror2/__init__.py +++ b/worlds/ror2/__init__.py @@ -95,12 +95,12 @@ def create_regions(world, player: int): ] world.get_entrance("Lobby", player).connect(world.get_region("Petrichor V", player)) - world.get_location("Level One", player).place_locked_item(RiskOfRain2Item("Beat Level One", True, None, player)) - world.get_location("Level Two", player).place_locked_item(RiskOfRain2Item("Beat Level Two", True, None, player)) - world.get_location("Level Three", player).place_locked_item(RiskOfRain2Item("Beat Level Three", True, None, player)) - world.get_location("Level Four", player).place_locked_item(RiskOfRain2Item("Beat Level Four", True, None, player)) - world.get_location("Level Five", player).place_locked_item(RiskOfRain2Item("Beat Level Five", True, None, player)) - world.get_location("Victory", player).place_locked_item(RiskOfRain2Item("Victory", True, None, player)) + world.get_location("Level One", player).place_locked_item(RiskOfRainItem("Beat Level One", True, None, player)) + world.get_location("Level Two", player).place_locked_item(RiskOfRainItem("Beat Level Two", True, None, player)) + world.get_location("Level Three", player).place_locked_item(RiskOfRainItem("Beat Level Three", True, None, player)) + world.get_location("Level Four", player).place_locked_item(RiskOfRainItem("Beat Level Four", True, None, player)) + world.get_location("Level Five", player).place_locked_item(RiskOfRainItem("Beat Level Five", True, None, player)) + world.get_location("Victory", player).place_locked_item(RiskOfRainItem("Victory", True, None, player)) def create_region(world: MultiWorld, player: int, name: str, locations=None, exits=None):