mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 09:52:20 -05:00
Code Issues Projects Releases Wiki Activity

Refactors custom message code to its own file

Browse Source
This commit is contained in:
Christopher Leggett 2022-07-13 23:35:45 -04:00
parent 14a87f83b3
commit d9277530a2
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
3 changed files with 58 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
soh/soh/Enhancements/randomizer/custom_messages.cpp Normal file
View File

@ -0,0 +1,39 @@
#include "custom_messages.h"
#include <variables.h>
using namespace std::literals::string_literals;
std::string Randomizer::GetCustomGetItemMessage(GetItemID giid) {
if (!gSaveContext.n64ddFlag) {
return "Not Randomized.";
}
switch (giid) {
default:
switch (gSaveContext.language) {
case LANGUAGE_FRA:
return "Il n'y a pas de message personnalisé pour cet élément.";
case LANGUAGE_GER:
return "Für diesen Artikel gibt es keine benutzerdefinierte Nachricht.";
case LANGUAGE_ENG:
default:
return "There is no custom message for this item.";
}
}
}
std::string MESSAGE_END() {
return "\x02"s;
}
std::string ITEM_OBTAINED(uint8_t x) {
return "\x08\x13"s + char(x);
}
std::string NEWLINE() {
return "\x02"s;
}
std::string COLOR(uint8_t x) {
return "\x05"s + char(x);
}

19
soh/soh/Enhancements/randomizer/custom_messages.h Normal file
View File

@ -0,0 +1,19 @@
#pragma once
#include <string>
#include "../../../include/z64item.h"
#include "randomizer.h"
#define QM_WHITE 0x00
#define QM_RED 0x41
#define QM_GREEN 0x42
#define QM_BLUE 0x43
#define QM_LBLUE 0x44
#define QM_PINK 0x45
#define QM_YELLOW 0x46
#define QM_BLACK 0x47
std::string MESSAGE_END();
std::string ITEM_OBTAINED(uint8_t x);
std::string NEWLINE();
std::string COLOR(uint8_t x);

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

@ -2419,17 +2419,6 @@ GetItemID Randomizer::GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomiz
return GetItemFromGet(this->itemLocations[randomizerCheck], ogId);
}
std::string Randomizer::GetCustomGetItemMessage(GetItemID giid) {
if (!gSaveContext.n64ddFlag) {
return "Not Randomized.";
}
switch (giid) {
default:
"There is no custom message for this item.";
}
}
RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 actorParams) {
if (!gSaveContext.n64ddFlag) {
return RC_UNKNOWN_CHECK;