mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-03-03 10:11:51 -05:00
Code Issues Projects Releases Wiki Activity

* color is a sickly green when containing a check

Browse Source 
* added ZR 14 (adult only bush on the platform, not the same?)
This commit is contained in:
Fredrik Andréasson 2025-01-16 04:09:19 +01:00
parent 9ef6ce3af8
commit 4daa372561
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/soh/Enhancements/randomizer/ShuffleGrass.cpp
View File

@ -14,14 +14,16 @@ extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
extern "C" void EnKusa_RandomizerDraw(Actor* thisx, PlayState* play) { extern "C" void EnKusa_RandomizerDraw(Actor* thisx, PlayState* play) {
float grassSize = 0.5f; //float grassSize = 0.5f;
OPEN_DISPS(play->state.gfxCtx); OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL_25Opa(play->state.gfxCtx); Gfx_SetupDL_25Opa(play->state.gfxCtx);
Matrix_Scale(grassSize, grassSize, grassSize, MTXMODE_APPLY); //Matrix_Scale(grassSize, grassSize, grassSize, MTXMODE_APPLY);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 255, 0, 255); gDPSetGrayscaleColor(POLY_OPA_DISP++, 0, 255, 0, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), gSPGrayscale(POLY_OPA_DISP++, true);
G_MTX_MODELVIEW | G_MTX_LOAD);
//gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
// G_MTX_MODELVIEW | G_MTX_LOAD);
if (thisx->params == -255) { if (thisx->params == -255) {
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)object_kusa_DL_000140); gSPDisplayList(POLY_OPA_DISP++, (Gfx*)object_kusa_DL_000140);
@ -29,6 +31,8 @@ extern "C" void EnKusa_RandomizerDraw(Actor* thisx, PlayState* play) {
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFieldBushDL); gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFieldBushDL);
} }
gSPGrayscale(POLY_OPA_DISP++, false);
CLOSE_DISPS(play->state.gfxCtx); CLOSE_DISPS(play->state.gfxCtx);
} }

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

@ -60,6 +60,7 @@ void RegionTable_Init_ZoraRiver() {
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_GRASS_13, logic->IsChild && logic->CanCutShrubs()), LOCATION(RC_ZR_GRASS_13, logic->IsChild && logic->CanCutShrubs()),
LOCATION(RC_ZR_GRASS_14, logic->IsAdult && logic->CanCutShrubs()),
}, { }, {
//Exits //Exits
Entrance(RR_ZR_FRONT, []{return true;}), Entrance(RR_ZR_FRONT, []{return true;}),

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

@ -1247,6 +1247,7 @@ void Rando::StaticData::InitLocationTable() { //
locationTable[RC_ZR_GRASS_11] = Location::Grass(RC_ZR_GRASS_11, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(-1468, 936), "ZR Grass 11", "ZR 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), "ZR Grass 11", "ZR 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), "ZR Grass 12", "ZR 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), "ZR Grass 12", "ZR Grass 12", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_12));
locationTable[RC_ZR_GRASS_13] = Location::Grass(RC_ZR_GRASS_13, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(231, -1478), "ZR Grass 13", "ZR Grass 13", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_13)); locationTable[RC_ZR_GRASS_13] = Location::Grass(RC_ZR_GRASS_13, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(231, -1478), "ZR Grass 13", "ZR Grass 13", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_13));
locationTable[RC_ZR_GRASS_14] = Location::Grass(RC_ZR_GRASS_14, RCQUEST_BOTH, RCAREA_ZORAS_RIVER, SCENE_ZORAS_RIVER, TWO_ACTOR_PARAMS(233, -1464), "ZR Grass 14", "ZR Grass 14", RHT_ZR_GRASS, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ZR_GRASS_14));
// Grotto Grass // Grotto Grass
//locationTable[RC_KF_STORMS_GROTTO_GRASS_1] = Location::Grass(RC_KF_STORMS_GROTTO_GRASS_1, RCQUEST_BOTH, RCAREA_KOKIRI_FOREST, SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, -257), "KF Storms Grotto Grass 1", "KF Storms Grotto Grass 1", RHT_KOKIRI_FOREST, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_1)); //locationTable[RC_KF_STORMS_GROTTO_GRASS_1] = Location::Grass(RC_KF_STORMS_GROTTO_GRASS_1, RCQUEST_BOTH, RCAREA_KOKIRI_FOREST, SCENE_GROTTOS, TWO_ACTOR_PARAMS(3, -257), "KF Storms Grotto Grass 1", "KF Storms Grotto Grass 1", RHT_KOKIRI_FOREST, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_1));
//locationTable[RC_KF_STORMS_GROTTO_GRASS_2] = Location::Grass(RC_KF_STORMS_GROTTO_GRASS_2, RCQUEST_BOTH, RCAREA_KOKIRI_FOREST, SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, -449), "KF Storms Grotto Grass 2", "KF Storms Grotto Grass 2", RHT_KOKIRI_FOREST, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_2)); //locationTable[RC_KF_STORMS_GROTTO_GRASS_2] = Location::Grass(RC_KF_STORMS_GROTTO_GRASS_2, RCQUEST_BOTH, RCAREA_KOKIRI_FOREST, SCENE_GROTTOS, TWO_ACTOR_PARAMS(88, -449), "KF Storms Grotto Grass 2", "KF Storms Grotto Grass 2", RHT_KOKIRI_FOREST, RG_GREEN_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_KF_STORMS_GROTTO_GRASS_2));

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

@ -3001,6 +3001,7 @@ typedef enum {
RC_ZR_GRASS_11, RC_ZR_GRASS_11,
RC_ZR_GRASS_12, RC_ZR_GRASS_12,
RC_ZR_GRASS_13, RC_ZR_GRASS_13,
RC_ZR_GRASS_14,
// 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,

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

@ -1451,6 +1451,7 @@ typedef enum {
RAND_INF_ZR_GRASS_11, RAND_INF_ZR_GRASS_11,
RAND_INF_ZR_GRASS_12, RAND_INF_ZR_GRASS_12,
RAND_INF_ZR_GRASS_13, RAND_INF_ZR_GRASS_13,
RAND_INF_ZR_GRASS_14,
// 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,