mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-07-11 23:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add water switch signs to shuffle signs (#6876)

Browse Source
This commit is contained in:
Chris
2026-07-11 13:56:26 -04:00
committed by GitHub
parent 847e3cd323
commit 1ae55a0a7e
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/randomizer/RCToRandInf.cpp
+2
View File
@@ -2607,6 +2607,8 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
{ RC_LH_FISHING_SIGN, RAND_INF_LH_FISHING_SIGN },
{ RC_LH_ISLAND_PEDESTAL, RAND_INF_LH_ISLAND_PEDESTAL },
{ RC_LH_FISHING_POND_RECTANGLE_SIGN, RAND_INF_LH_FISHING_POND_RECTANGLE_SIGN },
{ RC_LH_WATER_SWITCH_SIGN, RAND_INF_LH_WATER_SWITCH_SIGN },
{ RC_LH_FISHING_ISLAND_WATER_SWITCH_SIGN, RAND_INF_LH_FISHING_ISLAND_WATER_SWITCH_SIGN },
{ RC_GV_BRIDGE_RECTANGLE_SIGN, RAND_INF_GV_BRIDGE_RECTANGLE_SIGN },
{ RC_GV_EAST_EXIT_ARROW_SIGN, RAND_INF_GV_EAST_EXIT_ARROW_SIGN },
{ RC_GF_EAST_EXIT_ARROW_SIGN, RAND_INF_GF_EAST_EXIT_ARROW_SIGN },
soh/soh/Enhancements/randomizer/ShuffleSigns.cpp
+2
View File
@@ -295,6 +295,8 @@ locationTable[RC_LH_NORTH_EXIT_ARROW_SIGN] = Locati
locationTable[RC_LH_FISHING_SIGN] = Location::Sign(RC_LH_FISHING_SIGN, RCQUEST_BOTH, RCAREA_LAKE_HYLIA, SCENE_LAKE_HYLIA, TWO_ACTOR_PARAMS(1341, 3779), "Fishing Sign", RHT_SIGN_LAKE_HYLIA, ACTOR_EN_WONDER_TALK2, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_FISHING_SIGN));
locationTable[RC_LH_ISLAND_PEDESTAL] = Location::Sign(RC_LH_ISLAND_PEDESTAL, RCQUEST_BOTH, RCAREA_LAKE_HYLIA, SCENE_LAKE_HYLIA, TWO_ACTOR_PARAMS(-491, 7259), "Island Pedestal", RHT_SIGN_LAKE_HYLIA, ACTOR_EN_WONDER_TALK2, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_ISLAND_PEDESTAL));
locationTable[RC_LH_FISHING_POND_RECTANGLE_SIGN] = Location::Sign(RC_LH_FISHING_POND_RECTANGLE_SIGN, RCQUEST_BOTH, RCAREA_LAKE_HYLIA, SCENE_FISHING_POND, TWO_ACTOR_PARAMS(53, 982), "Fishing Pond Rectangle Sign", RHT_SIGN_FISHING_POND, ACTOR_EN_KANBAN, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_FISHING_POND_RECTANGLE_SIGN));
locationTable[RC_LH_WATER_SWITCH_SIGN] = Location::Sign(RC_LH_WATER_SWITCH_SIGN, RCQUEST_BOTH, RCAREA_LAKE_HYLIA, SCENE_LAKE_HYLIA, TWO_ACTOR_PARAMS(-970, 6954), "Water Switch Rectangle Sign", RHT_SIGN_LAKE_HYLIA, ACTOR_EN_KANBAN, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_WATER_SWITCH_SIGN));
locationTable[RC_LH_FISHING_ISLAND_WATER_SWITCH_SIGN] = Location::Sign(RC_LH_FISHING_ISLAND_WATER_SWITCH_SIGN, RCQUEST_BOTH, RCAREA_LAKE_HYLIA, SCENE_LAKE_HYLIA, TWO_ACTOR_PARAMS(1320, 3951), "Fishing Island Water Switch Rectangle Sign", RHT_SIGN_LAKE_HYLIA, ACTOR_EN_KANBAN, SpoilerCollectionCheck::RandomizerInf(RAND_INF_LH_FISHING_ISLAND_WATER_SWITCH_SIGN));
locationTable[RC_GV_BRIDGE_RECTANGLE_SIGN] = Location::Sign(RC_GV_BRIDGE_RECTANGLE_SIGN, RCQUEST_BOTH, RCAREA_GERUDO_VALLEY, SCENE_GERUDO_VALLEY, TWO_ACTOR_PARAMS(359, 254), "Bridge Rectangle Sign", RHT_SIGN_GERUDO_VALLEY, ACTOR_EN_KANBAN, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_BRIDGE_RECTANGLE_SIGN));
locationTable[RC_GV_EAST_EXIT_ARROW_SIGN] = Location::Sign(RC_GV_EAST_EXIT_ARROW_SIGN, RCQUEST_BOTH, RCAREA_GERUDO_VALLEY, SCENE_GERUDO_VALLEY, TWO_ACTOR_PARAMS(2778, 593), "East Exit Arrow Sign", RHT_SIGN_GERUDO_VALLEY, ACTOR_EN_A_OBJ, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GV_EAST_EXIT_ARROW_SIGN));
locationTable[RC_GF_EAST_EXIT_ARROW_SIGN] = Location::Sign(RC_GF_EAST_EXIT_ARROW_SIGN, RCQUEST_BOTH, RCAREA_GERUDO_FORTRESS, SCENE_GERUDOS_FORTRESS, TWO_ACTOR_PARAMS(-730, -70), "East Exit Arrow Sign", RHT_SIGN_GERUDO_FORTRESS, ACTOR_EN_A_OBJ, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GF_EAST_EXIT_ARROW_SIGN));
soh/soh/Enhancements/randomizer/location_access/overworld/lake_hylia.cpp
+2
View File
@@ -83,6 +83,7 @@ void RegionTable_Init_LakeHylia() {
LOCATION(RC_LH_LAB_RECTANGLE_SIGN, logic->CanRead()),
LOCATION(RC_LH_NORTH_EXIT_ARROW_SIGN, logic->CanRead()),
LOCATION(RC_LH_ISLAND_PEDESTAL, logic->CanRead()),
LOCATION(RC_LH_WATER_SWITCH_SIGN, logic->IsAdult && logic->CanRead()),
}, {
//Exits
ENTRANCE(RR_HF_TO_LAKE_HYLIA, true),
@@ -110,6 +111,7 @@ void RegionTable_Init_LakeHylia() {
//Locations
LOCATION(RC_LH_ROCK, logic->CanBreakRocks()),
LOCATION(RC_LH_FISHING_SIGN, logic->CanRead()),
LOCATION(RC_LH_FISHING_ISLAND_WATER_SWITCH_SIGN, logic->IsAdult && logic->CanRead()),
}, {
//Exits
ENTRANCE(RR_LAKE_HYLIA, logic->HasItem(RG_BRONZE_SCALE)),
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerCheck.h
+2
View File
@@ -3154,6 +3154,8 @@ RANDO_ENUM_ITEM(RC_LH_NORTH_EXIT_ARROW_SIGN)
RANDO_ENUM_ITEM(RC_LH_FISHING_SIGN)
RANDO_ENUM_ITEM(RC_LH_ISLAND_PEDESTAL)
RANDO_ENUM_ITEM(RC_LH_FISHING_POND_RECTANGLE_SIGN)
RANDO_ENUM_ITEM(RC_LH_WATER_SWITCH_SIGN)
RANDO_ENUM_ITEM(RC_LH_FISHING_ISLAND_WATER_SWITCH_SIGN)
RANDO_ENUM_ITEM(RC_GV_BRIDGE_RECTANGLE_SIGN)
RANDO_ENUM_ITEM(RC_GV_EAST_EXIT_ARROW_SIGN)
RANDO_ENUM_ITEM(RC_GF_EAST_EXIT_ARROW_SIGN)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerInf.h
+2
View File
@@ -2709,6 +2709,8 @@ RANDO_ENUM_ITEM(RAND_INF_LH_NORTH_EXIT_ARROW_SIGN)
RANDO_ENUM_ITEM(RAND_INF_LH_FISHING_SIGN)
RANDO_ENUM_ITEM(RAND_INF_LH_ISLAND_PEDESTAL)
RANDO_ENUM_ITEM(RAND_INF_LH_FISHING_POND_RECTANGLE_SIGN)
RANDO_ENUM_ITEM(RAND_INF_LH_WATER_SWITCH_SIGN)
RANDO_ENUM_ITEM(RAND_INF_LH_FISHING_ISLAND_WATER_SWITCH_SIGN)
RANDO_ENUM_ITEM(RAND_INF_GV_BRIDGE_RECTANGLE_SIGN)
RANDO_ENUM_ITEM(RAND_INF_GV_EAST_EXIT_ARROW_SIGN)
RANDO_ENUM_ITEM(RAND_INF_GF_EAST_EXIT_ARROW_SIGN)