mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-31 07:20:14 -05:00
Code Issues Projects Releases Wiki Activity

* merged ZR near PoH grass into a single loc

Browse Source
This commit is contained in:
Fredrik Andréasson 2025-01-25 00:45:32 +01:00
parent c22b064a7a
commit 51b41d6d38
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/location_access/overworld/zora_river.cpp
View File

@ -59,8 +59,7 @@ void RegionTable_Init_ZoraRiver() {
LOCATION(RC_ZR_BENEATH_WATERFALL_RIGHT_RUPEE, logic->IsAdult && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG))), LOCATION(RC_ZR_BENEATH_WATERFALL_RIGHT_RUPEE, logic->IsAdult && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_IRON_BOOTS) || logic->CanUse(RG_BOOMERANG))),
LOCATION(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, true), LOCATION(RC_ZR_NEAR_GROTTOS_GOSSIP_STONE, true),
LOCATION(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, true), LOCATION(RC_ZR_NEAR_DOMAIN_GOSSIP_STONE, true),
LOCATION(RC_ZR_LEDGE_CHILD_GRASS, logic->IsChild && logic->CanCutShrubs()), LOCATION(RC_ZR_NEAR_FREESTANDING_POH_GRASS, logic->CanCutShrubs()),
LOCATION(RC_ZR_LEDGE_ADULT_GRASS, logic->IsAdult && logic->CanCutShrubs()),
}, { }, {
//Exits //Exits
Entrance(RR_ZR_FRONT, []{return true;}), Entrance(RR_ZR_FRONT, []{return true;}),

3
soh/soh/Enhancements/randomizer/location_list.cpp
View File

@ -1246,8 +1246,7 @@ void Rando::StaticData::InitLocationTable() { //
locationTable[RC_ZR_GRASS_10] = Location::Grass(RC_ZR_GRASS_10, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1489, 907), "Near Tree Grass 10", "Near Tree Grass 10", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_10)); locationTable[RC_ZR_GRASS_10] = Location::Grass(RC_ZR_GRASS_10, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1489, 907), "Near Tree Grass 10", "Near Tree Grass 10", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_10));
locationTable[RC_ZR_GRASS_11] = Location::Grass(RC_ZR_GRASS_11, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1468, 936), "Near Tree Grass 11", "Near Tree Grass 11", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_11)); locationTable[RC_ZR_GRASS_11] = Location::Grass(RC_ZR_GRASS_11, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1468, 936), "Near Tree Grass 11", "Near Tree Grass 11", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_11));
locationTable[RC_ZR_GRASS_12] = Location::Grass(RC_ZR_GRASS_12, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1436, 906), "Near Tree Grass 12", "Near Tree Grass 12", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_12)); locationTable[RC_ZR_GRASS_12] = Location::Grass(RC_ZR_GRASS_12, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1436, 906), "Near Tree Grass 12", "Near Tree Grass 12", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_12));
locationTable[RC_ZR_LEDGE_CHILD_GRASS] = Location::Grass(RC_ZR_LEDGE_CHILD_GRASS, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(231, -1478), "Near Freestanding PoH Child Grass", "Near Freestanding PoH Child Grass", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_LEDGE_CHILD_GRASS)); locationTable[RC_ZR_NEAR_FREESTANDING_POH_GRASS] = Location::Grass(RC_ZR_NEAR_FREESTANDING_POH_GRASS, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(231, -1478), "Near Freestanding PoH Grass", "Near Freestanding PoH Grass", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS));
locationTable[RC_ZR_LEDGE_ADULT_GRASS] = Location::Grass(RC_ZR_LEDGE_ADULT_GRASS, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(233, -1464), "Near Freestanding PoH Adult Grass", "Near Freestanding PoH Adult Grass", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_LEDGE_ADULT_GRASS));
// Grotto Grass // Grotto Grass
locationTable[RC_KF_STORMS_GROTTO_GRASS_1] = Location::Base(RC_KF_STORMS_GROTTO_GRASS_1, RCQUEST_BOTH, RCTYPE_GRASS, RCAREA_KOKIRI_FOREST, ACTOR_EN_KUSA, SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x2C), "Storms Grotto Grass 1", RHT_GROTTO_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_1)); locationTable[RC_KF_STORMS_GROTTO_GRASS_1] = Location::Base(RC_KF_STORMS_GROTTO_GRASS_1, RCQUEST_BOTH, RCTYPE_GRASS, RCAREA_KOKIRI_FOREST, ACTOR_EN_KUSA, SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, 0x2C), "Storms Grotto Grass 1", RHT_GROTTO_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_1));
locationTable[RC_KF_STORMS_GROTTO_GRASS_2] = Location::Base(RC_KF_STORMS_GROTTO_GRASS_2, RCQUEST_BOTH, RCTYPE_GRASS, RCAREA_KOKIRI_FOREST, ACTOR_EN_KUSA, SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x2C), "Storms Grotto Grass 2", RHT_GROTTO_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_2)); locationTable[RC_KF_STORMS_GROTTO_GRASS_2] = Location::Base(RC_KF_STORMS_GROTTO_GRASS_2, RCQUEST_BOTH, RCTYPE_GRASS, RCAREA_KOKIRI_FOREST, ACTOR_EN_KUSA, SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, 0x2C), "Storms Grotto Grass 2", RHT_GROTTO_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_2));

