mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Code cleanup + more names

This commit is contained in:
aMannus 2022-08-18 13:55:59 +02:00
parent a2243634cd
commit e500db810b
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
View File

@ -80,8 +80,6 @@ bool CustomMessageManager::InsertCustomMessage(std::string tableID, uint16_t tex
return messageInsertResult.second;
}
bool CustomMessageManager::CreateGetItemMessage(std::string tableID, GetItemID giid, ItemID iid, CustomMessageEntry messageEntry) {
FormatCustomMessage(messageEntry.english, iid);
FormatCustomMessage(messageEntry.german, iid);

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

@ -4629,23 +4629,23 @@ void CreateRupeeMessages() {
for (u8 rupee : rupees) {
switch (rupee) {
case TEXT_BLUE_RUPEE:
rupeeText = "\x05\x03 5 %RUPEE%\x05\x00";
rupeeText = "\x05\x03 5 %RUPEE% \x05\x00";
break;
case TEXT_RED_RUPEE:
rupeeText = "\x05\x01 20 %RUPEE%\x05\x00";
rupeeText = "\x05\x01 20 %RUPEE% \x05\x00";
break;
case TEXT_PURPLE_RUPEE:
rupeeText = "\x05\x05 50 %RUPEE%\x05\x00";
rupeeText = "\x05\x05 50 %RUPEE% \x05\x00";
break;
case TEXT_HUGE_RUPEE:
rupeeText = "\x05\x06 200 %RUPEE%\x05\x00";
rupeeText = "\x05\x06 200 %RUPEE% \x05\x00";
break;
}
customMessageManager->CreateMessage(Randomizer::rupeeMessageTableID, rupee,
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM,
"You found" + rupeeText + " !",
"Du hast" + rupeeText + " gefunden!",
"Vous obtenez" + rupeeText + " !"
"You found" + rupeeText + "!",
"Du hast" + rupeeText + " gefunden!",
"Vous obtenez" + rupeeText + "!"
});
}
}

6
soh/soh/OTRGlobals.cpp
View File

@ -1448,12 +1448,11 @@ extern "C" CustomMessageEntry Randomizer_GetScrubMessage(u16 scrubTextId) {
}
extern "C" std::string Randomizer_InsertRupeeName(std::string message, int language) {
std::string replaceWith;
const char* englishRupeeNames[34] = {
const char* englishRupeeNames[40] = {
"Rupees", "Bitcoin", "Bananas", "Cornflakes", "Gummybears", "Floopies", "Dollars", "Lemmings", "Emeralds", "Bucks",
"Rubles", "Diamonds", "Moons", "Stars", "Mana", "Doll Hairs", "Dogecoin", "Mushrooms", "Experience", "Friends",
"Coins", "Rings", "Gil", "Pokédollars", "Bells", "Orbs", "Bottle Caps", "Simoleons", "Pokémon", "Toys",
"Smackaroos", "Zorkmids", "Zenny", "Bones"
"Smackaroos", "Zorkmids", "Zenny", "Bones", "Souls", "Studs", "Munny", "Rubies", "Gald", "Gold"
};
const char* germanRupeeNames[1] = {
"Rubine"
@ -1465,6 +1464,7 @@ extern "C" std::string Randomizer_InsertRupeeName(std::string message, int langu
"Munnies", "Orens", "Florens", "Crédits", "Galds", "Bling", "Orbes", "Baguettes", "Croissants"
};
int randomIndex;
std::string replaceWith;
switch (language) {
case LANGUAGE_ENG:
randomIndex = rand() % (sizeof(englishRupeeNames) / sizeof(englishRupeeNames[0]));