mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-08-13 17:03:47 -04:00
Code cleanup + more names
This commit is contained in:
parent
a2243634cd
commit
e500db810b
@ -80,8 +80,6 @@ bool CustomMessageManager::InsertCustomMessage(std::string tableID, uint16_t tex
|
|||||||
return messageInsertResult.second;
|
return messageInsertResult.second;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool CustomMessageManager::CreateGetItemMessage(std::string tableID, GetItemID giid, ItemID iid, CustomMessageEntry messageEntry) {
|
bool CustomMessageManager::CreateGetItemMessage(std::string tableID, GetItemID giid, ItemID iid, CustomMessageEntry messageEntry) {
|
||||||
FormatCustomMessage(messageEntry.english, iid);
|
FormatCustomMessage(messageEntry.english, iid);
|
||||||
FormatCustomMessage(messageEntry.german, iid);
|
FormatCustomMessage(messageEntry.german, iid);
|
||||||
|
@ -4629,23 +4629,23 @@ void CreateRupeeMessages() {
|
|||||||
for (u8 rupee : rupees) {
|
for (u8 rupee : rupees) {
|
||||||
switch (rupee) {
|
switch (rupee) {
|
||||||
case TEXT_BLUE_RUPEE:
|
case TEXT_BLUE_RUPEE:
|
||||||
rupeeText = "\x05\x03 5 %RUPEE%\x05\x00";
|
rupeeText = "\x05\x03 5 %RUPEE% \x05\x00";
|
||||||
break;
|
break;
|
||||||
case TEXT_RED_RUPEE:
|
case TEXT_RED_RUPEE:
|
||||||
rupeeText = "\x05\x01 20 %RUPEE%\x05\x00";
|
rupeeText = "\x05\x01 20 %RUPEE% \x05\x00";
|
||||||
break;
|
break;
|
||||||
case TEXT_PURPLE_RUPEE:
|
case TEXT_PURPLE_RUPEE:
|
||||||
rupeeText = "\x05\x05 50 %RUPEE%\x05\x00";
|
rupeeText = "\x05\x05 50 %RUPEE% \x05\x00";
|
||||||
break;
|
break;
|
||||||
case TEXT_HUGE_RUPEE:
|
case TEXT_HUGE_RUPEE:
|
||||||
rupeeText = "\x05\x06 200 %RUPEE%\x05\x00";
|
rupeeText = "\x05\x06 200 %RUPEE% \x05\x00";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
customMessageManager->CreateMessage(Randomizer::rupeeMessageTableID, rupee,
|
customMessageManager->CreateMessage(Randomizer::rupeeMessageTableID, rupee,
|
||||||
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM,
|
{ TEXTBOX_TYPE_BLACK, TEXTBOX_POS_BOTTOM,
|
||||||
"You found" + rupeeText + " !",
|
"You found" + rupeeText + "!",
|
||||||
"Du hast" + rupeeText + " gefunden!",
|
"Du hast" + rupeeText + " gefunden!",
|
||||||
"Vous obtenez" + rupeeText + " !"
|
"Vous obtenez" + rupeeText + "!"
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1448,12 +1448,11 @@ extern "C" CustomMessageEntry Randomizer_GetScrubMessage(u16 scrubTextId) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
extern "C" std::string Randomizer_InsertRupeeName(std::string message, int language) {
|
extern "C" std::string Randomizer_InsertRupeeName(std::string message, int language) {
|
||||||
std::string replaceWith;
|
const char* englishRupeeNames[40] = {
|
||||||
const char* englishRupeeNames[34] = {
|
|
||||||
"Rupees", "Bitcoin", "Bananas", "Cornflakes", "Gummybears", "Floopies", "Dollars", "Lemmings", "Emeralds", "Bucks",
|
"Rupees", "Bitcoin", "Bananas", "Cornflakes", "Gummybears", "Floopies", "Dollars", "Lemmings", "Emeralds", "Bucks",
|
||||||
"Rubles", "Diamonds", "Moons", "Stars", "Mana", "Doll Hairs", "Dogecoin", "Mushrooms", "Experience", "Friends",
|
"Rubles", "Diamonds", "Moons", "Stars", "Mana", "Doll Hairs", "Dogecoin", "Mushrooms", "Experience", "Friends",
|
||||||
"Coins", "Rings", "Gil", "Pokédollars", "Bells", "Orbs", "Bottle Caps", "Simoleons", "Pokémon", "Toys",
|
"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] = {
|
const char* germanRupeeNames[1] = {
|
||||||
"Rubine"
|
"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"
|
"Munnies", "Orens", "Florens", "Crédits", "Galds", "Bling", "Orbes", "Baguettes", "Croissants"
|
||||||
};
|
};
|
||||||
int randomIndex;
|
int randomIndex;
|
||||||
|
std::string replaceWith;
|
||||||
switch (language) {
|
switch (language) {
|
||||||
case LANGUAGE_ENG:
|
case LANGUAGE_ENG:
|
||||||
randomIndex = rand() % (sizeof(englishRupeeNames) / sizeof(englishRupeeNames[0]));
|
randomIndex = rand() % (sizeof(englishRupeeNames) / sizeof(englishRupeeNames[0]));
|
||||||
|
Loading…
Reference in New Issue
Block a user