mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-07 10:50:29 -05:00
Code Issues Projects Releases Wiki Activity

treasure man

Browse Source
This commit is contained in:
Demur Rumed 2025-01-26 13:46:28 +00:00
parent 87993c7e0b
commit 8c24e33900
6 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -535,6 +535,7 @@ const std::vector<FlagTable> flagTables = {
{ RAND_INF_BOMBCHU_SHOPKEEPER_SOUL, "RAND_INF_BOMBCHU_SHOPKEEPER_SOUL" }, { RAND_INF_BOMBCHU_SHOPKEEPER_SOUL, "RAND_INF_BOMBCHU_SHOPKEEPER_SOUL" },
{ RAND_INF_MASK_SALESMAN_SOUL, "RAND_INF_MASK_SALESMAN_SOUL" }, { RAND_INF_MASK_SALESMAN_SOUL, "RAND_INF_MASK_SALESMAN_SOUL" },
{ RAND_INF_BOMBCHU_LADY_SOUL, "RAND_INF_BOMBCHU_LADY_SOUL" }, { RAND_INF_BOMBCHU_LADY_SOUL, "RAND_INF_BOMBCHU_LADY_SOUL" },
{ RAND_INF_TREASURE_MAN_SOUL, "RAND_INF_TREASURE_MAN_SOUL" },
{ RAND_INF_DIVING_SOUL, "RAND_INF_DIVING_SOUL" }, { RAND_INF_DIVING_SOUL, "RAND_INF_DIVING_SOUL" },
{ RAND_INF_SCIENTIST_SOUL, "RAND_INF_SCIENTIST_SOUL" }, { RAND_INF_SCIENTIST_SOUL, "RAND_INF_SCIENTIST_SOUL" },
{ RAND_INF_KAEPORA_SOUL, "RAND_INF_KAEPORA_SOUL" }, { RAND_INF_KAEPORA_SOUL, "RAND_INF_KAEPORA_SOUL" },

3
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View File

@ -2192,6 +2192,9 @@ void RandomizerOnActorInitHandler(void* actorRef) {
break; break;
} }
break; break;
case ACTOR_EN_TAKARA_MAN:
inf = RAND_INF_TREASURE_MAN_SOUL;
break;
case ACTOR_EN_BOM_BOWL_MAN: case ACTOR_EN_BOM_BOWL_MAN:
case ACTOR_EN_WALL_TUBO: // crashes when bombchu lady missing case ACTOR_EN_WALL_TUBO: // crashes when bombchu lady missing
inf = RAND_INF_BOMBCHU_LADY_SOUL; inf = RAND_INF_BOMBCHU_LADY_SOUL;

2
soh/soh/Enhancements/randomizer/item_list.cpp
View File