15
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -1183,8 +1183,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
{ RC_ZR_GRASS_10, RAND_INF_ZR_GRASS_10 }, { RC_ZR_GRASS_10, RAND_INF_ZR_GRASS_10 },
{ RC_ZR_GRASS_11, RAND_INF_ZR_GRASS_11 }, { RC_ZR_GRASS_11, RAND_INF_ZR_GRASS_11 },
{ RC_ZR_GRASS_12, RAND_INF_ZR_GRASS_12 }, { RC_ZR_GRASS_12, RAND_INF_ZR_GRASS_12 },
{ RC_ZR_LEDGE_CHILD_GRASS, RAND_INF_ZR_LEDGE_CHILD_GRASS }, { RC_ZR_NEAR_FREESTANDING_POH_GRASS, RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS },
{ RC_ZR_LEDGE_ADULT_GRASS, RAND_INF_ZR_LEDGE_ADULT_GRASS },
// Grotto Grass // Grotto Grass
{ RC_KF_STORMS_GROTTO_GRASS_1, RAND_INF_KF_STORMS_GROTTO_GRASS_1 }, { RC_KF_STORMS_GROTTO_GRASS_1, RAND_INF_KF_STORMS_GROTTO_GRASS_1 },
{ RC_KF_STORMS_GROTTO_GRASS_2, RAND_INF_KF_STORMS_GROTTO_GRASS_2 }, { RC_KF_STORMS_GROTTO_GRASS_2, RAND_INF_KF_STORMS_GROTTO_GRASS_2 },
@ -2216,6 +2215,18 @@ GrassIdentity Randomizer::IdentifyGrass(s32 sceneNum, s32 posX, s32 posZ, s32 re
} }
} }
/*
Same as with Market. ZR has a bush slightly off pos
between Child and Adult. This is to merge them into
a single location.
*/
if (sceneNum == SCENE_ZORAS_RIVER) {
if (posX == 233) {
posX = 231;
posZ = -1478;
}
}
// The two bushes behind the sign in KF should be separated // The two bushes behind the sign in KF should be separated
// locations between Child and Adult. // locations between Child and Adult.
if (sceneNum == SCENE_KOKIRI_FOREST && linkAge == 0) { if (sceneNum == SCENE_KOKIRI_FOREST && linkAge == 0) {

3
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -3025,8 +3025,7 @@ typedef enum {
RC_ZR_GRASS_10, RC_ZR_GRASS_10,
RC_ZR_GRASS_11, RC_ZR_GRASS_11,
RC_ZR_GRASS_12, RC_ZR_GRASS_12,
RC_ZR_LEDGE_CHILD_GRASS, RC_ZR_NEAR_FREESTANDING_POH_GRASS,
RC_ZR_LEDGE_ADULT_GRASS,
// Grotto Grass // Grotto Grass
RC_KF_STORMS_GROTTO_GRASS_1, RC_KF_STORMS_GROTTO_GRASS_1,
RC_KF_STORMS_GROTTO_GRASS_2, RC_KF_STORMS_GROTTO_GRASS_2,

3
soh/soh/Enhancements/randomizer/randomizer_inf.h
View File

@ -1501,8 +1501,7 @@ typedef enum {
RAND_INF_ZR_GRASS_10, RAND_INF_ZR_GRASS_10,
RAND_INF_ZR_GRASS_11, RAND_INF_ZR_GRASS_11,
RAND_INF_ZR_GRASS_12, RAND_INF_ZR_GRASS_12,
RAND_INF_ZR_LEDGE_CHILD_GRASS, RAND_INF_ZR_NEAR_FREESTANDING_POH_GRASS,
RAND_INF_ZR_LEDGE_ADULT_GRASS,
// Grotto Grass // Grotto Grass
RAND_INF_KF_STORMS_GROTTO_GRASS_1, RAND_INF_KF_STORMS_GROTTO_GRASS_1,
RAND_INF_KF_STORMS_GROTTO_GRASS_2, RAND_INF_KF_STORMS_GROTTO_GRASS_2,