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

Fix: Update GetItem value for freestanding items and shopsanity plentiful (#2718)

Browse source 
* fix freestanding items not changing getItem value on the fly

* fix getItem models in shops for plentiful items
This commit is contained in:
Adam Bird 2023-04-18 00:41:08 -04:00 • committed by GitHub
commit 19d8d38082
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1868,6 +1868,10 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
} }
GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId) { GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItemID ogItemId) {
// Shopsanity with at least one item shuffled allows for a third wallet upgrade.
// This is needed since Plentiful item pool also adds a third progressive wallet
// but we should *not* get Tycoon's Wallet in that mode.
u8 numWallets = GetRandoSettingValue(RSK_SHOPSANITY) > RO_SHOPSANITY_ZERO_ITEMS ? 3 : 2;
switch (randoGet) { switch (randoGet) {
case RG_NONE: case RG_NONE:
return ogItemId; return ogItemId;
@ -1912,6 +1916,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_STICK_UPGRADE_20; return GI_STICK_UPGRADE_20;
case 2: case 2:
case 3:
return GI_STICK_UPGRADE_30; return GI_STICK_UPGRADE_30;
} }
case RG_PROGRESSIVE_NUT_UPGRADE: case RG_PROGRESSIVE_NUT_UPGRADE:
@ -1920,6 +1925,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_NUT_UPGRADE_30; return GI_NUT_UPGRADE_30;
case 2: case 2:
case 3:
return GI_NUT_UPGRADE_40; return GI_NUT_UPGRADE_40;
} }
case RG_PROGRESSIVE_BOMB_BAG: case RG_PROGRESSIVE_BOMB_BAG:
@ -1929,6 +1935,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_BOMB_BAG_30; return GI_BOMB_BAG_30;
case 2: case 2:
case 3:
return GI_BOMB_BAG_40; return GI_BOMB_BAG_40;
} }
case RG_BOMBS_5: case RG_BOMBS_5:
@ -1950,6 +1957,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_QUIVER_40; return GI_QUIVER_40;
case 2: case 2:
case 3:
return GI_QUIVER_50; return GI_QUIVER_50;
} }
case RG_ARROWS_5: case RG_ARROWS_5:
@ -1968,6 +1976,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_BULLET_BAG_40; return GI_BULLET_BAG_40;
case 2: case 2:
case 3:
return GI_BULLET_BAG_50; return GI_BULLET_BAG_50;
} }
case RG_DEKU_SEEDS_30: case RG_DEKU_SEEDS_30:
@ -1978,6 +1987,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case ITEM_NONE: case ITEM_NONE:
return GI_OCARINA_FAIRY; return GI_OCARINA_FAIRY;
case ITEM_OCARINA_FAIRY: case ITEM_OCARINA_FAIRY:
case ITEM_OCARINA_TIME:
return GI_OCARINA_OOT; return GI_OCARINA_OOT;
} }
case RG_PROGRESSIVE_BOMBCHUS: case RG_PROGRESSIVE_BOMBCHUS:
@ -2002,6 +2012,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case ITEM_NONE: case ITEM_NONE:
return GI_HOOKSHOT; return GI_HOOKSHOT;
case ITEM_HOOKSHOT: case ITEM_HOOKSHOT:
case ITEM_LONGSHOT:
return GI_LONGSHOT; return GI_LONGSHOT;
} }
case RG_BOOMERANG: case RG_BOOMERANG:
@ -2098,6 +2109,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_GAUNTLETS_SILVER; return GI_GAUNTLETS_SILVER;
case 2: case 2:
case 3:
return GI_GAUNTLETS_GOLD; return GI_GAUNTLETS_GOLD;
} }
case RG_PROGRESSIVE_WALLET: case RG_PROGRESSIVE_WALLET:
@ -2107,13 +2119,15 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 1: case 1:
return GI_WALLET_GIANT; return GI_WALLET_GIANT;
case 2: case 2:
return (GetItemID)RG_TYCOON_WALLET; case 3:
return numWallets == 3 ? (GetItemID)RG_TYCOON_WALLET : GI_WALLET_GIANT;
} }
case RG_PROGRESSIVE_SCALE: case RG_PROGRESSIVE_SCALE:
switch (CUR_UPG_VALUE(UPG_SCALE)) { switch (CUR_UPG_VALUE(UPG_SCALE)) {
case 0: case 0:
return GI_SCALE_SILVER; return GI_SCALE_SILVER;
case 1: case 1:
case 2:
return GI_SCALE_GOLD; return GI_SCALE_GOLD;
} }
case RG_PROGRESSIVE_MAGIC_METER: case RG_PROGRESSIVE_MAGIC_METER:
@ -2121,6 +2135,7 @@ GetItemID Randomizer::GetItemIdFromRandomizerGet(RandomizerGet randoGet, GetItem
case 0: case 0:
return (GetItemID)RG_MAGIC_SINGLE; return (GetItemID)RG_MAGIC_SINGLE;
case 1: case 1:
case 2:
return (GetItemID)RG_MAGIC_DOUBLE; return (GetItemID)RG_MAGIC_DOUBLE;
} }

18
soh/src/code/z_en_item00.c
View file

@ -1426,6 +1426,15 @@ void EnItem00_DrawRupee(EnItem00* this, PlayState* play) {
*/ */
void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) { void EnItem00_DrawCollectible(EnItem00* this, PlayState* play) {
if (gSaveContext.n64ddFlag && (this->getItemId != GI_NONE || this->actor.params == ITEM00_SMALL_KEY)) { if (gSaveContext.n64ddFlag && (this->getItemId != GI_NONE || this->actor.params == ITEM00_SMALL_KEY)) {
RandomizerCheck randoCheck =
Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
if (randoCheck != RC_UNKNOWN_CHECK) {
this->randoGiEntry =
Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
}
f32 mtxScale = 16.0f; f32 mtxScale = 16.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry); EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry);
@ -1486,6 +1495,15 @@ void EnItem00_DrawHeartContainer(EnItem00* this, PlayState* play) {
*/ */
void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) { void EnItem00_DrawHeartPiece(EnItem00* this, PlayState* play) {
if (gSaveContext.n64ddFlag) { if (gSaveContext.n64ddFlag) {
RandomizerCheck randoCheck =
Randomizer_GetCheckFromActor(this->actor.id, play->sceneNum, this->ogParams);
if (randoCheck != RC_UNKNOWN_CHECK) {
this->randoGiEntry =
Randomizer_GetItemFromKnownCheck(randoCheck, GI_NONE);
this->randoGiEntry.getItemFrom = ITEM_FROM_FREESTANDING;
}
f32 mtxScale = 16.0f; f32 mtxScale = 16.0f;
Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY); Matrix_Scale(mtxScale, mtxScale, mtxScale, MTXMODE_APPLY);
EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry); EnItem00_CustomItemsParticles(&this->actor, play, this->randoGiEntry);