github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang format

Browse source
This commit is contained in:
Schicksal88 2025-06-19 08:06:24 +02:00
commit 6c7be12898
6 changed files with 550 additions and 353 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/custom-message/CustomMessageManager.h
View file

@ -154,10 +154,10 @@ class CustomMessage {
void InsertNumber(uint8_t num); void InsertNumber(uint8_t num);
/** /**
* @brief A € sign at the end of an item name signals that it is plural. * @brief A € sign at the end of an item name signals that it is plural.
* If a hint text has |singular|plural| forms specified, the unused one get's deleted. * If a hint text has |singular|plural| forms specified, the unused one get's deleted.
* If no € sign is present, the singular form is used. * If no € sign is present, the singular form is used.
*/ */
void SetSingularPlural(); void SetSingularPlural();
/** /**

2
soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
View file

@ -150,7 +150,7 @@ void StaticData::HintTable_Init() {
// /*spanish*/la #máscara de la verdad# premia #[[1]]#. // /*spanish*/la #máscara de la verdad# premia #[[1]]#.
{}, {},
{CustomMessage("They say that showing a #truthful eye to the crowd# rewards #[[1]]#.", {CustomMessage("They say that showing a #truthful eye to the crowd# rewards #[[1]]#.",
/*german*/ "Man erzählt sich, daß der #Menge ein wahrhaftigen Auge# zu zeigen #[[1]]# einbrächte.", /*german*/ "Man erzählt sich, daß der #Menge ein wahrhaftiges Auge# zu zeigen #[[1]]# einbrächte.",
/*french*/ "Selon moi, montrer #l'oeil de vérité à la foule# donne #[[1]]#.", {QM_RED, QM_GREEN})}); /*french*/ "Selon moi, montrer #l'oeil de vérité à la foule# donne #[[1]]#.", {QM_RED, QM_GREEN})});
// /*spanish*/#mostrarle el ojo verdadero# a una multitud brinda #[[1]]#. // /*spanish*/#mostrarle el ojo verdadero# a una multitud brinda #[[1]]#.

708
soh/soh/Enhancements/randomizer/3drando/shops.cpp
View file

File diff suppressed because it is too large Load diff

10
soh/soh/Enhancements/randomizer/3drando/text.hpp
View file

