ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #6504 from HarbourMasters/develop-ackbar

Browse source 
merge develop-ackbar 9.2.3 to develop
This commit is contained in:
Philip Dubé 2026-04-14 16:48:19 +00:00 committed by GitHub
parent 4cae72463e cb71e22a79
commit 17a8f460e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -6,7 +6,7 @@ set(CMAKE_C_STANDARD 23 CACHE STRING "The C standard to use")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
project(Ship VERSION 9.2.2 LANGUAGES C CXX) project(Ship VERSION 9.2.3 LANGUAGES C CXX)
include(CMake/soh-cvars.cmake) include(CMake/soh-cvars.cmake)
include(CMake/lus-cvars.cmake) include(CMake/lus-cvars.cmake)
set(SPDLOG_LEVEL_TRACE 0) set(SPDLOG_LEVEL_TRACE 0)

12
soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
View file

@ -24,8 +24,8 @@ extern PlayState* gPlayState;
RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL)) RAND_GET_OPTION(RSK_SHUFFLE_MERCHANTS).Is(RO_SHUFFLE_MERCHANTS_ALL))
void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysterious = true) { void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysterious = true) {
RandomizerGet rgid = RAND_GET_ITEM(rc)->GetPlacedRandomizerGet(); auto location = RAND_GET_ITEM(rc);
uint16_t price = RAND_GET_ITEM(rc)->GetPrice(); RandomizerGet rgid = location->GetPlacedRandomizerGet();
CustomMessage itemName; CustomMessage itemName;
std::string color = Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor(); std::string color = Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(rgid)).GetColor();
if (mysterious) { if (mysterious) {
@ -37,10 +37,14 @@ void BuildMerchantMessage(CustomMessage& msg, RandomizerCheck rc, bool mysteriou
color = "%g"; color = "%g";
} else { } else {
const Rando::Item& item = Rando::StaticData::RetrieveItem(rgid); const Rando::Item& item = Rando::StaticData::RetrieveItem(rgid);
itemName = item.GetHint().GetHintMessage().GetForCurrentLanguage(); if (Rando::StaticData::GetLocation(rc)->IsShop()) {
itemName = CustomMessage(Rando::StaticData::RetrieveItem(rgid).GetName());
} else {
itemName = item.GetHint().GetHintMessage();
}
} }
msg.Replace("[[color]]", color); msg.Replace("[[color]]", color);
msg.InsertNames({ itemName, CustomMessage(std::to_string(price)) }); msg.InsertNames({ itemName, CustomMessage(std::to_string(location->GetPrice())) });
} }
void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) { void BuildBeanGuyMessage(uint16_t* textId, bool* loadFromMessageTable) {

1
soh/soh/Enhancements/randomizer/location.cpp
View file

@ -1,6 +1,5 @@
#include "location.h" #include "location.h"
#include "static_data.h" #include "static_data.h"
#include <algorithm>
#include <assert.h> #include <assert.h>
#include "option.h" #include "option.h"