morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

TUNIC: Misc Logic Changes, Additions (#2856)

Browse Source 
* Add nmg boss scav kill

* Add boss quick kills

* Fix name of orb

* Remove getting into zig with ice grapple

* Remove connection from quarry to zig

* Add a few missing dependent regions

* Separate the atoll statue and portal pad so that it doesn't assume you can get from one to the other without prayer
This commit is contained in:
Scipio Wright
2024-02-26 02:30:20 -05:00
committed by GitHub
parent 5c05ab1527
commit 738a9ebb7d
4 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
worlds/tunic/er_data.py
View File

@@ -211,7 +211,7 @@ portal_mapping: List[Portal] = [
destination="Shop_"),
Portal(name="Atoll to Far Shore", region="Ruined Atoll Portal",
destination="Transit_teleporter_atoll"),
Portal(name="Atoll Statue Teleporter", region="Ruined Atoll Portal",
Portal(name="Atoll Statue Teleporter", region="Ruined Atoll Statue",
destination="Library Exterior_"),
Portal(name="Frog Stairs Eye Entrance", region="Ruined Atoll",
destination="Frog Stairs_eye"),
@@ -600,6 +600,7 @@ tunic_er_regions: Dict[str, RegionInfo] = {
"Ruined Atoll Lower Entry Area": RegionInfo("Atoll Redux"),
"Ruined Atoll Frog Mouth": RegionInfo("Atoll Redux"),
"Ruined Atoll Portal": RegionInfo("Atoll Redux"),
"Ruined Atoll Statue": RegionInfo("Atoll Redux"),
"Frog's Domain Entry": RegionInfo("Frog Stairs"),
"Frog's Domain": RegionInfo("frog cave main", hint=Hint.region),
"Frog's Domain Back": RegionInfo("frog cave main", hint=Hint.scene),
@@ -749,6 +750,8 @@ dependent_regions_restricted: Dict[Tuple[str, ...], List[str]] = {
["Forest Belltower Main", "Forest Belltower Lower"],
("East Forest", "East Forest Dance Fox Spot", "East Forest Portal"):
["East Forest", "East Forest Dance Fox Spot", "East Forest Portal"],
("Guard House 1 East", "Guard House 1 West"):
["Guard House 1 East", "Guard House 1 West"],
("Forest Grave Path Main", "Forest Grave Path Upper"):
["Forest Grave Path Main", "Forest Grave Path Upper", "Forest Grave Path by Grave", "Forest Hero's Grave"],
("Forest Grave Path by Grave", "Forest Hero's Grave"):
@@ -762,8 +765,10 @@ dependent_regions_restricted: Dict[Tuple[str, ...], List[str]] = {
("West Garden", "West Garden Laurels Exit", "West Garden after Boss", "West Garden Hero's Grave"):
["West Garden", "West Garden Laurels Exit", "West Garden after Boss", "West Garden Hero's Grave"],
("West Garden Portal", "West Garden Portal Item"): ["West Garden Portal", "West Garden Portal Item"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"],
("Frog's Domain",):
["Frog's Domain", "Frog's Domain Back"],
("Library Exterior Ladder", "Library Exterior Tree"):
@@ -842,6 +847,8 @@ dependent_regions_nmg: Dict[Tuple[str, ...], List[str]] = {
["Forest Belltower Main", "Forest Belltower Lower"],
("East Forest", "East Forest Dance Fox Spot", "East Forest Portal"):
["East Forest", "East Forest Dance Fox Spot", "East Forest Portal"],
("Guard House 1 East", "Guard House 1 West"):
["Guard House 1 East", "Guard House 1 West"],
("Forest Grave Path Main", "Forest Grave Path Upper", "Forest Grave Path by Grave", "Forest Hero's Grave"):
["Forest Grave Path Main", "Forest Grave Path Upper", "Forest Grave Path by Grave", "Forest Hero's Grave"],
("Beneath the Well Front", "Beneath the Well Main", "Beneath the Well Back"):
@@ -854,8 +861,10 @@ dependent_regions_nmg: Dict[Tuple[str, ...], List[str]] = {
"West Garden Portal", "West Garden Portal Item"):
["West Garden", "West Garden Laurels Exit", "West Garden after Boss", "West Garden Hero's Grave",
"West Garden Portal", "West Garden Portal Item"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"],
("Frog's Domain",):
["Frog's Domain", "Frog's Domain Back"],
("Library Exterior Ladder", "Library Exterior Tree"):
@@ -934,6 +943,8 @@ dependent_regions_ur: Dict[Tuple[str, ...], List[str]] = {
["Forest Belltower Main", "Forest Belltower Lower"],
("East Forest", "East Forest Dance Fox Spot", "East Forest Portal"):
["East Forest", "East Forest Dance Fox Spot", "East Forest Portal"],
("Guard House 1 East", "Guard House 1 West"):
["Guard House 1 East", "Guard House 1 West"],
# can use laurels, ice grapple, or ladder storage to traverse
("Forest Grave Path Main", "Forest Grave Path Upper", "Forest Grave Path by Grave", "Forest Hero's Grave"):
["Forest Grave Path Main", "Forest Grave Path Upper", "Forest Grave Path by Grave", "Forest Hero's Grave"],
@@ -948,8 +959,10 @@ dependent_regions_ur: Dict[Tuple[str, ...], List[str]] = {
"West Garden Portal", "West Garden Portal Item"):
["West Garden", "West Garden Laurels Exit", "West Garden after Boss", "West Garden Hero's Grave",
"West Garden Portal", "West Garden Portal Item"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal"],
("Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"):
["Ruined Atoll", "Ruined Atoll Lower Entry Area", "Ruined Atoll Frog Mouth", "Ruined Atoll Portal",
"Ruined Atoll Statue"],
("Frog's Domain",):
["Frog's Domain", "Frog's Domain Back"],
("Library Exterior Ladder", "Library Exterior Tree"):