@ -379,6 +379,8 @@ void Rando::StaticData::InitItemTable() {
itemTable[RG_BOMBCHU_SHOPKEEPER_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul); itemTable[RG_BOMBCHU_SHOPKEEPER_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
itemTable[RG_MASK_SALESMAN_SOUL] = Item(RG_MASK_SALESMAN_SOUL, Text{ "Mask Salesman's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_MASK_SALESMAN_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); itemTable[RG_MASK_SALESMAN_SOUL] = Item(RG_MASK_SALESMAN_SOUL, Text{ "Mask Salesman's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_MASK_SALESMAN_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_MASK_SALESMAN_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul); itemTable[RG_MASK_SALESMAN_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
itemTable[RG_TREASURE_MAN_SOUL] = Item(RG_TREASURE_MAN_SOUL, Text{ "Treasure Man's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_TREASURE_MAN_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_TREASURE_MAN_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
itemTable[RG_BOMBCHU_LADY_SOUL] = Item(RG_BOMBCHU_LADY_SOUL, Text{ "Bombchu Lady's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_BOMBCHU_LADY_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); itemTable[RG_BOMBCHU_LADY_SOUL] = Item(RG_BOMBCHU_LADY_SOUL, Text{ "Bombchu Lady's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_BOMBCHU_LADY_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_BOMBCHU_LADY_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul); itemTable[RG_BOMBCHU_LADY_SOUL].SetCustomDrawFunc(Randomizer_DrawBossSoul);
itemTable[RG_DIVING_SOUL] = Item(RG_DIVING_SOUL, Text{ "Diver's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_DIVING_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); itemTable[RG_DIVING_SOUL] = Item(RG_DIVING_SOUL, Text{ "Diver's Soul" }, ITEMTYPE_ITEM, 0xE5, true, LOGIC_CAN_SUMMON_MORPHA, RHT_MORPHA_SOUL, RG_DIVING_SOUL, OBJECT_GI_SUTARU, GID_SKULL_TOKEN, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);

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

@ -3897,6 +3897,7 @@ std::map<RandomizerGet, RandomizerInf> randomizerGetToRandInf = {
{ RG_ZORA_SHOPKEEPER_SOUL, RAND_INF_ZORA_SHOPKEEPER_SOUL }, { RG_ZORA_SHOPKEEPER_SOUL, RAND_INF_ZORA_SHOPKEEPER_SOUL },
{ RG_BOMBCHU_SHOPKEEPER_SOUL, RAND_INF_BOMBCHU_SHOPKEEPER_SOUL }, { RG_BOMBCHU_SHOPKEEPER_SOUL, RAND_INF_BOMBCHU_SHOPKEEPER_SOUL },
{ RG_MASK_SALESMAN_SOUL, RAND_INF_MASK_SALESMAN_SOUL }, { RG_MASK_SALESMAN_SOUL, RAND_INF_MASK_SALESMAN_SOUL },
{ RG_TREASURE_MAN_SOUL, RAND_INF_TREASURE_MAN_SOUL },
{ RG_BOMBCHU_LADY_SOUL, RAND_INF_BOMBCHU_LADY_SOUL }, { RG_BOMBCHU_LADY_SOUL, RAND_INF_BOMBCHU_LADY_SOUL },
{ RG_DIVING_SOUL, RAND_INF_DIVING_SOUL }, { RG_DIVING_SOUL, RAND_INF_DIVING_SOUL },
{ RG_SCIENTIST_SOUL, RAND_INF_SCIENTIST_SOUL }, { RG_SCIENTIST_SOUL, RAND_INF_SCIENTIST_SOUL },

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

@ -3350,6 +3350,7 @@ typedef enum {
RG_ZORA_SHOPKEEPER_SOUL, RG_ZORA_SHOPKEEPER_SOUL,
RG_BOMBCHU_SHOPKEEPER_SOUL, RG_BOMBCHU_SHOPKEEPER_SOUL,
RG_MASK_SALESMAN_SOUL, RG_MASK_SALESMAN_SOUL,
RG_TREASURE_MAN_SOUL,
RG_BOMBCHU_LADY_SOUL, RG_BOMBCHU_LADY_SOUL,
RG_DIVING_SOUL, RG_DIVING_SOUL,
RG_SCIENTIST_SOUL, RG_SCIENTIST_SOUL,

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

@ -1355,6 +1355,7 @@ typedef enum {
RAND_INF_BOMBCHU_SHOPKEEPER_SOUL, RAND_INF_BOMBCHU_SHOPKEEPER_SOUL,
RAND_INF_MASK_SALESMAN_SOUL, RAND_INF_MASK_SALESMAN_SOUL,
RAND_INF_BOMBCHU_LADY_SOUL, RAND_INF_BOMBCHU_LADY_SOUL,
RAND_INF_TREASURE_MAN_SOUL,
RAND_INF_DIVING_SOUL, RAND_INF_DIVING_SOUL,
RAND_INF_SCIENTIST_SOUL, RAND_INF_SCIENTIST_SOUL,
RAND_INF_KAEPORA_SOUL, // used by loop, must be last NPC soul RAND_INF_KAEPORA_SOUL, // used by loop, must be last NPC soul