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

bottom of the well stuff

Browse source
This commit is contained in:
briaguya 2022-05-26 19:57:15 -04:00
commit bf9f404e2c
1 changed files with 47 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -594,10 +594,25 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
case HEART_CONTAINER: case HEART_CONTAINER:
// todo figure out what GI_HEART_CONTAINER_2 is // todo figure out what GI_HEART_CONTAINER_2 is
return GI_HEART_CONTAINER; return GI_HEART_CONTAINER;
// todo implement dungeon-specific keys // todo implement dungeon-specific keys/keyrings
case BOSS_KEY:
case BOSS_KEY_FIRE_TEMPLE: case BOSS_KEY_FIRE_TEMPLE:
case BOSS_KEY_FOREST_TEMPLE:
case BOSS_KEY_GANONS_CASTLE:
case BOSS_KEY_SHADOW_TEMPLE:
case BOSS_KEY_SPIRIT_TEMPLE:
case BOSS_KEY_WATER_TEMPLE:
return GI_KEY_BOSS; return GI_KEY_BOSS;
case SMALL_KEY:
case SMALL_KEY_BOTTOM_OF_THE_WELL:
case SMALL_KEY_FIRE_TEMPLE: case SMALL_KEY_FIRE_TEMPLE:
case SMALL_KEY_FOREST_TEMPLE:
case SMALL_KEY_GANONS_CASTLE:
case SMALL_KEY_GERUDO_TRAINING_GROUND:
case SMALL_KEY_SHADOW_TEMPLE:
case SMALL_KEY_SPIRIT_TEMPLE:
case SMALL_KEY_THIEVES_HIDEOUT:
case SMALL_KEY_WATER_TEMPLE:
return GI_KEY_SMALL; return GI_KEY_SMALL;
case MAGIC_METER: case MAGIC_METER:
// todo make it progressive // todo make it progressive
@ -653,6 +668,8 @@ GetItemID Randomizer::GetItemFromGet(RandomizerGet randoGet) {
return GI_ARROWS_MEDIUM; return GI_ARROWS_MEDIUM;
case ARROWS_30: case ARROWS_30:
return GI_ARROWS_LARGE; return GI_ARROWS_LARGE;
case DEKU_STICK_1:
return GI_STICKS_1;
default: default:
return GI_NONE; return GI_NONE;
} }
@ -794,6 +811,35 @@ RandomizerCheck Randomizer::GetCheckFromSceneAndParams(s16 sceneNum, s16 actorPa
case -18428: case -18428:
return JABU_JABUS_BELLY_COMPASS_CHEST; return JABU_JABUS_BELLY_COMPASS_CHEST;
} }
case 8:
switch(actorParams) {
case 22600:
return BOTTOM_OF_THE_WELL_FRONT_LEFT_FAKE_WALL_CHEST;
case 20578:
return BOTTOM_OF_THE_WELL_FRONT_CENTER_BOMBABLE_CHEST;
case 23684:
return BOTTOM_OF_THE_WELL_BACK_LEFT_BOMBABLE_CHEST;
case 22793:
return BOTTOM_OF_THE_WELL_UNDERWATER_LEFT_CHEST;
case 2049:
return BOTTOM_OF_THE_WELL_COMPASS_CHEST;
case 20558:
return BOTTOM_OF_THE_WELL_CENTER_SKULLTULA_CHEST;
case 22597:
return BOTTOM_OF_THE_WELL_RIGHT_BOTTOM_FAKE_WALL_CHEST;
case 21802:
return BOTTOM_OF_THE_WELL_FIRE_KEESE_CHEST;
case 21836:
return BOTTOM_OF_THE_WELL_LIKE_LIKE_CHEST;
case 2087:
return BOTTOM_OF_THE_WELL_MAP_CHEST;
case 23760:
return BOTTOM_OF_THE_WELL_UNDERWATER_FRONT_CHEST;
case 4419:
return BOTTOM_OF_THE_WELL_LENS_OF_TRUTH_CHEST;
case 27348:
return BOTTOM_OF_THE_WELL_INVISIBLE_CHEST;
}
} }
return UNKNOWN_CHECK; return UNKNOWN_CHECK;