monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove `total_items` option.

This commit is contained in:
Hussein Farran 2021-09-01 17:35:16 -04:00
parent c73b994305
commit df435eb693
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
WebHostLib/static/assets/tutorial/ror2/setup_en.md
View File

@ -42,7 +42,6 @@ game:
Risk of Rain 2:
total_locations: 15
total_items: 30
total_revivals: 4
start_with_revive: true
item_pickup_step: 1
@ -51,16 +50,20 @@ 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. | 10 - 50 |
| total_items | The total number of items which are added to the multiworld on behalf of 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 - 50 |
| 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 |
| enable_lunar | Allows for lunar items to be shuffled into the item pool on behalf of the Risk of Rain player. | true/false |
Using the example YAML above: the Risk of Rain 2 player will have 15 total items which they can pick up for other players. (total_locations = 15)
They will have 30 items which can be granted to them through the multiworld. (total_items = 30)
They will have 15 items waiting for them in the item pool which will be distributed out to the multiworld. (total_locations = 15)
They will complete a location check every second item. (item_pickup_step = 1)
They will have 4 of the items which other players can grant them replaced with `Dio's Best Friend`. (total_revivals = 4)
The player will also start with a `Dio's Best Friend`. (start_with_revive = true)
The player will have lunar items shuffled into the item pool on their behalf. (enable_lunar = true)

8
worlds/ror2/Options.py
View File

@ -9,13 +9,6 @@ class TotalLocations(Range):
range_end = 50
default = 15
class TotalItems(Range):
"""Number of items which are added to the multiworld on behalf of the Risk of Rain player."""
displayname = "Total Items"
range_start = 10
range_end = 50
default = 30
class TotalRevivals(Range):
"""Number of `Dio's Best Friend` item put in the item pool."""
@ -50,6 +43,5 @@ ror2_options: typing.Dict[str, type(Option)] = {
"total_revivals": TotalRevivals,
"start_with_revive": StartWithRevive,
"item_pickup_step": ItemPickupStep,
"total_items": TotalItems,
"enable_lunar": AllowLunarItems
}

4
worlds/ror2/__init__.py
View File

@ -43,7 +43,7 @@ class RiskOfRainWorld(World):
# Fill remaining items with randomly generated junk
itempool += self.world.random.choices(list(junk_pool.keys()), weights=list(junk_pool.values()),
k=self.world.total_items[self.player] -
k=self.world.total_locations[self.player] -
self.world.total_revivals[self.player])
# Convert itempool into real items
@ -61,7 +61,7 @@ class RiskOfRainWorld(World):
return {
"itemPickupStep": self.world.item_pickup_step[self.player].value,
"seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for i in range(16)),
"totalLocations": self.world.total_items[self.player].value,
"totalLocations": self.world.total_locations[self.player].value,
"totalRevivals": self.world.total_revivals[self.player].value
}