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

commit in case anyone looks

This commit is contained in:
Pepper0ni 2024-04-11 19:25:23 +01:00
parent b9f5778339
commit 6e5aa32dd2
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,11 +80,14 @@ CustomMessage::CustomMessage(std::string english_, std::string german_, std::str
}
CustomMessage::CustomMessage(std::string english_, std::string german_, std::string french_, std::vector<char> colors_,
std::vector<bool> capital_ = {}, TextBoxType type_, TextBoxPosition position_)
: colors(colors_), capital(capital_), type(type_), position(position_) {
std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_) {
messages[LANGUAGE_ENG] = std::move(english_);
messages[LANGUAGE_GER] = std::move(german_);
messages[LANGUAGE_FRA] = std::move(french_);
colors = colors_;
capital = capital_;
type = type_;
position = position_;
}
CustomMessage::CustomMessage(std::string english_, TextBoxType type_, TextBoxPosition position_)
@ -92,9 +95,12 @@ CustomMessage::CustomMessage(std::string english_, TextBoxType type_, TextBoxPos
messages[LANGUAGE_ENG] = std::move(english_);
}
CustomMessage::CustomMessage(std::string english_, std::vector<char> colors_, std::vector<bool> capital_ = {}, TextBoxType type_, TextBoxPosition position_)
: colors(colors_), capital(capital_), type(type_), position(position_) {
CustomMessage::CustomMessage(std::string english_, std::vector<char> colors_, std::vector<bool> capital_, TextBoxType type_, TextBoxPosition position_){
messages[LANGUAGE_ENG] = std::move(english_);
colors = colors_;
capital = capital_;
type = type_;
position = position_;
}
CustomMessage::CustomMessage(Text text, TextBoxType type_,TextBoxPosition position_)

3
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
View File

@ -1994,4 +1994,5 @@ hintTable[RHT_SHADOW_TEMPLE_MAP_CHEST] = HintText(CustomMessage("They say that t
hintTable[RHT_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT] = HintText(CustomMessage("They say that #scrubs in Ganon's Castle# sell #[[1]]#.",
/*german*/ "",
/*french*/ "Selon moi, les #pestes Mojo dans le Château de Ganon# vendent #[[1]]#.", {QM_RED, QM_GREEN}));
// /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
// /*spanish*/ Según dicen, los #dekus del Castillo de Ganon# venden #[[1]]#.
}

1
soh/soh/Enhancements/randomizer/3drando/hints.hpp
View File

@ -9,7 +9,6 @@
#include "../randomizerTypes.h"
#include "../context.h"
#include "../../custom-message/CustomMessageManager.h"
#include "../trial.h"
struct HintDistributionSetting {
std::string name;