ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add missing Hint clarities back (#6477)

Browse source
This commit is contained in:
Jerom Venneker 2026-04-13 05:39:30 +02:00 committed by GitHub
parent 25eb09180d
commit ca38dba192
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
View file

@ -36,7 +36,8 @@ void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysteriou
itemName = CustomMessage(RAND_GET_OVERRIDE(rc).GetTrickName()); itemName = CustomMessage(RAND_GET_OVERRIDE(rc).GetTrickName());
color = "%g"; color = "%g";
} else { } else {
itemName = CustomMessage(Rando::StaticData::RetrieveItem(rgid).GetName()); const Rando::Item& item = Rando::StaticData::RetrieveItem(rgid);
itemName = item.GetHint().GetHintMessage().GetForCurrentLanguage();
} }
msg.Replace("[[color]]", color); msg.Replace("[[color]]", color);
msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) }); msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) });

12
soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
View file

@ -140,7 +140,7 @@ void BuildSkulltulaPeopleMessage(uint16_t* textId, bool* loadFromMessageTable) {
"et j'aurai quelque chose à te donner! [[color]]([[1]])%w"); "et j'aurai quelque chose à te donner! [[color]]([[1]])%w");
msg.InsertNumber(count); msg.InsertNumber(count);
msg.Replace("[[color]]", item.GetColor()); msg.Replace("[[color]]", item.GetColor());
msg.InsertNames({ item.GetName() }); msg.InsertNames({ item.GetHint().GetHintMessage().GetForCurrentLanguage() });
msg.AutoFormat(); msg.AutoFormat();
msg.LoadIntoFont(); msg.LoadIntoFont();
*loadFromMessageTable = false; *loadFromMessageTable = false;
@ -155,12 +155,10 @@ void Build100SkullsHintMessage(uint16_t* textId, bool* loadFromMessageTable) {
/*french*/ /*french*/
"Yeaaarrgh! Je suis maudit!^Détruit encore %y100 Araignées de la Malédiction%w " "Yeaaarrgh! Je suis maudit!^Détruit encore %y100 Araignées de la Malédiction%w "
"et j'aurai quelque chose à te donner! [[color]]([[1]])%w"); "et j'aurai quelque chose à te donner! [[color]]([[1]])%w");
msg.Replace("[[color]]", Rando::StaticData::RetrieveItem( Rando::Item& item =
RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet()) Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet());
.GetColor()); msg.Replace("[[color]]", item.GetColor());
msg.InsertNames( msg.InsertNames({ item.GetHint().GetHintMessage().GetForCurrentLanguage() });
{ Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet())
.GetName() });
msg.AutoFormat(); msg.AutoFormat();
msg.LoadIntoFont(); msg.LoadIntoFont();
*loadFromMessageTable = false; *loadFromMessageTable = false;

10
soh/soh/Enhancements/randomizer/hint.cpp
View file

@ -513,17 +513,13 @@ const HintText Hint::GetItemHintText(uint8_t slot, bool mysterious) const {
auto ctx = Rando::Context::GetInstance(); auto ctx = Rando::Context::GetInstance();
RandomizerCheck hintedCheck = locations[slot]; RandomizerCheck hintedCheck = locations[slot];
RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet(); RandomizerGet targetRG = ctx->GetItemLocation(hintedCheck)->GetPlacedRandomizerGet();
CustomMessage msg;
if (mysterious) { if (mysterious) {
return StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM]; return StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM];
} else if (!ctx->GetOption(RSK_HINT_CLARITY).Is(RO_HINT_CLARITY_AMBIGUOUS) && } else if (targetRG == RG_ICE_TRAP) { // RANDOTODO store in item hint instead of item
targetRG == RG_ICE_TRAP) { // RANDOTODO store in item hint instead of item return HintText(CustomMessage({ ctx->overrides[hintedCheck].GetTrickName() }));
msg = CustomMessage({ ctx->overrides[hintedCheck].GetTrickName() });
} else { } else {
msg = ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetName(); return ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetHint();
} }
msg = CustomMessage(ctx->GetItemLocation(hintedCheck)->GetPlacedItem().GetArticle()) + msg;
return HintText(msg);
} }
const HintText Hint::GetAreaHintText(uint8_t slot) const { const HintText Hint::GetAreaHintText(uint8_t slot) const {

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

@ -1,7 +1,6 @@
#include "soh_assets.h" #include "soh_assets.h"
#include "static_data.h" #include "static_data.h"
#include "SeedContext.h" #include "SeedContext.h"
#include "logic.h"
#include "textures/icon_item_24_static/icon_item_24_static.h" #include "textures/icon_item_24_static/icon_item_24_static.h"
#include "textures/icon_item_static/icon_item_static.h" #include "textures/icon_item_static/icon_item_static.h"
#include "z64object.h" #include "z64object.h"