mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-30 05:12:18 -05:00
Code Issues Projects Releases Wiki Activity

don't commit at fucking 2am

Browse Source
This commit is contained in:
Ralphie Morell 2023-10-18 23:58:14 -04:00
parent 51e965cf7e
commit db4a30a7ff
3 changed files with 110 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
View File

@ -1941,104 +1941,111 @@ void HintTable_Init_Item() {
hintTable[GOHMA_BOSS_SOUL] = HintText::Item({ hintTable[GOHMA_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"a regal soul", "", ""}, Text{"an invasive soul", "", ""},
Text("some spider essence", "", ""), Text{"some spider essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something webbed", "", "") Text{"something webbed", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Gohma", "", "")} Text{"the soul of Gohma", "", ""}}
); );
hintTable[KING_DODONGO_BOSS_SOUL] = HintText::Item({ hintTable[KING_DODONGO_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"a royal soul", "", ""}, Text{"a royal soul", "", ""},
Text("some reptile essence", "", ""), Text{"some reptile essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something spectral", "", "") Text{"something explosive", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of King Dodongo", "", "") Text{"the soul of King Dodongo", "", ""}}
}); );
hintTable[BARINADE_BOSS_SOUL] = HintText::Item({ hintTable[BARINADE_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"an infectuous soul", "", ""}, Text{"an infectuous soul", "", ""},
Text("some parasitic essence", "", ""), Text{"some parasitic essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something fishy", "", "") Text{"something fishy", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Barinade", "", "") Text("the soul of Barinade", "", "")}
}); );
hintTable[PHANTOM_GANON_BOSS_SOUL] = HintText::Item({ hintTable[PHANTOM_GANON_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"a duplicate soul", "", ""}, Text{"a duplicate soul", "", ""},
Text("some illusionary essence", "", ""), Text{"some illusionary essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something spectral", "", "") Text{"something spectral", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Phantom Ganon", "", "") Text{"the soul of Phantom Ganon", "", ""}}
}); );
hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({ hintTable[VOLVAGIA_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"a draconic soul", "", ""}, Text{"a draconic soul", "", ""},
Text("some magmatic essence", "", ""), Text{"some magmatic essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something hot", "", "") Text{"something hot", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Volvagia", "", "") Text{"the soul of Volvagia", "", ""}}
}); );
hintTable[MORPHA_BOSS_SOUL] = HintText::Item({ hintTable[MORPHA_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"an aquatic soul", "", ""}, Text{"an aquatic soul", "", ""},
Text("some liquid essence", "", ""), Text{"some liquid essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something wet", "", "") Text{"something wet", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Barinade", "", "") Text{"the soul of Barinade", "", ""}}
}); );
hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({ hintTable[BONGO_BONGO_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"a shadowy soul", "", ""}, Text{"a shadowy soul", "", ""},
Text("some handy essence", "", ""), Text{"some handy essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something dark", "", "") Text{"something dark", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Bongo Bongo", "", "") Text{"the soul of Bongo Bongo", "", ""}}
}); );
hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({ hintTable[TWINROVA_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"old souls", "", ""}, Text{"old souls", "", ""},
Text("twin essences", "", ""), Text{"twin essences", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something spiritual", "", "") Text{"something spiritual", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Twinrova", "", "") Text{"the soul of Twinrova", "", ""}}
}); );
hintTable[GANON_BOSS_SOUL] = HintText::Item({ hintTable[GANON_BOSS_SOUL] = HintText::Item({
//obscure text //obscure text
Text{"an evil soul", "", ""}, Text{"an evil soul", "", ""},
Text("some powerful essence", "", ""), Text{"some powerful essence", "", ""},
}, { }, {
//ambiguous text //ambiguous text
Text("something strong", "", "") Text{"something strong", "", ""}
}, { }, {
//clear text //clear text
Text("the soul of Ganon", "", "") Text{"the soul of Ganon", "", ""}}
}); );
hintTable[EPONA] = HintText::Item({ hintTable[EPONA] = HintText::Item({
//obscure text //obscure text

12
soh/soh/Enhancements/randomizer/3drando/item_list.cpp
View File

@ -250,12 +250,12 @@ void ItemTable_Init() { // RandomizerGet
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[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[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[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[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_GOHMA_SOUL, Text{"Volvagia's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE5, true, &CanSummonVolvagia, 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_GOHMA_SOUL, Text{"Morpha's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE6, true, &CanSummonMorpha, 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_GOHMA_SOUL, Text{"Bongo Bongo's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE7, true, &CanSummonBongoBongo, 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_GOHMA_SOUL, Text{"Twinrova's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE8, true, &CanSummonTwinrova, 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_GOHMA_SOUL, Text{"Ganon's Soul", "Ame de ", "Alma de "}, ITEMTYPE_ITEM, 0xE9, true, &CanSummonGanon, 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[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); // itemTable[LONGSHOT] = Item(RG_LONGSHOT, Text{"Longshot", "Super-Grappin", "Supergancho"}, ITEMTYPE_ITEM, 0x80, true, &ProgressiveHookshot, LONGSHOT);

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

@ -6119,12 +6119,12 @@ void Randomizer::CreateCustomMessages() {
"Vous obtenez la %rBourse de Magnat%w!&Elle peut contenir jusqu'à %y999 rubis%w!&C'est gigantesque!"), "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_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_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_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_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_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_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_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!"), GIMESSAGE_UNTRANSLATED(RG_GANON_SOUL, ITEM_BIG_POE, "You found the soul for %cGanon%w!"),