From 1ffe5fc7bb9dee96eeae5391020f3adfc54b07e7 Mon Sep 17 00:00:00 2001 From: alwaysintreble Date: Sun, 26 Sep 2021 14:22:46 -0500 Subject: [PATCH] Remove scraps only preset since it doesn't work. Increase item pool to 100. Add direct links in tutorial. --- .../static/assets/tutorial/ror2/setup_en.md | 10 +++------- worlds/ror2/Items.py | 16 +--------------- worlds/ror2/Locations.py | 2 +- worlds/ror2/Options.py | 6 ++---- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/WebHostLib/static/assets/tutorial/ror2/setup_en.md b/WebHostLib/static/assets/tutorial/ror2/setup_en.md index df3c6378..925debc6 100644 --- a/WebHostLib/static/assets/tutorial/ror2/setup_en.md +++ b/WebHostLib/static/assets/tutorial/ror2/setup_en.md @@ -2,16 +2,12 @@ ## Install using r2modman ### Install r2modman -Head on over to the r2modman page on Thunderstore and follow the installation instructions. - -https://thunderstore.io/package/ebkr/r2modman/ +Head on over to the [r2modman page on Thunderstore](https://thunderstore.io/package/ebkr/r2modman/) and follow the installation instructions. ### Install Archipelago Mod using r2modman -You can install the Archipelago mod using r2modman in one of two ways. +You can install the [Archipelago mod](https://thunderstore.io/package/ArchipelagoMW/Archipelago/) using r2modman in one of two ways. One, you can use the Thunderstore website and click on the "Install with Mod Manager" link. -https://thunderstore.io/package/ArchipelagoMW/Archipelago/ - You can also search for the "Archipelago" mod in the r2modman interface. The mod manager should automatically install all necessary dependencies as well. @@ -72,7 +68,7 @@ Risk of Rain 2: | Name | Description | Allowed values | | ---- | ----------- | -------------- | -| total_locations | The total number of location checks that will be attributed to the Risk of Rain player. This option is ALSO the total number of items in the item pool for the Risk of Rain player. | 10 - 50 | +| total_locations | The total number of location checks that will be attributed to the Risk of Rain player. This option is ALSO the total number of items in the item pool for the Risk of Rain player. | 10 - 100 | | total_revivals | The total number of items in the Risk of Rain player's item pool (items other players pick up for them) replaced with `Dio's Best Friend`. | 0 - 5 | | start_with_revive | Starts the player off with a `Dio's Best Friend`. Functionally equivalent to putting a `Dio's Best Friend` in your `starting_inventory`. | true/false | | item_pickup_step | The number of item pickups which you are allowed to claim before they become an Archipelago location check. | 0 - 5 | diff --git a/worlds/ror2/Items.py b/worlds/ror2/Items.py index 3345fd6d..fa6f4d27 100644 --- a/worlds/ror2/Items.py +++ b/worlds/ror2/Items.py @@ -117,19 +117,6 @@ even_weights = { "Equipment": 1 } -scraps_only_weights = { - "Item Scrap, Green": 80, - "Item Scrap, Red": 40, - "Item Scrap, Yellow": 10, - "Item Scrap, White": 100, - "Common Item": 0, - "Uncommon Item": 0, - "Legendary Item": 0, - "Boss Item": 0, - "Lunar Item": 0, - "Equipment": 0 -} - item_pool_weights: typing.Dict[int, typing.Dict[str, int]] = { 0: default_weights, 1: new_weights, @@ -137,8 +124,7 @@ item_pool_weights: typing.Dict[int, typing.Dict[str, int]] = { 3: legendary_weights, 4: lunartic_weights, 6: no_scraps_weights, - 7: even_weights, - 8: scraps_only_weights + 7: even_weights } lookup_id_to_name: typing.Dict[int, str] = {id: name for name, id in item_table.items() if id} diff --git a/worlds/ror2/Locations.py b/worlds/ror2/Locations.py index 56585f5c..c2ef67ad 100644 --- a/worlds/ror2/Locations.py +++ b/worlds/ror2/Locations.py @@ -15,7 +15,7 @@ base_location_table = { } item_pickups = { - f"ItemPickup{i}": 37005+i for i in range(1, 51) + f"ItemPickup{i}": 37005+i for i in range(1, 101) } location_table = {**base_location_table, **item_pickups} diff --git a/worlds/ror2/Options.py b/worlds/ror2/Options.py index 1a011706..d659d420 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.""" displayname = "Total Locations" range_start = 10 - range_end = 50 + range_end = 100 default = 20 @@ -130,8 +130,7 @@ class ItemWeights(Choice): lunartic makes everything a lunar item. chaos generates the pool completely at random with rarer items having a slight cap to prevent this option being too easy. no_scraps removes all scrap items from the item pool. - even generates the item pool with every item having an even weight. - scraps_only removes all non scrap items from the item pool.""" + even generates the item pool with every item having an even weight.""" displayname = "Item Weights" option_default = 0 option_new = 1 @@ -141,7 +140,6 @@ class ItemWeights(Choice): option_chaos = 5 option_no_scraps = 6 option_even = 7 - option_scraps_only = 8 #define a dictionary for the weights of the generated item pool. ror2_weights: typing.Dict[str, type(Option)] = {