diff --git a/soh/soh/Enhancements/NoSkulltulaFreeze.cpp b/soh/soh/Enhancements/NoSkulltulaFreeze.cpp index ee30cd674..3b3051417 100644 --- a/soh/soh/Enhancements/NoSkulltulaFreeze.cpp +++ b/soh/soh/Enhancements/NoSkulltulaFreeze.cpp @@ -1,7 +1,7 @@ #include extern "C" { - #include "variables.h" +#include "variables.h" } #define RAND_GET_OPTION(rsk) OTRGlobals::Instance->gRandoContext->GetOption(rsk) @@ -19,11 +19,14 @@ void AutoDismissSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) { } void NoSkulltulaFreeze_Register() { - COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0, AutoDismissSkulltulaMessage); - COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) && CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0, AutoDismissSkulltulaMessage); + COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE, + CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) && + CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0, + AutoDismissSkulltulaMessage); + COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE, + CVarGetInteger(CVAR_ENHANCEMENT("SkulltulaFreeze"), 0) && + CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0) == 0, + AutoDismissSkulltulaMessage); } - -static RegisterShipInitFunc initFunc(NoSkulltulaFreeze_Register, { - CVAR_ENHANCEMENT("SkulltulaFreeze") -}); \ No newline at end of file +static RegisterShipInitFunc initFunc(NoSkulltulaFreeze_Register, { CVAR_ENHANCEMENT("SkulltulaFreeze") }); \ No newline at end of file diff --git a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp index fd35f6624..3308f6a25 100644 --- a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp @@ -373,14 +373,18 @@ void BuildTriforcePieceMessage(CustomMessage& msg) { void BuildCustomItemMessage(Player* player, CustomMessage& msg) { int16_t rgid; - msg = CustomMessage("You found [[article]][[color]][[name]]%w!", "Du erhältst [[article]][[color]][[name]]%w gefunden!", "Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE); + msg = CustomMessage("You found [[article]][[color]][[name]]%w!", + "Du erhältst [[article]][[color]][[name]]%w gefunden!", + "Vous avez trouvé [[article]][[color]][[name]]%w!", TEXTBOX_TYPE_BLUE); if (player->getItemEntry.objectId != OBJECT_INVALID) { rgid = player->getItemEntry.getItemId; } else { rgid = player->getItemId; } - CustomMessage name = CustomMessage(Rando::StaticData::RetrieveItem(static_cast(rgid)).GetName(), TEXTBOX_TYPE_BLUE); - CustomMessage article = CustomMessage(Rando::StaticData::RetrieveItem(static_cast(rgid)).GetArticle(), TEXTBOX_TYPE_BLUE); + CustomMessage name = + CustomMessage(Rando::StaticData::RetrieveItem(static_cast(rgid)).GetName(), TEXTBOX_TYPE_BLUE); + CustomMessage article = CustomMessage( + Rando::StaticData::RetrieveItem(static_cast(rgid)).GetArticle(), TEXTBOX_TYPE_BLUE); msg.Replace("[[article]]", article); msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(static_cast(rgid)).GetColor()); msg.Replace("[[name]]", name); diff --git a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp index 0adcfb010..2c94920de 100644 --- a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp @@ -29,7 +29,7 @@ void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc) { CustomMessage itemName; std::string color = Rando::StaticData::RetrieveItem(static_cast(rgid)).GetColor(); bool mysterious = RAND_GET_OPTION(RSK_MERCHANT_TEXT_HINT).Is(RO_GENERIC_OFF) || - CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0); + CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0); if (mysterious) { itemName = Rando::StaticData::hintTextTable[RHT_MYSTERIOUS_ITEM_CAPITAL].GetHintMessage(); color = "%g"; @@ -41,24 +41,23 @@ void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc) { itemName = CustomMessage(Rando::StaticData::RetrieveItem(rgid).GetName()); } msg.Replace("[[color]]", color); - msg.InsertNames({ itemName , CustomMessage(std::to_string(price))}); + msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) }); } void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) { CustomMessage msg; if (*textId == TEXT_BEAN_SALESMAN_BUY_FOR_100) { msg = CustomMessage( - "I never thought I'd say this, but I'm selling the last %rMagic Bean%w.^%y99 Rupees%w, no less.\x1B%gYes&No%w", - "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^%rWundererbse%w für %y99 Rubine%w.\x1B&%gJa&Nein%w", - "Je te vends mon dernier %rHaricot&magique%g pour %y99 Rubis%w.\x1B&%gAcheterNe pas acheter%w" - ); + "I never thought I'd say this, but I'm selling the last %rMagic Bean%w.^%y99 Rupees%w, no " + "less.\x1B%gYes&No%w", + "Ich hätte nie gedacht, daß ich das sage, aber ich verkaufe die letzte^%rWundererbse%w für %y99 " + "Rubine%w.\x1B&%gJa&Nein%w", + "Je te vends mon dernier %rHaricot&magique%g pour %y99 Rubis%w.\x1B&%gAcheterNe pas acheter%w"); msg.Format(); } else if (*textId == TEXT_BEAN_SALESMAN_BUY_FOR_10) { - msg = CustomMessage( - "Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", - "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", - "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w" - ); + msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", + "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", + "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w"); BuildMerchantMessage(msg, RC_ZR_MAGIC_BEAN_SALESMAN); msg.AutoFormat(); } @@ -67,11 +66,9 @@ void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) { } void BuildMedigoronMessage(uint16_t* textId, bool* loadFromMessageTable) { - CustomMessage msg = CustomMessage( - "Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", - "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", - "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w" - ); + CustomMessage msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", + "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", + "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w"); BuildMerchantMessage(msg, RC_GC_MEDIGORON); msg.AutoFormat(); msg.LoadIntoFont(); @@ -80,13 +77,11 @@ void BuildMedigoronMessage(uint16_t* textId, bool* loadFromMessageTable) { void BuildGrannyMessage(uint16_t* textId, bool* loadFromMessageTable) { if (!Flags_GetRandomizerInf(RAND_INF_MERCHANTS_GRANNYS_SHOP) && - (RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE).Is(RO_GENERIC_ON) || - INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) { - CustomMessage msg = CustomMessage( - "Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", - "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", - "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w" - ); + (RAND_GET_OPTION(RSK_SHUFFLE_ADULT_TRADE).Is(RO_GENERIC_ON) || + INV_CONTENT(ITEM_CLAIM_CHECK) == ITEM_CLAIM_CHECK)) { + CustomMessage msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", + "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", + "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w"); BuildMerchantMessage(msg, RC_KAK_GRANNYS_SHOP); msg.AutoFormat(); msg.LoadIntoFont(); @@ -98,14 +93,12 @@ void BuildCarpetGuyMessage(uint16_t* textId, bool* loadFromMessageTable) { CustomMessage msg; if (*textId == TEXT_CARPET_SALESMAN_ARMS_DEALER) { msg = CustomMessage("Finally! Now I can go back to being an %rarms dealer%w!", - /*german*/"Endlich! Schon bald kann ich wieder %rKrabbelminen-Händler%w sein!", - /*french*/"Squalala! Je vais enfin pouvoir %rprendre des vacances%w!"); + /*german*/ "Endlich! Schon bald kann ich wieder %rKrabbelminen-Händler%w sein!", + /*french*/ "Squalala! Je vais enfin pouvoir %rprendre des vacances%w!"); } else if (!Flags_GetRandomizerInf(RAND_INF_MERCHANTS_CARPET_SALESMAN)) { - msg = CustomMessage( - "Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", - "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", - "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w" - ); + msg = CustomMessage("Want to buy [[color]][[1]]%w for %y[[2]] Rupees%w?\x1B%gYes&No%w", + "Möchten Sie [[color]][[1]]%w für %y[[2]] Rubin%w kaufen?\x1B%gJa&Nein%w", + "Voulez-vous acheter [[color]][[1]]%w pour %y[[2]] Rubis%w?\x1B%gOui&Non%w"); BuildMerchantMessage(msg, RC_WASTELAND_BOMBCHU_SALESMAN); } msg.AutoFormat(); @@ -128,13 +121,24 @@ void BuildScrubMessage(uint16_t* textId, bool* loadFromMessageTable) { uint16_t price = RAND_GET_ITEM(rc)->GetPrice(); CustomMessage msg; if (price == 0) { - msg = CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will give you a [[color]][[1]]%w!&Please, take it!\x07\x10\xA3", - "\x12\x38\x82" "In Ordnung! Du gewinnst! Im Austausch dafür, dass Du mich verschont hast, werde ich Dir einen [[color]][[1]]%w geben!\x07\x10\xA3", - "\x12\x38\x82" "J'me rends! Laisse-moi partir et en échange, je te donne un [[color]][[1]]%w! Vas-y prends le!\x07\x10\xA3"); + msg = CustomMessage("\x12\x38\x82" + "All right! You win! In return for sparing me, I will give you a [[color]][[1]]%w!&Please, " + "take it!\x07\x10\xA3", + "\x12\x38\x82" + "In Ordnung! Du gewinnst! Im Austausch dafür, dass Du mich verschont hast, werde ich Dir " + "einen [[color]][[1]]%w geben!\x07\x10\xA3", + "\x12\x38\x82" + "J'me rends! Laisse-moi partir et en échange, je te donne un [[color]][[1]]%w! Vas-y " + "prends le!\x07\x10\xA3"); } else { - msg = CustomMessage("\x12\x38\x82" "All right! You win! In return for sparing me, I will sell you a [[color]][[1]]%w! %y[[2]] Rupees%w it is!\x07\x10\xA3", - "\x12\x38\x82" "Ich gebe auf! Ich verkaufe Dir einen [[color]][[1]]%w für %y[[2]] Rubine%w!\x07\x10\xA3", - "\x12\x38\x82" "J'abandonne! Tu veux bien m'acheter un [[color]][[1]]%w? Ça fera %y[[2]] Rubis%w!\x07\x10\xA3"); + msg = CustomMessage( + "\x12\x38\x82" + "All right! You win! In return for sparing me, I will sell you a [[color]][[1]]%w! %y[[2]] Rupees%w it " + "is!\x07\x10\xA3", + "\x12\x38\x82" + "Ich gebe auf! Ich verkaufe Dir einen [[color]][[1]]%w für %y[[2]] Rubine%w!\x07\x10\xA3", + "\x12\x38\x82" + "J'abandonne! Tu veux bien m'acheter un [[color]][[1]]%w? Ça fera %y[[2]] Rubis%w!\x07\x10\xA3"); } BuildMerchantMessage(msg, rc); msg.AutoFormat(); @@ -149,15 +153,18 @@ void BuildShopMessage(uint16_t* textId, bool* loadFromMessageTable) { // textId: TEXT_SHOP_ITEM_RANDOM + (randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) // textId: TEXT_SHOP_ITEM_RANDOM + ((randomizerInf - RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1) + NUM_SHOP_ITEMS) if (*textId >= TEXT_SHOP_ITEM_RANDOM && *textId < TEXT_SHOP_ITEM_RANDOM_CONFIRM) { - rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(static_cast((*textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)); - msg = CustomMessage("\x08[[color]][[1]]%w %y[[2]]_Rupees%w&Special deal! %rONE LEFT%w!\x0A\x02", - "\x08[[color]][[1]]%w %y[[2]]_Rubine%w&Sonderangebot! %rNUR NOCH EINES VERFÜGBAR%w!\x0A\x02", - "\x08[[color]][[1]]%w %y[[2]]_Rubis%w&Offre spéciale! %rDERNIER EN STOCK%w!\x0A\x02"); + rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf( + static_cast((*textId - TEXT_SHOP_ITEM_RANDOM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)); + msg = + CustomMessage("\x08[[color]][[1]]%w %y[[2]]_Rupees%w&Special deal! %rONE LEFT%w!\x0A\x02", + "\x08[[color]][[1]]%w %y[[2]]_Rubine%w&Sonderangebot! %rNUR NOCH EINES VERFÜGBAR%w!\x0A\x02", + "\x08[[color]][[1]]%w %y[[2]]_Rubis%w&Offre spéciale! %rDERNIER EN STOCK%w!\x0A\x02"); } else if (*textId >= TEXT_SHOP_ITEM_RANDOM_CONFIRM && *textId <= TEXT_SHOP_ITEM_RANDOM_CONFIRM_END) { - rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf(static_cast((*textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)); + rc = OTRGlobals::Instance->gRandomizer->GetCheckFromRandomizerInf( + static_cast((*textId - TEXT_SHOP_ITEM_RANDOM_CONFIRM) + RAND_INF_SHOP_ITEMS_KF_SHOP_ITEM_1)); msg = CustomMessage("\x08[[color]][[1]]%w %y[[2]]_Rupees%w\x09\x1B%gBuy&Don't buy%w\x09\x02", - "\x08[[color]][[1]]%w %y[[2]]_Rubine%w\x09\x1B%gKaufen&Nicht kaufen%w\x09\x02", - "\x08[[color]][[1]]%w %y[[2]]_Rubis%w\x09\x1B%gAcheter&Ne pas acheter%w\x09\x02"); + "\x08[[color]][[1]]%w %y[[2]]_Rubine%w\x09\x1B%gKaufen&Nicht kaufen%w\x09\x02", + "\x08[[color]][[1]]%w %y[[2]]_Rubis%w\x09\x1B%gAcheter&Ne pas acheter%w\x09\x02"); } else { return; } diff --git a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp index 9670bc03f..70dc08ad1 100644 --- a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp +++ b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp @@ -132,10 +132,14 @@ void BuildSkulltulaPeopleMessage(uint16_t* textId, bool* loadFromMessageTable) { return; } Rando::Item& item = Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(rc)->GetPlacedRandomizerGet()); - CustomMessage msg = CustomMessage( - "Yeaaarrgh! I'm cursed!!^Please save me by destroying %y[[d]] Spiders of the Curse%w and I will give you my [[color]][[1]]%w!", - /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y[[d]] Skulltulas%w zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!", - /*french*/ "Yeaaarrgh! Je suis maudit!^Détruit encore %y[[d]] Araignées de la Malédiction%w et j'aurai quelque chose à te donner! [[color]]([[1]])%w"); + CustomMessage msg = CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying %y[[d]] Spiders of the " + "Curse%w and I will give you my [[color]][[1]]%w!", + /*german*/ + "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y[[d]] Skulltulas%w " + "zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!", + /*french*/ + "Yeaaarrgh! Je suis maudit!^Détruit encore %y[[d]] Araignées de la Malédiction%w " + "et j'aurai quelque chose à te donner! [[color]]([[1]])%w"); msg.InsertNumber(count); msg.Replace("[[color]]", item.GetColor()); msg.InsertNames({ item.GetName() }); @@ -145,12 +149,20 @@ void BuildSkulltulaPeopleMessage(uint16_t* textId, bool* loadFromMessageTable) { } void Build100SkullsHintMessage(uint16_t* textId, bool* loadFromMessageTable) { - CustomMessage msg = CustomMessage( - "Yeaaarrgh! I'm cursed!!^Please save me by destroying %y100 Spiders of the Curse%w and I will give you my [[color]][[1]]%w!", - /*german*/ "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y100 Skulltulas%w zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!", - /*french*/ "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"); - msg.Replace("[[color]]", Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet()).GetColor()); - msg.InsertNames({ Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet()).GetName() }); + CustomMessage msg = CustomMessage("Yeaaarrgh! I'm cursed!!^Please save me by destroying %y100 Spiders of the " + "Curse%w and I will give you my [[color]][[1]]%w!", + /*german*/ + "Yeaaarrgh! Ich bin verflucht!^Bitte rette mich, indem Du %y100 Skulltulas%w " + "zerstörst und ich werde Dir dafür [[color]][[1]]%w geben!", + /*french*/ + "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"); + msg.Replace("[[color]]", Rando::StaticData::RetrieveItem( + RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet()) + .GetColor()); + msg.InsertNames( + { Rando::StaticData::RetrieveItem(RAND_GET_ITEM_LOC(RC_KAK_100_GOLD_SKULLTULA_REWARD)->GetPlacedRandomizerGet()) + .GetName() }); msg.AutoFormat(); msg.LoadIntoFont(); *loadFromMessageTable = false; diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp index 7e0db1dde..0b6f08991 100644 --- a/soh/soh/Enhancements/randomizer/item.cpp +++ b/soh/soh/Enhancements/randomizer/item.cpp @@ -16,13 +16,13 @@ Item::Item() progressive(false), price(0) { } Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_, - const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_, - const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_, - const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_, - Text article_, const std::string color_, const bool progressive_, const uint16_t price_) + const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, const uint16_t itemId_, + const uint16_t objectId_, const uint16_t gid_, const uint16_t textId_, const uint16_t field_, + const int16_t chestAnimation_, const GetItemCategory category_, const uint16_t modIndex_, Text article_, + const std::string color_, const bool progressive_, const uint16_t price_) : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), - advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)), - color(std::move(color_)), progressive(progressive_), price(price_) { + advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)), + color(std::move(color_)), progressive(progressive_), price(price_) { if (modIndex_ == MOD_RANDOMIZER || getItemId > 0x7D) { giEntry = std::make_shared(GetItemEntry{ itemId_, field_, static_cast((chestAnimation_ != CHEST_ANIM_SHORT ? 1 : -1) * (gid_ + 1)), textId_, @@ -37,11 +37,11 @@ Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, } Item::Item(const RandomizerGet randomizerGet_, Text name_, const ItemType type_, const int16_t getItemId_, - const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, Text article_, - const std::string color_, const bool progressive_, const uint16_t price_) + const bool advancement_, LogicVal logicVal_, const RandomizerHintTextKey hintKey_, Text article_, + const std::string color_, const bool progressive_, const uint16_t price_) : randomizerGet(randomizerGet_), name(std::move(name_)), type(type_), getItemId(getItemId_), - advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)), - color(std::move(color_)), progressive(progressive_), price(price_) { + advancement(advancement_), logicVal(logicVal_), hintKey(hintKey_), article(std::move(article_)), + color(std::move(color_)), progressive(progressive_), price(price_) { } Item::~Item() = default; diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h index 39e558c40..71f67293d 100644 --- a/soh/soh/Enhancements/randomizer/item.h +++ b/soh/soh/Enhancements/randomizer/item.h @@ -31,12 +31,12 @@ class Item { public: Item(); Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_, - LogicVal logicVal_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_, - uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_, - Text article_ = {}, std::string color_ = "%g", bool progressive_ = false, uint16_t price_ = 0); + LogicVal logicVal_, RandomizerHintTextKey hintKey_, uint16_t itemId_, uint16_t objectId_, uint16_t gid_, + uint16_t textId_, uint16_t field_, int16_t chestAnimation_, GetItemCategory category_, uint16_t modIndex_, + Text article_ = {}, std::string color_ = "%g", bool progressive_ = false, uint16_t price_ = 0); Item(RandomizerGet randomizerGet_, Text name_, ItemType type_, int16_t getItemId_, bool advancement_, - LogicVal logicVal_, RandomizerHintTextKey hintKey_, Text article_ = {}, std::string color_ = "%g", - bool progressive_ = false, uint16_t price_ = 0); + LogicVal logicVal_, RandomizerHintTextKey hintKey_, Text article_ = {}, std::string color_ = "%g", + bool progressive_ = false, uint16_t price_ = 0); ~Item(); void ApplyEffect() const;