From 82850d7f66a1f7a6032d94135ed7d471c775ceb3 Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Fri, 15 Jul 2022 16:19:36 -0500 Subject: [PATCH] Ror2: reduce locations to 250 and mark legendary items as useful (#776) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * reduce total locations to 250 * minor styling cleanup. mark legendary items as useful * 😡 Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com> --- worlds/ror2/Options.py | 6 ++++-- worlds/ror2/__init__.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index d747f380..4abca9a3 100644 --- a/worlds/ror2/Options.py +++ b/worlds/ror2/Options.py @@ -6,7 +6,7 @@ class TotalLocations(Range): """Number of location checks which are added to the Risk of Rain playthrough.""" display_name = "Total Locations" range_start = 10 - range_end = 500 + range_end = 250 default = 20 @@ -122,6 +122,7 @@ class ItemPoolPresetToggle(DefaultOnToggle): """Will use the item weight presets when set to true, otherwise will use the custom set item pool weights.""" display_name = "Item Weight Presets" + class ItemWeights(Choice): """Preset choices for determining the weights of the item pool.
New is a test for a potential adjustment to the default weights.
@@ -143,7 +144,8 @@ class ItemWeights(Choice): option_even = 7 option_scraps_only = 8 -#define a dictionary for the weights of the generated item pool. + +# define a dictionary for the weights of the generated item pool. 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 06df244b..6e240ee1 100644 --- a/worlds/ror2/__init__.py +++ b/worlds/ror2/__init__.py @@ -116,9 +116,9 @@ class RiskOfRainWorld(World): def create_item(self, name: str) -> Item: item_id = item_table[name] item = RiskOfRainItem(name, ItemClassification.filler, item_id, self.player) - if name == 'Dio\'s Best Friend': + if name == "Dio's Best Friend": item.classification = ItemClassification.progression - elif name == 'Equipment': + elif name in {"Equipment", "Legendary Item"}: item.classification = ItemClassification.useful return item