nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Implement get item messages

Browse Source
This commit is contained in:
aMannus
2025-06-29 23:49:38 +02:00
parent c2788bd0ba
commit dc76883a56
5 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2384,6 +2384,10 @@ void RandomizerOnCuccoOrChickenHatch() {
}
}
uint32_t RandomizerReturnCurrentlyQueuedItem() {
return (uint32_t)randomizerQueuedCheck;
}
void RandomizerRegisterHooks() {
static uint32_t onFlagSetHook = 0;
static uint32_t onSceneFlagSetHook = 0;

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

@@ -2,5 +2,6 @@
#define RANDOMIZER_HOOK_HANDLERS_H
void RandomizerRegisterHooks();
uint32_t RandomizerReturnCurrentlyQueuedItem();
#endif // RANDOMIZER_HOOK_HANDLERS_H

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

@@ -65,6 +65,7 @@ const std::string Randomizer::triforcePieceMessageTableID = "RandomizerTriforceP
const std::string Randomizer::NaviRandoMessageTableID = "RandomizerNavi";
const std::string Randomizer::IceTrapRandoMessageTableID = "RandomizerIceTrap";
const std::string Randomizer::randoMiscHintsTableID = "RandomizerMiscHints";
const std::string Randomizer::archipelagoItemsTableID = "ÁrchipelagoItems";
static const char* englishRupeeNames[188] = {
"[P]",
@@ -5346,10 +5347,40 @@ CustomMessage Randomizer::GetGoronMessage(u16 index) {
return messageEntry;
}
void CreateArchipelagoItemMessage() {
CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
customMessageManager->AddCustomMessageTable(Randomizer::archipelagoItemsTableID);
customMessageManager->CreateMessage(
Randomizer::archipelagoItemsTableID, 0,
CustomMessage("You found [[apcolor]][[apitem]]%w for %r[[applayer]]%w!", "You found \x05\x06[[apitem]]\x05\x00 for \x05\x05[[applayer]]\x05\x00!",
"You found \x05\x06[[apitem]]\x05\x00 for \x05\x05[[applayer]]\x05\x00!"));
}
CustomMessage Randomizer::GetArchipelagoItemMessage(int16_t randomizerGet, uint32_t randomizerCheck) {
CustomMessage messageEntry =
CustomMessageManager::Instance->RetrieveMessage(Randomizer::archipelagoItemsTableID, 0);
std::string itemColor = "";
if (randomizerGet == RG_ARCHIPELAGO_ITEM_PROGRESSIVE) {
itemColor = "%p";
} else if (randomizerGet == RG_ARCHIPELAGO_ITEM_USEFUL) {
itemColor = "%b";
} else {
itemColor = "%c";
}
messageEntry.Replace("[[apcolor]]", itemColor);
messageEntry.Replace("[[apitem]]", std::string(gSaveContext.ship.quest.data.archipelago.locations[randomizerCheck].itemName));
messageEntry.Replace("[[applayer]]",
std::string(gSaveContext.ship.quest.data.archipelago.locations[randomizerCheck].playerName));
messageEntry.AutoFormat();
return messageEntry;
}
void Randomizer::CreateCustomMessages() {
// RANDTODO: Translate into french and german and replace GIMESSAGE_UNTRANSLATED
// with GIMESSAGE(getItemID, itemID, english, german, french).
const std::array<GetItemMessage, 115> getItemMessages = { {
const std::array<GetItemMessage, 112> getItemMessages = { {
GIMESSAGE(RG_GREG_RUPEE, ITEM_MASK_GORON, "You found %gGreg%w!", "%gGreg%w! Du hast ihn wirklich gefunden!",
"Félicitation! Vous avez trouvé %gGreg%w!"),
GIMESSAGE(RG_MASTER_SWORD, ITEM_SWORD_MASTER, "You found the %gMaster Sword%w!",
@@ -5713,15 +5744,13 @@ void Randomizer::CreateCustomMessages() {
GIMESSAGE(RG_DEKU_NUT_BAG, ITEM_NUT, "You found the %rDeku Nut Bag%w!&You can now hold Deku Nuts!",
"Du hast eine %rDeku-Nuß-Tasche%w&gefunden! Nun kannst Du &%yDeku-Nüsse%w verwenden!",
"Vous avez trouvé le %rSac de Noix& Mojo%w!&Vous pouvez maintenant porter des&Noix Mojo!"),
GIMESSAGE_UNTRANSLATED(RG_ARCHIPELAGO_ITEM_USEFUL, ITEM_NUT, "You found an useful %gAP Item%w!"),
GIMESSAGE_UNTRANSLATED(RG_ARCHIPELAGO_ITEM_JUNK, ITEM_NUT, "You found a junk %gAP Item%w!"),
GIMESSAGE_UNTRANSLATED(RG_ARCHIPELAGO_ITEM_PROGRESSIVE, ITEM_NUT, "You found a progressive %gAP Item%w!"),
} };
CreateGetItemMessages(getItemMessages);
CreateRupeeMessages();
CreateTriforcePieceMessages();
CreateNaviRandoMessages();
CreateFireTempleGoronMessages();
CreateArchipelagoItemMessage();
}
class ExtendedVanillaTableInvalidItemIdException : public std::exception {

2
soh/soh/Enhancements/randomizer/randomizer.h
View File

@@ -38,6 +38,7 @@ class Randomizer {
static const std::string NaviRandoMessageTableID;
static const std::string IceTrapRandoMessageTableID;
static const std::string randoMiscHintsTableID;
static const std::string archipelagoItemsTableID;
static Sprite* GetSeedTexture(uint8_t index);
bool SpoilerFileExists(const char* spoilerFileName);
@@ -74,6 +75,7 @@ class Randomizer {
static CustomMessage GetRupeeMessage(u16 rupeeTextId);
static CustomMessage GetIceTrapMessage();
static CustomMessage GetTriforcePieceMessage();
static CustomMessage GetArchipelagoItemMessage(int16_t randomizerGet, uint32_t randomizerCheck);
};
#ifdef __cplusplus

6
soh/soh/OTRGlobals.cpp
View File

@@ -45,6 +45,7 @@
#include "Enhancements/custom-message/CustomMessageManager.h"
#include "Enhancements/Presets/Presets.h"
#include "util.h"
#include "soh/Enhancements/randomizer/hook_handlers.h"
#if not defined(__SWITCH__) && not defined(__WIIU__)
#include "Extractor/Extract.h"
@@ -2262,6 +2263,11 @@ extern "C" int CustomMessage_RetrieveIfExists(PlayState* play) {
messageEntry = Randomizer::GetIceTrapMessage();
} else if (player->getItemEntry.getItemId == RG_TRIFORCE_PIECE) {
messageEntry = Randomizer::GetTriforcePieceMessage();
} else if (player->getItemEntry.getItemId == RG_ARCHIPELAGO_ITEM_USEFUL ||
player->getItemEntry.getItemId == RG_ARCHIPELAGO_ITEM_JUNK ||
player->getItemEntry.getItemId == RG_ARCHIPELAGO_ITEM_PROGRESSIVE) {
messageEntry = Randomizer::GetArchipelagoItemMessage(player->getItemEntry.getItemId,
RandomizerReturnCurrentlyQueuedItem());
} else {
messageEntry = Randomizer_GetCustomGetItemMessage(player);
}