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

switch upgrade magic numbers to use enum

Browse source
This commit is contained in:
MelonSpeedruns 2022-05-27 15:36:46 -04:00
commit 4f7c778429
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -552,9 +552,23 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case BOMBCHUS_10: case BOMBCHUS_10:
return GI_BOMBCHUS_10; return GI_BOMBCHUS_10;
case BOW: case BOW:
return GI_BOW; switch (CUR_UPG_VALUE(UPG_QUIVER)) {
case 0:
return GI_BOW;
case 1:
return GI_QUIVER_40;
case 2:
return GI_QUIVER_50;
}
case SLINGSHOT: case SLINGSHOT:
return GI_SLINGSHOT; switch (CUR_UPG_VALUE(UPG_BULLET_BAG)) {
case 0:
return GI_SLINGSHOT;
case 1:
return GI_BULLET_BAG_40;
case 2:
return GI_BULLET_BAG_50;
}
case BOOMERANG: case BOOMERANG:
return GI_BOOMERANG; return GI_BOOMERANG;
case PROGRESSIVE_HOOKSHOT: case PROGRESSIVE_HOOKSHOT:
@ -585,7 +599,7 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case HOVER_BOOTS: case HOVER_BOOTS:
return GI_BOOTS_HOVER; return GI_BOOTS_HOVER;
case BOMB_BAG: case BOMB_BAG:
switch (CUR_UPG_VALUE(1)) { switch (CUR_UPG_VALUE(UPG_BOMB_BAG)) {
case ITEM_NONE: case ITEM_NONE:
return GI_BOMB_BAG_20; return GI_BOMB_BAG_20;
case ITEM_BOMB_BAG_20: case ITEM_BOMB_BAG_20:
@ -594,7 +608,7 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
return GI_BOMB_BAG_40; return GI_BOMB_BAG_40;
} }
case PROGRESSIVE_STRENGTH_UPGRADE: case PROGRESSIVE_STRENGTH_UPGRADE:
switch (CUR_UPG_VALUE(3)) { switch (CUR_UPG_VALUE(UPG_STRENGTH)) {
case 0: case 0:
return GI_BRACELET; return GI_BRACELET;
case 1: case 1:
@ -603,7 +617,7 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
return GI_GAUNTLETS_GOLD; return GI_GAUNTLETS_GOLD;
} }
case PROGRESSIVE_SCALE: case PROGRESSIVE_SCALE:
switch (CUR_UPG_VALUE(2)) { switch (CUR_UPG_VALUE(UPG_SCALE)) {
case 0: case 0:
return GI_SCALE_SILVER; return GI_SCALE_SILVER;
case 1: case 1:
@ -644,7 +658,7 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
return GI_MAGIC_LARGE; return GI_MAGIC_LARGE;
} }
case PROGRESSIVE_WALLET: case PROGRESSIVE_WALLET:
switch (CUR_UPG_VALUE(4)) { switch (CUR_UPG_VALUE(UPG_WALLET)) {
case 0: case 0:
return GI_WALLET_ADULT; return GI_WALLET_ADULT;
case 1: case 1:
@ -687,14 +701,14 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
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:
switch (CUR_UPG_VALUE(6)) { switch (CUR_UPG_VALUE(UPG_STICKS)) {
case 0: case 0:
return GI_STICK_UPGRADE_20; return GI_STICK_UPGRADE_20;
case 1: case 1:
return GI_STICK_UPGRADE_30; return GI_STICK_UPGRADE_30;
} }
case DEKU_NUT_CAPACITY: case DEKU_NUT_CAPACITY:
switch (CUR_UPG_VALUE(7)) { switch (CUR_UPG_VALUE(UPG_NUTS)) {
case 0: case 0:
return GI_NUT_UPGRADE_30; return GI_NUT_UPGRADE_30;
case 1: case 1: