mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-01-30 15:00:13 -05:00
Code Issues Projects Releases Wiki Activity

Hint purge (#4924)

Browse Source
This commit is contained in:
aMannus 2025-01-21 00:03:38 +01:00 committed by GitHub
parent 936b159a67
commit 5c4a6ae8c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 94 additions and 843 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

793
soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
View File

File diff suppressed because it is too large Load Diff

8
soh/soh/Enhancements/randomizer/3drando/hints.cpp
View File

@ -112,10 +112,10 @@ StaticHintInfo::StaticHintInfo(HintType _type, std::vector<RandomizerHintTextKey
targetItems(_targetItems), hintChecks(_hintChecks), yourPocket(_yourPocket), num(_num){}
RandomizerHintTextKey GetRandomJunkHint(){
//temp code to handle random junk hints now I work in keys instead of a vector of HintText
//Will be replaced with a better system once more customisable hint pools are added
uint32_t range = RHT_JUNK_CREW_29 - RHT_JUNK02;
return (RandomizerHintTextKey)(Random(0, range) + RHT_JUNK02);
// Temp code to handle random junk hints now I work in keys instead of a vector of HintText
// Will be replaced with a better system once more customisable hint pools are added
uint32_t range = RHT_JUNK71 - RHT_JUNK01;
return (RandomizerHintTextKey)(Random(0, range) + RHT_JUNK01);
}
RandomizerHintTextKey GetRandomGanonJoke(){

136
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@ -3479,6 +3479,7 @@ typedef enum {
RHT_CAN_BE_FOUND_AT,
RHT_HOARDS,
// Junk
RHT_JUNK01,
RHT_JUNK02,
RHT_JUNK03,
RHT_JUNK04,
@ -3549,141 +3550,6 @@ typedef enum {
RHT_JUNK69,
RHT_JUNK70,
RHT_JUNK71,
RHT_JUNK72,
RHT_JUNK73,
RHT_JUNK74,
RHT_JUNK75,
RHT_JUNK76,
RHT_JUNK77,
RHT_JUNK78,
RHT_JUNK79,
RHT_JUNK80,
RHT_JUNK81,
RHT_JUNK_WTC_1,
RHT_JUNK_WTC_2,
RHT_JUNK_WTC_3,
RHT_JUNK_WTC_4,
RHT_JUNK_WTC_5,
RHT_JUNK_WTC_6,
RHT_JUNK_WTC_7,
RHT_JUNK_WTC_8,
RHT_JUNK_WTC_9,
RHT_JUNK_WTC_10,
RHT_JUNK_WTC_11,
RHT_JUNK_WTC_12,
RHT_JUNK_SEI_1,
RHT_JUNK_SEI_2,
RHT_JUNK_SEI_3,
RHT_JUNK_SEI_4,
RHT_JUNK_SEI_5,
RHT_JUNK_SEI_6,
RHT_JUNK_SEI_7,
RHT_JUNK_SEI_8,
RHT_JUNK_SEI_9,
RHT_JUNK_SEI_10,
RHT_JUNK_SEI_11,
RHT_JUNK_SEI_12,
RHT_JUNK_SEI_13,
RHT_JUNK_SEI_14,
RHT_JUNK_SEI_15,
RHT_JUNK_SEI_16,
RHT_JUNK_SEI_17,
RHT_JUNK_SEI_18,
RHT_JUNK_SEI_19,
RHT_JUNK_SEI_20,
RHT_JUNK_SEI_21,
RHT_JUNK_SEI_22,
RHT_JUNK_SEI_23,
RHT_JUNK_SEI_24,
RHT_JUNK_SEI_25,
RHT_JUNK_SEI_26,
RHT_JUNK_SEI_27,
RHT_JUNK_SEI_28,
RHT_JUNK_SEI_29,
RHT_JUNK_OTR_MEANS_1,
RHT_JUNK_OTR_MEANS_2,
RHT_JUNK_OTR_MEANS_3,
RHT_JUNK_OTR_MEANS_4,
RHT_JUNK_OTR_MEANS_5,
RHT_JUNK_OTR_MEANS_6,
RHT_JUNK_OTR_MEANS_7,
RHT_JUNK_OTR_MEANS_8,
RHT_JUNK_OTR_MEANS_9,
RHT_JUNK_OTR_MEANS_10,
RHT_JUNK_OTR_MEANS_11,
RHT_JUNK_OTR_MEANS_12,
RHT_JUNK_OTR_MEANS_13,
RHT_JUNK_OTR_MEANS_14,
RHT_JUNK_OTR_MEANS_15,
RHT_JUNK_OTR_MEANS_16,
RHT_JUNK_OTR_MEANS_17,
RHT_JUNK_OTR_MEANS_18,
RHT_JUNK_OTR_MEANS_19,
RHT_JUNK_OTR_MEANS_20,
RHT_JUNK_OTR_MEANS_21,
RHT_JUNK_OTR_MEANS_22,
RHT_JUNK_OTR_MEANS_23,
RHT_JUNK_OTR_MEANS_24,
RHT_JUNK_OTR_MEANS_25,
RHT_JUNK_OTR_MEANS_26,
RHT_JUNK_OTR_MEANS_27,
RHT_JUNK_OTR_MEANS_28,
RHT_JUNK_OTR_MEANS_29,
RHT_JUNK_OTR_MEANS_30,
RHT_JUNK_MISC_1,
RHT_JUNK_MISC_2,
RHT_JUNK_MISC_3,
RHT_JUNK_MISC_4,
RHT_JUNK_MISC_5,
RHT_JUNK_MISC_6,
RHT_JUNK_MISC_7,
RHT_JUNK_MISC_8,
RHT_JUNK_MISC_9,
RHT_JUNK_MISC_10,
RHT_JUNK_MISC_11,
RHT_JUNK_MISC_12,
RHT_JUNK_MISC_13,
RHT_JUNK_MISC_14,
RHT_JUNK_MISC_15,
RHT_JUNK_MISC_16,
RHT_JUNK_MISC_17,
RHT_JUNK_SG_1,
RHT_JUNK_SG_2,
RHT_JUNK_SG_3,
RHT_JUNK_SG_4,
RHT_JUNK_SG_5,
RHT_JUNK_SG_6,
RHT_JUNK_SG_7,
RHT_JUNK_SG_8,
RHT_JUNK_CREW_1,
RHT_JUNK_CREW_2,
RHT_JUNK_CREW_3,
RHT_JUNK_CREW_4,
RHT_JUNK_CREW_5,
RHT_JUNK_CREW_6,
RHT_JUNK_CREW_7,
RHT_JUNK_CREW_8,
RHT_JUNK_CREW_9,
RHT_JUNK_CREW_10,
RHT_JUNK_CREW_11,
RHT_JUNK_CREW_12,
RHT_JUNK_CREW_13,
RHT_JUNK_CREW_14,
RHT_JUNK_CREW_15,
RHT_JUNK_CREW_16,
RHT_JUNK_CREW_17,
RHT_JUNK_CREW_18,
RHT_JUNK_CREW_19,
RHT_JUNK_CREW_20,
RHT_JUNK_CREW_21,
RHT_JUNK_CREW_22,
RHT_JUNK_CREW_23,
RHT_JUNK_CREW_24,
RHT_JUNK_CREW_25,
RHT_JUNK_CREW_26,
RHT_JUNK_CREW_27,
RHT_JUNK_CREW_28,
RHT_JUNK_CREW_29,
// Locations
RHT_LINKS_POCKET,
RHT_QUEEN_GOHMA,