github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fairy rewards working

Browse source
This commit is contained in:
briaguya 2022-05-30 17:04:34 -04:00
commit 44b1233ded
2 changed files with 39 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

39
soh/soh/Enhancements/randomizer.cpp
View file

@ -1231,6 +1231,26 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet, GetItemID ogItemId)
return GI_SEEDS_30; return GI_SEEDS_30;
case BOTTLE_WITH_BIG_POE: case BOTTLE_WITH_BIG_POE:
return GI_BIG_POE; return GI_BIG_POE;
case BOTTLE:
return GI_BOTTLE;
case BOTTLE_WITH_BLUE_FIRE:
return GI_BLUE_FIRE;
case BOTTLE_WITH_BLUE_POTION:
return GI_POTION_BLUE;
case BOTTLE_WITH_BUGS:
return GI_BUGS;
case BOTTLE_WITH_FAIRY:
return GI_FAIRY;
case BOTTLE_WITH_FISH:
return GI_FISH;
case BOTTLE_WITH_GREEN_POTION:
return GI_POTION_GREEN;
case BOTTLE_WITH_MILK:
return GI_MILK_BOTTLE;
case BOTTLE_WITH_POE:
return GI_POE;
case BOTTLE_WITH_RED_POTION:
return GI_POTION_RED;
case PIECE_OF_HEART_TREASURE_CHEST_GAME: case PIECE_OF_HEART_TREASURE_CHEST_GAME:
return GI_HEART_PIECE_WIN; return GI_HEART_PIECE_WIN;
case DEKU_STICK_CAPACITY: case DEKU_STICK_CAPACITY:
@ -1828,10 +1848,25 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
case 262: case 262:
return ZF_ICEBERG_FREESTANDING_POH; return ZF_ICEBERG_FREESTANDING_POH;
} }
case 59:
// using fountainType as actorParams
switch(actorParams) {
case 1:
return DMT_GREAT_FAIRY_REWARD;
case 2:
return DMC_GREAT_FAIRY_REWARD;
case 3:
return OGC_GREAT_FAIRY_REWARD;
}
case 61: case 61:
switch(actorId) { // using fountainType as actorParams
case 11: switch(actorParams) {
case 1:
return ZF_GREAT_FAIRY_REWARD;
case 2:
return HC_GREAT_FAIRY_REWARD; return HC_GREAT_FAIRY_REWARD;
case 3:
return COLOSSUS_GREAT_FAIRY_REWARD;
} }
} }

3
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View file

@ -72,7 +72,8 @@ const ActorInit Bg_Dy_Yoseizo_InitVars = {
u8 successGreatFairy; u8 successGreatFairy;
void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, GlobalContext* globalCtx) { void GivePlayerRandoRewardGreatFairy(BgDyYoseizo* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
GetItemID getItemId = GetRandomizedItemIdFromKnownCheck(HC_GREAT_FAIRY_REWARD, GI_NONE); GetItemID getItemId = GetRandomizedItemId(GI_NONE, this->actor.id, this->fountainType + 1, globalCtx->sceneNum);
// GetItemID getItemId = GetRandomizedItemIdFromKnownCheck(HC_GREAT_FAIRY_REWARD, GI_NONE);
if (successGreatFairy && !Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) { if (successGreatFairy && !Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
Flags_SetTreasure(globalCtx, this->fountainType + 1); Flags_SetTreasure(globalCtx, this->fountainType + 1);