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

Noita: Extra Life change (#2247) 

* Item rate update, also removed unnecessary reverse region connections

* Converted sets into lists, removed empties
This commit is contained in:
Scipio Wright 2023-10-28 16:27:57 -04:00 committed by GitHub
parent acfc71b8c9
commit b874febb1e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
worlds/noita/Items.py
View File

@ -84,8 +84,8 @@ item_table: Dict[str, ItemData] = {
"Wand (Tier 2)": ItemData(110007, "Wands", ItemClassification.useful), "Wand (Tier 2)": ItemData(110007, "Wands", ItemClassification.useful),
"Wand (Tier 3)": ItemData(110008, "Wands", ItemClassification.useful), "Wand (Tier 3)": ItemData(110008, "Wands", ItemClassification.useful),
"Wand (Tier 4)": ItemData(110009, "Wands", ItemClassification.useful), "Wand (Tier 4)": ItemData(110009, "Wands", ItemClassification.useful),
"Wand (Tier 5)": ItemData(110010, "Wands", ItemClassification.useful), "Wand (Tier 5)": ItemData(110010, "Wands", ItemClassification.useful, 1),
"Wand (Tier 6)": ItemData(110011, "Wands", ItemClassification.useful), "Wand (Tier 6)": ItemData(110011, "Wands", ItemClassification.useful, 1),
"Kantele": ItemData(110012, "Wands", ItemClassification.useful), "Kantele": ItemData(110012, "Wands", ItemClassification.useful),
"Fire Immunity Perk": ItemData(110013, "Perks", ItemClassification.progression, 1), "Fire Immunity Perk": ItemData(110013, "Perks", ItemClassification.progression, 1),
"Toxic Immunity Perk": ItemData(110014, "Perks", ItemClassification.progression, 1), "Toxic Immunity Perk": ItemData(110014, "Perks", ItemClassification.progression, 1),
@ -95,15 +95,15 @@ item_table: Dict[str, ItemData] = {
"Tinker with Wands Everywhere Perk": ItemData(110018, "Perks", ItemClassification.progression, 1), "Tinker with Wands Everywhere Perk": ItemData(110018, "Perks", ItemClassification.progression, 1),
"All-Seeing Eye Perk": ItemData(110019, "Perks", ItemClassification.progression, 1), "All-Seeing Eye Perk": ItemData(110019, "Perks", ItemClassification.progression, 1),
"Spatial Awareness Perk": ItemData(110020, "Perks", ItemClassification.progression), "Spatial Awareness Perk": ItemData(110020, "Perks", ItemClassification.progression),
"Extra Life Perk": ItemData(110021, "Repeatable Perks", ItemClassification.useful), "Extra Life Perk": ItemData(110021, "Repeatable Perks", ItemClassification.useful, 2),
"Orb": ItemData(110022, "Orbs", ItemClassification.progression_skip_balancing), "Orb": ItemData(110022, "Orbs", ItemClassification.progression_skip_balancing),
"Random Potion": ItemData(110023, "Items", ItemClassification.filler), "Random Potion": ItemData(110023, "Items", ItemClassification.filler),
"Secret Potion": ItemData(110024, "Items", ItemClassification.filler), "Secret Potion": ItemData(110024, "Items", ItemClassification.filler),
"Powder Pouch": ItemData(110025, "Items", ItemClassification.filler), "Powder Pouch": ItemData(110025, "Items", ItemClassification.filler),
"Chaos Die": ItemData(110026, "Items", ItemClassification.filler), "Chaos Die": ItemData(110026, "Items", ItemClassification.filler),
"Greed Die": ItemData(110027, "Items", ItemClassification.filler), "Greed Die": ItemData(110027, "Items", ItemClassification.filler),
"Kammi": ItemData(110028, "Items", ItemClassification.filler), "Kammi": ItemData(110028, "Items", ItemClassification.filler, 1),
"Refreshing Gourd": ItemData(110029, "Items", ItemClassification.filler), "Refreshing Gourd": ItemData(110029, "Items", ItemClassification.filler, 1),
"Sädekivi": ItemData(110030, "Items", ItemClassification.filler), "Sädekivi": ItemData(110030, "Items", ItemClassification.filler),
"Broken Wand": ItemData(110031, "Items", ItemClassification.filler), "Broken Wand": ItemData(110031, "Items", ItemClassification.filler),
@ -122,8 +122,8 @@ filler_weights: Dict[str, int] = {
"Wand (Tier 4)": 6, "Wand (Tier 4)": 6,
"Wand (Tier 5)": 5, "Wand (Tier 5)": 5,
"Wand (Tier 6)": 4, "Wand (Tier 6)": 4,
"Extra Life Perk": 10, "Extra Life Perk": 3,
"Random Potion": 9, "Random Potion": 10,
"Secret Potion": 10, "Secret Potion": 10,
"Powder Pouch": 10, "Powder Pouch": 10,
"Chaos Die": 4, "Chaos Die": 4,
@ -131,7 +131,7 @@ filler_weights: Dict[str, int] = {
"Kammi": 4, "Kammi": 4,
"Refreshing Gourd": 4, "Refreshing Gourd": 4,
"Sädekivi": 3, "Sädekivi": 3,
"Broken Wand": 10, "Broken Wand": 8,
} }

74
worlds/noita/Regions.py
View File

@ -1,5 +1,5 @@
# Regions are areas in your game that you travel to. # Regions are areas in your game that you travel to.
from typing import Dict, Set from typing import Dict, Set, List
from BaseClasses import Entrance, MultiWorld, Region from BaseClasses import Entrance, MultiWorld, Region
from . import Locations from . import Locations
@ -79,70 +79,46 @@ def create_all_regions_and_connections(multiworld: MultiWorld, player: int) -> N
# - Lake is connected to The Laboratory, since the boss is hard without specific set-ups (which means late game) # - Lake is connected to The Laboratory, since the boss is hard without specific set-ups (which means late game)
# - Snowy Depths connects to Lava Lake orb since you need digging for it, so fairly early is acceptable # - Snowy Depths connects to Lava Lake orb since you need digging for it, so fairly early is acceptable
# - Ancient Laboratory is connected to the Coal Pits, so that Ylialkemisti isn't sphere 1 # - Ancient Laboratory is connected to the Coal Pits, so that Ylialkemisti isn't sphere 1
noita_connections: Dict[str, Set[str]] = { noita_connections: Dict[str, List[str]] = {
"Menu": {"Forest"}, "Menu": ["Forest"],
"Forest": {"Mines", "Floating Island", "Desert", "Snowy Wasteland"}, "Forest": ["Mines", "Floating Island", "Desert", "Snowy Wasteland"],
"Snowy Wasteland": {"Forest"}, "Frozen Vault": ["The Vault"],
"Frozen Vault": {"The Vault"}, "Overgrown Cavern": ["Sandcave"],
"Lake": {"The Laboratory"},
"Desert": {"Forest"},
"Floating Island": {"Forest"},
"Pyramid": {"Hiisi Base"},
"Overgrown Cavern": {"Sandcave", "Undeground Jungle"},
"Sandcave": {"Overgrown Cavern"},
### ###
"Mines": {"Collapsed Mines", "Coal Pits Holy Mountain", "Lava Lake", "Forest"}, "Mines": ["Collapsed Mines", "Coal Pits Holy Mountain", "Lava Lake"],
"Collapsed Mines": {"Mines", "Dark Cave"}, "Lava Lake": ["Abyss Orb Room"],
"Lava Lake": {"Mines", "Abyss Orb Room"},
"Abyss Orb Room": {"Lava Lake"},
"Below Lava Lake": {"Snowy Depths"},
"Dark Cave": {"Collapsed Mines"},
"Ancient Laboratory": {"Coal Pits"},
### ###
"Coal Pits Holy Mountain": {"Coal Pits"}, "Coal Pits Holy Mountain": ["Coal Pits"],
"Coal Pits": {"Coal Pits Holy Mountain", "Fungal Caverns", "Snowy Depths Holy Mountain", "Ancient Laboratory"}, "Coal Pits": ["Fungal Caverns", "Snowy Depths Holy Mountain", "Ancient Laboratory"],
"Fungal Caverns": {"Coal Pits"},
### ###
"Snowy Depths Holy Mountain": {"Snowy Depths"}, "Snowy Depths Holy Mountain": ["Snowy Depths"],
"Snowy Depths": {"Snowy Depths Holy Mountain", "Hiisi Base Holy Mountain", "Magical Temple", "Below Lava Lake"}, "Snowy Depths": ["Hiisi Base Holy Mountain", "Magical Temple", "Below Lava Lake"],
"Magical Temple": {"Snowy Depths"},
### ###
"Hiisi Base Holy Mountain": {"Hiisi Base"}, "Hiisi Base Holy Mountain": ["Hiisi Base"],
"Hiisi Base": {"Hiisi Base Holy Mountain", "Secret Shop", "Pyramid", "Underground Jungle Holy Mountain"}, "Hiisi Base": ["Secret Shop", "Pyramid", "Underground Jungle Holy Mountain"],
"Secret Shop": {"Hiisi Base"},
### ###
"Underground Jungle Holy Mountain": {"Underground Jungle"}, "Underground Jungle Holy Mountain": ["Underground Jungle"],
"Underground Jungle": {"Underground Jungle Holy Mountain", "Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Underground Jungle": ["Dragoncave", "Overgrown Cavern", "Vault Holy Mountain", "Lukki Lair", "Snow Chasm"],
"Lukki Lair"},
"Dragoncave": {"Underground Jungle"},
"Lukki Lair": {"Underground Jungle", "Snow Chasm", "Frozen Vault"},
"Snow Chasm": {},
### ###
"Vault Holy Mountain": {"The Vault"}, "Vault Holy Mountain": ["The Vault"],
"The Vault": {"Vault Holy Mountain", "Frozen Vault", "Temple of the Art Holy Mountain"}, "The Vault": ["Frozen Vault", "Temple of the Art Holy Mountain"],
### ###
"Temple of the Art Holy Mountain": {"Temple of the Art"}, "Temple of the Art Holy Mountain": ["Temple of the Art"],
"Temple of the Art": {"Temple of the Art Holy Mountain", "Laboratory Holy Mountain", "The Tower", "Temple of the Art": ["Laboratory Holy Mountain", "The Tower", "Wizards' Den"],
"Wizards' Den"}, "Wizards' Den": ["Powerplant"],
"Wizards' Den": {"Temple of the Art", "Powerplant"}, "Powerplant": ["Deep Underground"],
"Powerplant": {"Wizards' Den", "Deep Underground"},
"The Tower": {"Forest"},
"Deep Underground": {},
### ###
"Laboratory Holy Mountain": {"The Laboratory"}, "Laboratory Holy Mountain": ["The Laboratory"],
"The Laboratory": {"Laboratory Holy Mountain", "The Work", "Friend Cave", "The Work (Hell)", "Lake"}, "The Laboratory": ["The Work", "Friend Cave", "The Work (Hell)", "Lake"],
"Friend Cave": {},
"The Work": {},
"The Work (Hell)": {},
### ###
} }
noita_regions: Set[str] = set(noita_connections.keys()).union(*noita_connections.values()) noita_regions: List[str] = sorted(set(noita_connections.keys()).union(*noita_connections.values()))