From db4a30a7ffa434d1c89be6ad0aab30309363c5f9 Mon Sep 17 00:00:00 2001 From: Ralphie Morell Date: Wed, 18 Oct 2023 23:58:14 -0400 Subject: [PATCH] don't commit at fucking 2am --- .../3drando/hint_list/hint_list_item.cpp | 187 +++++++++--------- .../randomizer/3drando/item_list.cpp | 18 +- .../Enhancements/randomizer/randomizer.cpp | 8 +- 3 files changed, 110 insertions(+), 103 deletions(-) diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp index f2b836bf5..70c701535 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp @@ -1941,104 +1941,111 @@ void HintTable_Init_Item() { hintTable[GOHMA_BOSS_SOUL] = HintText::Item({ //obscure text - Text{"a regal soul", "", ""}, - Text("some spider essence", "", ""), + Text{"an invasive soul", "", ""}, + Text{"some spider essence", "", ""}, }, { //ambiguous text - Text("something webbed", "", "") + Text{"something webbed", "", ""} }, { //clear text - Text("the soul of Gohma", "", "")} + Text{"the soul of Gohma", "", ""}} ); hintTable[KING_DODONGO_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"a royal soul", "", ""}, - Text("some reptile essence", "", ""), - }, { - //ambiguous text - Text("something spectral", "", "") - }, { - //clear text - Text("the soul of King Dodongo", "", "") - }); - hintTable[BARINADE_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"an infectuous soul", "", ""}, - Text("some parasitic essence", "", ""), - }, { - //ambiguous text - Text("something fishy", "", "") - }, { - //clear text - Text("the soul of Barinade", "", "") - }); + //obscure text + Text{"a royal soul", "", ""}, + Text{"some reptile essence", "", ""}, + }, { + //ambiguous text + Text{"something explosive", "", ""} + }, { + //clear text + Text{"the soul of King Dodongo", "", ""}} + ); + + hintTable[BARINADE_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"an infectuous soul", "", ""}, + Text{"some parasitic essence", "", ""}, + }, { + //ambiguous text + Text{"something fishy", "", ""} + }, { + //clear text + Text("the soul of Barinade", "", "")} + ); + hintTable[PHANTOM_GANON_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"a duplicate soul", "", ""}, - Text("some illusionary essence", "", ""), - }, { - //ambiguous text - Text("something spectral", "", "") - }, { - //clear text - Text("the soul of Phantom Ganon", "", "") - }); -hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"a draconic soul", "", ""}, - Text("some magmatic essence", "", ""), - }, { - //ambiguous text - Text("something hot", "", "") - }, { - //clear text - Text("the soul of Volvagia", "", "") - }); -hintTable[MORPHA_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"an aquatic soul", "", ""}, - Text("some liquid essence", "", ""), - }, { - //ambiguous text - Text("something wet", "", "") - }, { - //clear text - Text("the soul of Barinade", "", "") - }); -hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"a shadowy soul", "", ""}, - Text("some handy essence", "", ""), - }, { - //ambiguous text - Text("something dark", "", "") - }, { - //clear text - Text("the soul of Bongo Bongo", "", "") - }); -hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"old souls", "", ""}, - Text("twin essences", "", ""), - }, { - //ambiguous text - Text("something spiritual", "", "") - }, { - //clear text - Text("the soul of Twinrova", "", "") - }); -hintTable[GANON_BOSS_SOUL] = HintText::Item({ - //obscure text - Text{"an evil soul", "", ""}, - Text("some powerful essence", "", ""), - }, { - //ambiguous text - Text("something strong", "", "") - }, { - //clear text - Text("the soul of Ganon", "", "") - }); + //obscure text + Text{"a duplicate soul", "", ""}, + Text{"some illusionary essence", "", ""}, + }, { + //ambiguous text + Text{"something spectral", "", ""} + }, { + //clear text + Text{"the soul of Phantom Ganon", "", ""}} + ); + + hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"a draconic soul", "", ""}, + Text{"some magmatic essence", "", ""}, + }, { + //ambiguous text + Text{"something hot", "", ""} + }, { + //clear text + Text{"the soul of Volvagia", "", ""}} + ); + + hintTable[MORPHA_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"an aquatic soul", "", ""}, + Text{"some liquid essence", "", ""}, + }, { + //ambiguous text + Text{"something wet", "", ""} + }, { + //clear text + Text{"the soul of Barinade", "", ""}} + ); + + hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"a shadowy soul", "", ""}, + Text{"some handy essence", "", ""}, + }, { + //ambiguous text + Text{"something dark", "", ""} + }, { + //clear text + Text{"the soul of Bongo Bongo", "", ""}} + ); + + hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"old souls", "", ""}, + Text{"twin essences", "", ""}, + }, { + //ambiguous text + Text{"something spiritual", "", ""} + }, { + //clear text + Text{"the soul of Twinrova", "", ""}} + ); + + hintTable[GANON_BOSS_SOUL] = HintText::Item({ + //obscure text + Text{"an evil soul", "", ""}, + Text{"some powerful essence", "", ""}, + }, { + //ambiguous text + Text{"something strong", "", ""} + }, { + //clear text + Text{"the soul of Ganon", "", ""}} + ); hintTable[EPONA] = HintText::Item({ //obscure text diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp index 4b3cdab07..68c3f5fa7 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp @@ -247,15 +247,15 @@ void ItemTable_Init() { // RandomizerGet itemTable[HINT] = Item(RG_HINT, Text{"Hint", "Indice", "Pista"}, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE); //Boss Souls - itemTable[GOHMA_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Gohma's Soul", "Ame de Gohma", "Alma de Gohma"}, ITEMTYPE_ITEM, 0xE1, true, &CanSummonGohma, NONE); - itemTable[KING_DODONGO_BOSS_SOUL] = Item(RG_KING_DODONGO_SOUL, Text{"King Dodongo's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE2, true, &CanSummonKingDodongo, NONE); - itemTable[BARINADE_BOSS_SOUL] = Item(RG_BARINADE_SOUL, Text{"Barinade's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE3, true, &CanSummonBarinade, NONE); - itemTable[PHANTOM_GANON_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Phantom Ganon's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE4, true, &CanSummonPhantomGanon, NONE); - itemTable[VOLVAGIA_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Volvagia's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE5, true, &CanSummonVolvagia, NONE); - itemTable[MORPHA_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Morpha's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE6, true, &CanSummonMorpha, NONE); - itemTable[BONGO_BONGO_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Bongo Bongo's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE7, true, &CanSummonBongoBongo, NONE); - itemTable[TWINROVA_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Twinrova's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE8, true, &CanSummonTwinrova, NONE); - itemTable[GANON_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Ganon's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE9, true, &CanSummonGanon, NONE); + itemTable[GOHMA_BOSS_SOUL] = Item(RG_GOHMA_SOUL, Text{"Gohma's Soul", "Ame de Gohma", "Alma de Gohma"}, ITEMTYPE_ITEM, 0xE1, true, &CanSummonGohma, NONE); + itemTable[KING_DODONGO_BOSS_SOUL] = Item(RG_KING_DODONGO_SOUL, Text{"King Dodongo's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE2, true, &CanSummonKingDodongo, NONE); + itemTable[BARINADE_BOSS_SOUL] = Item(RG_BARINADE_SOUL, Text{"Barinade's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE3, true, &CanSummonBarinade, NONE); + itemTable[PHANTOM_GANON_BOSS_SOUL] = Item(RG_PHANTOM_GANON_SOUL, Text{"Phantom Ganon's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE4, true, &CanSummonPhantomGanon, NONE); + itemTable[VOLVAGIA_BOSS_SOUL] = Item(RG_VOLVAGIA_SOUL, Text{"Volvagia's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE5, true, &CanSummonVolvagia, NONE); + itemTable[MORPHA_BOSS_SOUL] = Item(RG_MORPHA_SOUL, Text{"Morpha's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE6, true, &CanSummonMorpha, NONE); + itemTable[BONGO_BONGO_BOSS_SOUL] = Item(RG_BONGO_BONGO_SOUL, Text{"Bongo Bongo's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE7, true, &CanSummonBongoBongo, NONE); + itemTable[TWINROVA_BOSS_SOUL] = Item(RG_TWINROVA_SOUL, Text{"Twinrova's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE8, true, &CanSummonTwinrova, NONE); + itemTable[GANON_BOSS_SOUL] = Item(RG_GANON_SOUL, Text{"Ganon's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE9, true, &CanSummonGanon, NONE); // itemTable[HOOKSHOT] = Item(RG_HOOKSHOT, Text{"Hookshot", "Grappin", "Gancho"}, ITEMTYPE_ITEM, 0x80, true, &ProgressiveHookshot, HOOKSHOT); // itemTable[LONGSHOT] = Item(RG_LONGSHOT, Text{"Longshot", "Super-Grappin", "Supergancho"}, ITEMTYPE_ITEM, 0x80, true, &ProgressiveHookshot, LONGSHOT); diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 5489b1c45..d8f2bc5f3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -6119,12 +6119,12 @@ void Randomizer::CreateCustomMessages() { "Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"), GIMESSAGE_UNTRANSLATED(RG_GOHMA_SOUL, ITEM_BIG_POE, "You found the soul for %gGohma%w!"), - GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing Dodongo%w!"), - GIMESSAGE_UNTRANSLATED(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarindade%w!"), - GIMESSAGE_UNTRANSLATED(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom Ganon%w!"), + GIMESSAGE_UNTRANSLATED(RG_KING_DODONGO_SOUL, ITEM_BIG_POE, "You found the soul for %rKing&Dodongo%w!"), + GIMESSAGE_UNTRANSLATED(RG_BARINADE_SOUL, ITEM_BIG_POE, "You found the soul for %bBarinade%w!"), + GIMESSAGE_UNTRANSLATED(RG_PHANTOM_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %gPhantom&Ganon%w!"), GIMESSAGE_UNTRANSLATED(RG_VOLVAGIA_SOUL, ITEM_BIG_POE, "You found the soul for %rVolvagia%w!"), GIMESSAGE_UNTRANSLATED(RG_MORPHA_SOUL, ITEM_BIG_POE, "You found the soul for %bMorpha%w!"), - GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo Bongo%w!"), + GIMESSAGE_UNTRANSLATED(RG_BONGO_BONGO_SOUL, ITEM_BIG_POE, "You found the soul for %pBongo&Bongo%w!"), GIMESSAGE_UNTRANSLATED(RG_TWINROVA_SOUL, ITEM_BIG_POE, "You found the soul for %yTwinrova%w!"), GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),