github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 21:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

clang

Browse source
This commit is contained in:
Demur Rumed 2025-08-03 01:14:04 +00:00
commit 99c54dbf9a
2 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
soh/soh/Enhancements/randomizer/ShuffleSpeak.cpp
View file

@ -11,7 +11,8 @@ void RegisterShuffleSpeak() {
COND_VB_SHOULD(VB_SPEAK, shouldRegister, {
Actor* talkActor = GET_PLAYER(gPlayState)->talkActor;
if (talkActor != NULL && talkActor->category == ACTORCAT_NPC && !(talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
if (talkActor != NULL && talkActor->category == ACTORCAT_NPC &&
!(talkActor->flags & ACTOR_FLAG_TALK_OFFER_AUTO_ACCEPTED)) {
RandomizerInf inf = RAND_INF_MAX;
switch (talkActor->id) {
case ACTOR_EN_DNS:

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

@ -5715,24 +5715,18 @@ void Randomizer::CreateCustomMessages() {
GIMESSAGE(RG_BRONZE_SCALE, ITEM_SCALE_SILVER, "You got the %rBronze Scale%w!&The power of buoyancy is yours!",
"Du hast die %rBronzene Schuppe%w&erhalten! Die Fähigkeit zu&Schwimmen ist nun dein!",
"Vous obtenez l'%rÉcaille de Bronze%w!&Le pouvoir de la flottabilité est&à vous!"),
GIMESSAGE(RG_SPEAK_DEKU, ITEM_NUT, "You got the %rDeku Jabbernut%w!&Use your words!",
"!!!",
GIMESSAGE(RG_SPEAK_DEKU, ITEM_NUT, "You got the %rDeku Jabbernut%w!&Use your words!", "!!!",
"Vous obtenez la %rNoix Blabla&Mojo%w!&Vous pouvez maintenant communiquer&avec les %gPestes Mojo%w!"),
GIMESSAGE(RG_SPEAK_GERUDO, ITEM_NUT, "You got the %rGerudo Jabbernut%w!&Use your words!",
"!!!",
GIMESSAGE(RG_SPEAK_GERUDO, ITEM_NUT, "You got the %rGerudo Jabbernut%w!&Use your words!", "!!!",
"Vous obtenez la %rNoix Blabla&Gerudo%w!&Vous pouvez maintenant communiquer&avec les %yGerudos%w!"),
GIMESSAGE(RG_SPEAK_GORON, ITEM_NUT, "You got the %rGoron Jabbernut%w!&Use your words!",
"!!!",
GIMESSAGE(RG_SPEAK_GORON, ITEM_NUT, "You got the %rGoron Jabbernut%w!&Use your words!", "!!!",
"Vous obtenez la %rNoix Blabla&Goron%w!&Vous pouvez maintenant communiquer&avec les %rGorons%w!"),
GIMESSAGE(RG_SPEAK_HYLIAN, ITEM_NUT,
"You got the %rHylian Jabbernut%w!&Use your words! You can also speak with owls.",
"!!!",
"You got the %rHylian Jabbernut%w!&Use your words! You can also speak with owls.", "!!!",
"Vous obtenez la %rNoix Blabla&Hylienne%w!&Vous pouvez maintenant communiquer&avec les %cHyliens%w!"),
GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_NUT, "You got the %rKokiri Jabbernut%w!&Use your words!",
"!!!",
GIMESSAGE(RG_SPEAK_KOKIRI, ITEM_NUT, "You got the %rKokiri Jabbernut%w!&Use your words!", "!!!",
"Vous obtenez la %rNoix Blabla&Kokiri%w!&Vous pouvez maintenant communiquer&avec les %gKokiris%w!"),
GIMESSAGE(RG_SPEAK_ZORA, ITEM_NUT, "You got the %rZora Jabbernut%w!&Use your words!",
"!!!",
GIMESSAGE(RG_SPEAK_ZORA, ITEM_NUT, "You got the %rZora Jabbernut%w!&Use your words!", "!!!",
"Vous obtenez la %rNoix Blabla&Zora%w!&Vous pouvez maintenant communiquer&avec les %bZoras%w!"),
GIMESSAGE(RG_FISHING_POLE, ITEM_FISHING_POLE, "You found a lost %rFishing Pole%w!&Time to hit the pond!",
"Du hast eine verlorene %rAngelrute%w&gefunden!&Zeit, im Teich&zu angeln!",