@ -62,13 +62,19 @@ class Text {
Text operator+(const Text& right) const { Text operator+(const Text& right) const {
return Text{ return Text{
english + right.GetEnglish(), french + right.GetFrench(), german + right.GetGerman(), spanish + right.GetSpanish(), english + right.GetEnglish(),
french + right.GetFrench(),
german + right.GetGerman(),
spanish + right.GetSpanish(),
}; };
} }
Text operator+(const std::string& right) const { Text operator+(const std::string& right) const {
return Text{ return Text{
english + right, french + right, german + right, spanish + right, english + right,
french + right,
german + right,
spanish + right,
}; };
} }

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

@ -364,7 +364,6 @@ const CustomMessage Hint::GetHintMessage(MessageFormat format, size_t id) const
hintText.InsertNumber(num); hintText.InsertNumber(num);
} }
if (format == MF_FORMATTED) { if (format == MF_FORMATTED) {
hintText.Format(); hintText.Format();
} else if (format == MF_AUTO_FORMAT) { } else if (format == MF_AUTO_FORMAT) {

170
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -257,20 +257,128 @@ static const char* englishRupeeNames[188] = {
"Zorkmids", "Zorkmids",
}; };
static const char* germanRupeeNames[114] = { static const char* germanRupeeNames[114] = { "Baht",
"Baht", "Baklava", "Bananen", "Bitcoin", "Bonbons", "Bonschen", "Brause UFOs", "Bucks", "Burek", "Cent", "Baklava",
"Chickenwing", "Diamanten", "Dinar", "Diridari", "Dogecoin", "Dollar", "Draken", "ECU", "Eis", "Elexit", "Bananen",
"Erz", "Erzbrocken", "Ethereum", "Euro", "EXP", "Fartcoin", "Forint", "Franken", "Freunde", "Geister", "Bitcoin",
"Gil", "Gold", "Groschen", "Gulden", "Haribo", "Heller", "Juwelen", "Kapseln", "Karolin", "Kartoffeln", "Bonbons",
"Keks", "Kies", "Knete", "Knochen", "Knuspertaler", "Kohle", "Kraniche", "Kreuzer", "Kronen", "Kronkorken", "Bonschen",
"Lauchcoins", "Lira", "Mana", "Mark", "Monde", "Moos", "Naira", "Nugget", "Penunze", "Pesa", "Brause UFOs",
"Peso", "Pfandflaschen", "Pfennig", "Pfund", "Pillen", "Pilze", "Plastiks", "Pok\x96""dollar", "Poster", "Puzzle", "Bucks",
"Radieschen", "Rand", "Rappen", "Real", "Rial", "Riesennugget", "Riyal", "Rubine", "Rupien", "Saphire", "Burek",
"Schilling", "Schokobon", "Seelen", "Septime", "Shitcoin", "Smaragde", "Solana", "Sosis", "Steine", "Sterne", "Cent",
"Sternis", "Tael", "Taler", "Tokens", "Wagenchips", "Won", "Wumpas", "Yen", "Yuan", "Zenny", "Chickenwing",
"M\x93use", "M\x9Enzen", "Kr\x9Bten", "D\x9Bner", "W\x9Erstchen", "Kn\x9B" "del", "R\x9Bsti", "H\x9Brnli", "R\x9E""ebli", "K\x9B""fte", "Diamanten",
"Bratw\x9E""rste", "Br\x98""tchen", "Gummib\x93""ren", "Moorh\x9E""hner" "Dinar",
}; "Diridari",
"Dogecoin",
"Dollar",
"Draken",
"ECU",
"Eis",
"Elexit",
"Erz",
"Erzbrocken",
"Ethereum",
"Euro",
"EXP",
"Fartcoin",
"Forint",
"Franken",
"Freunde",
"Geister",
"Gil",
"Gold",
"Groschen",
"Gulden",
"Haribo",
"Heller",
"Juwelen",
"Kapseln",
"Karolin",
"Kartoffeln",
"Keks",
"Kies",
"Knete",
"Knochen",
"Knuspertaler",
"Kohle",
"Kraniche",
"Kreuzer",
"Kronen",
"Kronkorken",
"Lauchcoins",
"Lira",
"Mana",
"Mark",
"Monde",
"Moos",
"Naira",
"Nugget",
"Penunze",
"Pesa",
"Peso",
"Pfandflaschen",
"Pfennig",
"Pfund",
"Pillen",
"Pilze",
"Plastiks",
"Pok\x96"
"dollar",
"Poster",
"Puzzle",
"Radieschen",
"Rand",
"Rappen",
"Real",
"Rial",
"Riesennugget",
"Riyal",
"Rubine",
"Rupien",
"Saphire",
"Schilling",
"Schokobon",
"Seelen",
"Septime",
"Shitcoin",
"Smaragde",
"Solana",
"Sosis",
"Steine",
"Sterne",
"Sternis",
"Tael",
"Taler",
"Tokens",
"Wagenchips",
"Won",
"Wumpas",
"Yen",
"Yuan",
"Zenny",
"M\x93use",
"M\x9Enzen",
"Kr\x9Bten",
"D\x9Bner",
"W\x9Erstchen",
"Kn\x9B"
"del",
"R\x9Bsti",
"H\x9Brnli",
"R\x9E"
"ebli",
"K\x9B"
"fte",
"Bratw\x9E"
"rste",
"Br\x98"
"tchen",
"Gummib\x93"
"ren",
"Moorh\x9E"
"hner" };
static const char* frenchRupeeNames[39] = { static const char* frenchRupeeNames[39] = {
"Anneaux", "Baguettes", "Balles", "Bananes", "Bitcoin", "Blés", "Bling", "Capsules", "Anneaux", "Baguettes", "Balles", "Bananes", "Bitcoin", "Blés", "Bling", "Capsules",
@ -505,10 +613,10 @@ void Randomizer::LoadMerchantMessages() {
// prompted buy/don't buy // prompted buy/don't buy
CustomMessageManager::Instance->CreateMessage( CustomMessageManager::Instance->CreateMessage(
Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM, Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM,
CustomMessage("\x08#[[1]]# #[[2]]_Rupees#&Special deal! #ONE LEFT#!&Get it while it lasts!\x0A\x02", CustomMessage(
"\x08#[[1]]# #[[2]]_Rubine#&#NUR EIN EXEMPLAR AUF LAGER!#&Schlag zu solange Du noch kannst!\x0A\x02", "\x08#[[1]]# #[[2]]_Rupees#&Special deal! #ONE LEFT#!&Get it while it lasts!\x0A\x02",
"\x08#[[1]]# #[[2]]_Rubis#&#DERNIER EN STOCK#!&Faites vite!\x0A\x02", "\x08#[[1]]# #[[2]]_Rubine#&#NUR EIN EXEMPLAR AUF LAGER!#&Schlag zu solange Du noch kannst!\x0A\x02",
{ QM_GREEN, QM_YELLOW, QM_RED })); "\x08#[[1]]# #[[2]]_Rubis#&#DERNIER EN STOCK#!&Faites vite!\x0A\x02", { QM_GREEN, QM_YELLOW, QM_RED }));
CustomMessageManager::Instance->CreateMessage( CustomMessageManager::Instance->CreateMessage(
Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM, Randomizer::merchantMessageTableID, TEXT_SHOP_ITEM_RANDOM_CONFIRM,
@ -523,7 +631,8 @@ void Randomizer::LoadMerchantMessages() {
"I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth " "I tried to be a #magic bean# salesman, but it turns out my marketing skills weren't worth "
"beans!^Anyway, want to buy #[[1]]# for #[[2]] Rupees#?\x1B#Yes&No#", "beans!^Anyway, want to buy #[[1]]# for #[[2]] Rupees#?\x1B#Yes&No#",
/*german*/ /*german*/
"Ich habe versucht ein Vertreter für #Wundererbsen# zu werden, doch meine Verhandlungskünste waren nicht die Bohne wert. Ach egal...^" "Ich habe versucht ein Vertreter für #Wundererbsen# zu werden, doch meine Verhandlungskünste waren nicht "
"die Bohne wert. Ach egal...^"
"Willst Du #[[1]]#?&Deine letzte Chance!^Mein Spezial-Preis!&#[[2]] Rubine#! Greif zu!\x1B#Ja!&Nein!#", "Willst Du #[[1]]#?&Deine letzte Chance!^Mein Spezial-Preis!&#[[2]] Rubine#! Greif zu!\x1B#Ja!&Nein!#",
/*french*/ /*french*/
"J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça " "J'ai essayé d'être un vendeur de #haricots magiques#, mais j'étais mauvais au niveau du marketing et ça "
@ -4384,7 +4493,8 @@ CustomMessage Randomizer::GetSheikMessage(s16 scene, u16 originalTextId) {
messageEntry = CustomMessage( messageEntry = CustomMessage(
"You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still " "You may have what you need to defeat %rthe Evil King%w, but the %cbarrier%w still "
"stands.^Complete the remaining %gtrials%w to destroy it.", "stands.^Complete the remaining %gtrials%w to destroy it.",
"Du magst haben, was Du brauchst um %rden Großmeister des Bösen%w zu besiegen, doch die %cBarriere%w " "Du magst haben, was Du brauchst um %rden Großmeister des Bösen%w zu besiegen, doch die "
"%cBarriere%w "
"steht noch.^Breche die verbleibenden %gSiegel%w um sie zu zerstören.", "steht noch.^Breche die verbleibenden %gSiegel%w um sie zu zerstören.",
"@, tu as peut-être ce qu'il te faut pour vaincre %rle Malin%w, mais les barrières sont toujours " "@, tu as peut-être ce qu'il te faut pour vaincre %rle Malin%w, mais les barrières sont toujours "
"actives.^Termine les épreuves restantes pour les détruire."); "actives.^Termine les épreuves restantes pour les détruire.");
@ -4403,7 +4513,8 @@ CustomMessage Randomizer::GetFishingPondOwnerMessage(u16 originalTextId) {
auto ctx = Rando::Context::GetInstance(); auto ctx = Rando::Context::GetInstance();
CustomMessage messageEntry = CustomMessage( CustomMessage messageEntry = CustomMessage(
"Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!", "Sorry, but the pond is closed.&I've lost my good %rfishing pole%w...&Can't go fishing without it!",
"Entschuldigung, aber der Teich hat&geschloßen. Ich habe meine gute &%rAngelrute%w verloren.&Ohne kann ich nicht fischen!^", "Entschuldigung, aber der Teich hat&geschloßen. Ich habe meine gute &%rAngelrute%w verloren.&Ohne kann ich "
"nicht fischen!^",
"Désolé, mais l'étang est fermé.&J'ai perdu ma bonne %rCanne à Pêche%w...&Impossible de pêcher sans elle!"); "Désolé, mais l'étang est fermé.&J'ai perdu ma bonne %rCanne à Pêche%w...&Impossible de pêcher sans elle!");
if (GetRandoSettingValue(RSK_FISHING_POLE_HINT)) { if (GetRandoSettingValue(RSK_FISHING_POLE_HINT)) {
@ -5359,8 +5470,7 @@ void Randomizer::CreateCustomMessages() {
"Du erhältst den %rSchlüssel%w&zu %gImpas Haus%w!", "Du erhältst den %rSchlüssel%w&zu %gImpas Haus%w!",
"Vous obtenez la %rClé %wde la %gMaison&d'Impa%w!"), "Vous obtenez la %rClé %wde la %gMaison&d'Impa%w!"),
GIMESSAGE(RG_WINDMILL_KEY, ITEM_KEY_SMALL, "You found the key to the&%gWindmill%w!", GIMESSAGE(RG_WINDMILL_KEY, ITEM_KEY_SMALL, "You found the key to the&%gWindmill%w!",
"Du erhältst den %rSchlüssel%w&zur %gWindmühle%w!", "Du erhältst den %rSchlüssel%w&zur %gWindmühle%w!", "Vous obtenez la %rClé %w du %gMoulin%w!"),
"Vous obtenez la %rClé %w du %gMoulin%w!"),
GIMESSAGE(RG_KAK_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL, GIMESSAGE(RG_KAK_SHOOTING_GALLERY_KEY, ITEM_KEY_SMALL,
"You found the key to the&%gKakariko Shooting Gallery%w!", "You found the key to the&%gKakariko Shooting Gallery%w!",
"Du erhältst den %rSchlüssel%w&zur %gSchießbude von Kakariko%w!", "Du erhältst den %rSchlüssel%w&zur %gSchießbude von Kakariko%w!",
@ -5372,17 +5482,14 @@ void Randomizer::CreateCustomMessages() {
"Du erhältst den %rSchlüssel%w&zu %gTalons Haus%w!", "Du erhältst den %rSchlüssel%w&zu %gTalons Haus%w!",
"Vous obtenez la %rClé %wde la %gMaison&de Talon%w!"), "Vous obtenez la %rClé %wde la %gMaison&de Talon%w!"),
GIMESSAGE(RG_STABLES_KEY, ITEM_KEY_SMALL, "You found the key to the&%gStables%w!", GIMESSAGE(RG_STABLES_KEY, ITEM_KEY_SMALL, "You found the key to the&%gStables%w!",
"Du erhältst den %rSchlüssel%w&zu den %gStällen%w!", "Du erhältst den %rSchlüssel%w&zu den %gStällen%w!", "Vous obtenez la %rClé %wdes %gÉcuries%w!"),
"Vous obtenez la %rClé %wdes %gÉcuries%w!"),
GIMESSAGE(RG_BACK_TOWER_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBack Tower%w!", GIMESSAGE(RG_BACK_TOWER_KEY, ITEM_KEY_SMALL, "You found the key to the&%gBack Tower%w!",
"Du erhältst den %rSchlüssel%w&zum %gLon Lon-Turm%w!", "Du erhältst den %rSchlüssel%w&zum %gLon Lon-Turm%w!", "Vous obtenez la %rClé %wdu %gSilo%w!"),
"Vous obtenez la %rClé %wdu %gSilo%w!"),
GIMESSAGE(RG_HYLIA_LAB_KEY, ITEM_KEY_SMALL, "You found the key to the&%gHylia Laboratory%w!", GIMESSAGE(RG_HYLIA_LAB_KEY, ITEM_KEY_SMALL, "You found the key to the&%gHylia Laboratory%w!",
"Du erhältst den %rSchlüssel%w&zum %gHylia-Labor%w!", "Du erhältst den %rSchlüssel%w&zum %gHylia-Labor%w!",
"Vous obtenez la %rClé %wdu %gLaboratoire&du Lac Hylia%w!"), "Vous obtenez la %rClé %wdu %gLaboratoire&du Lac Hylia%w!"),
GIMESSAGE(RG_FISHING_HOLE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gPond%w!", GIMESSAGE(RG_FISHING_HOLE_KEY, ITEM_KEY_SMALL, "You found the key to the&%gPond%w!",
"Du erhältst den %rSchlüssel%w&zum %gFischweiher%w!", "Du erhältst den %rSchlüssel%w&zum %gFischweiher%w!", "Vous obtenez la %rClé %wde l'%gÉtang%w!"),
"Vous obtenez la %rClé %wde l'%gÉtang%w!"),
GIMESSAGE(RG_GERUDO_FORTRESS_KEY_RING, ITEM_KEY_SMALL, "You found a %yThieves Hideout&%wKeyring!", GIMESSAGE(RG_GERUDO_FORTRESS_KEY_RING, ITEM_KEY_SMALL, "You found a %yThieves Hideout&%wKeyring!",
"Du erhältst das %rSchlüsselbund%w&des %yDiebesverstecks%w!", "Du erhältst das %rSchlüsselbund%w&des %yDiebesverstecks%w!",
@ -5585,12 +5692,13 @@ void Randomizer::CreateCustomMessages() {
"Du hast nun %yunendlich viele%w %rDeku-Nüsse%w!", "Du hast nun %yunendlich viele%w %rDeku-Nüsse%w!",
"Vous avez maintenant des %yNoix&Mojo de manière illimitée%w!"), "Vous avez maintenant des %yNoix&Mojo de manière illimitée%w!"),
GIMESSAGE(RG_MAGIC_INF, ITEM_MAGIC_LARGE, "You now have %yinfinite%w %rMagic%w!", GIMESSAGE(RG_MAGIC_INF, ITEM_MAGIC_LARGE, "You now have %yinfinite%w %rMagic%w!",
"Du hast nun %yunendlich viel%w %rMagische Kraft%w!", "Vous avez maintenant une quantité&de %ymagie illimitée%w!"), "Du hast nun %yunendlich viel%w %rMagische Kraft%w!",
"Vous avez maintenant une quantité&de %ymagie illimitée%w!"),
GIMESSAGE(RG_BOMBCHU_INF, ITEM_BOMBCHU, "You now have %yinfinite%w %rBombchus%w!", GIMESSAGE(RG_BOMBCHU_INF, ITEM_BOMBCHU, "You now have %yinfinite%w %rBombchus%w!",
"Du hast nun %yunendlich viele%w %rKrabbelminen%w!", "Du hast nun %yunendlich viele%w %rKrabbelminen%w!",
"Vous avez maintenant des %yMissiles&Teigneux en quantité illimités%w!"), "Vous avez maintenant des %yMissiles&Teigneux en quantité illimités%w!"),
GIMESSAGE(RG_WALLET_INF, ITEM_WALLET_GIANT, "You now have %yinfinite%w %rmoney%w!", GIMESSAGE(RG_WALLET_INF, ITEM_WALLET_GIANT, "You now have %yinfinite%w %rmoney%w!",
"Du hast nun %yunendlich viele%w %rRubinew!", "Du hast nun %yunendlich viele%w %rRubine%w!",
"Vous avez maintenant des %yRubis en& quantité illimitée%w!"), "Vous avez maintenant des %yRubis en& quantité illimitée%w!"),
GIMESSAGE(RG_SKELETON_KEY, ITEM_KEY_SMALL, "You found the %rSkeleton Key%w!", GIMESSAGE(RG_SKELETON_KEY, ITEM_KEY_SMALL, "You found the %rSkeleton Key%w!",
"Du hast den %rSkelettschlüssel%w gefunden!", "Vous avez trouvé la %rClé Squelette%w!"), "Du hast den %rSkelettschlüssel%w gefunden!", "Vous avez trouvé la %rClé Squelette%w!"),