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

Fixed chaos item weight preset so it gets generated per world.

This commit is contained in:
alwaysintreble 2021-09-08 12:29:29 -05:00
parent bd4f24844b
commit 05dac999a8
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worlds/ror2/Items.py
View File

@ -117,19 +117,6 @@ even_weights = {
"Equipment": 1 "Equipment": 1
} }
chaos_weights = {
"Item Scrap, Green": randint(0, 100),
"Item Scrap, Red": randint(0, 100),
"Item Scrap, Yellow": randint(0, 80),
"Item Scrap, White": randint(0, 100),
"Common Item": randint(0, 100),
"Uncommon Item": randint(0, 70),
"Legendary Item": randint(0, 25),
"Boss Item": randint(0, 10),
"Lunar Item": randint(0, 40),
"Equipment": randint(0, 40)
}
scraps_only_weights = { scraps_only_weights = {
"Item Scrap, Green": 80, "Item Scrap, Green": 80,
"Item Scrap, Red": 40, "Item Scrap, Red": 40,
@ -149,7 +136,6 @@ item_pool_weights: typing.Dict[int, typing.Dict[str, int]] = {
2: uncommon_weights, 2: uncommon_weights,
3: legendary_weights, 3: legendary_weights,
4: lunartic_weights, 4: lunartic_weights,
5: chaos_weights,
6: no_scraps_weights, 6: no_scraps_weights,
7: even_weights, 7: even_weights,
8: scraps_only_weights 8: scraps_only_weights

18
worlds/ror2/__init__.py
View File

@ -6,6 +6,7 @@ from .Rules import set_rules
from BaseClasses import Region, Entrance, Item, MultiWorld from BaseClasses import Region, Entrance, Item, MultiWorld
from .Options import ror2_options from .Options import ror2_options
from ..AutoWorld import World from ..AutoWorld import World
from random import randint
client_version = 1 client_version = 1
@ -48,7 +49,22 @@ class RiskOfRainWorld(World):
# if presets are enabled generate junk_pool from the selected preset # if presets are enabled generate junk_pool from the selected preset
if self.world.item_pool_presets[self.player].value: if self.world.item_pool_presets[self.player].value:
pool_option = self.world.item_weights[self.player].value pool_option = self.world.item_weights[self.player].value
junk_pool = item_pool_weights[pool_option] # generate chaos weights
if pool_option == 5:
junk_pool = {
"item Scrap, Green": randint(0, 100),
"Item Scrap, Red": randint(0, 100),
"Item Scrap, Yellow": randint(0, 100),
"Item Scrap, White": randint(0, 100),
"Common Item": randint(0, 100),
"Uncommon Item": randint(0, 70),
"Legendary Item": randint(0, 25),
"Boss Item": randint(0, 10),
"Lunar Item": randint(0, 40),
"Equipment": randint(0, 40)
}
else:
junk_pool = item_pool_weights[pool_option]
# Generate item pool # Generate item pool
itempool = [] itempool = []