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

Add missing water trial pot

Browse source
This commit is contained in:
aMannus 2024-01-27 21:55:40 +01:00
commit 3f92f7d961
6 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
soh/soh/Enhancements/debugger/debugSaveEditor.h
View file

@ -807,6 +807,7 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2" },
{ RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1" },
{ RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2" },
{ RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3" },
{ RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1" },
{ RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2" },
{ RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3, "RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3" },

1
soh/soh/Enhancements/randomizer/dungeon.cpp
View file

@ -1071,6 +1071,7 @@ Dungeons::Dungeons() {
RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,
RC_GANONS_CASTLE_WATER_TRIAL_POT_1,
RC_GANONS_CASTLE_WATER_TRIAL_POT_2,
RC_GANONS_CASTLE_WATER_TRIAL_POT_3,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,

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

@ -1800,6 +1800,7 @@ void Rando::StaticData::InitLocationTable() {
locationTable[RC_GANONS_CASTLE_FIRE_TRIAL_POT_1] = Location::Base(RC_GANONS_CASTLE_FIRE_TRIAL_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2051, -3855), 0x6003, "Fire Trial Pot 1", "Ganons Castle Fire Trial Pot 1", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_1] = Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(3558, -920), 0x7203, "Water Trial Pot 1", "Ganons Castle Water Trial Pot 1", RHT_POT_GANONS_CASTLE, RG_RECOVERY_HEART, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_2] = Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(3558, -761), 0x740F, "Water Trial Pot 2", "Ganons Castle Water Trial Pot 2", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_WATER_TRIAL_POT_3] = Location::Base(RC_GANONS_CASTLE_WATER_TRIAL_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2822, -507), 0x740F, "Water Trial Pot 3", "Ganons Castle Water Trial Pot 3", RHT_POT_GANONS_CASTLE, RG_GREEN_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1] = Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1234, -3418), 0x5A09, "Shadow Trial Pot 1", "Ganons Castle Shadow Trial Pot 1", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2] = Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1621, -3203), 0x5E0E, "Shadow Trial Pot 2", "Ganons Castle Shadow Trial Pot 2", RHT_POT_GANONS_CASTLE, RG_BLUE_RUPEE, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);
locationTable[RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3] = Location::Base(RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3, RCQUEST_VANILLA, RCTYPE_POT, RCAREA_GANONS_CASTLE, ACTOR_OBJ_TSUBO, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2067, -4592), 0x6209, "Shadow Trial Pot 3", "Ganons Castle Shadow Trial Pot 3", RHT_POT_GANONS_CASTLE, RG_ARROWS_10, { Category::cPot }, SpoilerCollectionCheck::Pot(0x0D, 0x00), SpoilerCollectionCheckGroup::GROUP_DUNGEON_GANONS_CASTLE);

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

@ -1837,6 +1837,7 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
{ RC_GANONS_CASTLE_FIRE_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2 },
{ RC_GANONS_CASTLE_WATER_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1 },
{ RC_GANONS_CASTLE_WATER_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2 },
{ RC_GANONS_CASTLE_WATER_TRIAL_POT_3, RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3 },
{ RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1 },
{ RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2 },
{ RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3, RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3 },

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

@ -1890,6 +1890,7 @@ typedef enum {
RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,
RC_GANONS_CASTLE_WATER_TRIAL_POT_1,
RC_GANONS_CASTLE_WATER_TRIAL_POT_2,
RC_GANONS_CASTLE_WATER_TRIAL_POT_3,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,

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

@ -497,6 +497,7 @@ typedef enum {
RAND_INF_GANONS_CASTLE_FIRE_TRIAL_POT_2,
RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_1,
RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_2,
RAND_INF_GANONS_CASTLE_WATER_TRIAL_POT_3,
RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
RAND_INF_GANONS_CASTLE_SHADOW_TRIAL_POT_3,