Install the engine's message texts in standalone tools (fixes #14)
The six texts the engine posts from the game image (contract warning,
Masters, indoor entry bonus, league title bonus, friendly share) were
set only by the career sessions. week_check and the other standalone
tools left them empty, so the indoor entry bonus mail held only the
venue and the replays failed from the first public commit on.
install_message_texts(exe) now sets them for both sessions and in the
test executable loader.
Classic regression: the ten turns of #14 (game 1: 18, 21, 65, 88, 109,
201, 247; 2P: 24, 29, 34) pass again; no other turn changed against the
0.3 M0 baseline. The divergence the issue saw in the youth teams block
(bd4bc, since 310e3e2) is among the tolerated block differences.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
d92cfc3110
commit
a11311994d
5 files changed
+22
-13
No files matched your search
@@ -539,12 +539,7 @@ static void install_league_sizes(const LeImage& exe) {
|
|||||||
kNewcomerFirst = exe.u16(::bmh::layout::CareerSession_DispatchLineup_RuntimeField);
|
kNewcomerFirst = exe.u16(::bmh::layout::CareerSession_DispatchLineup_RuntimeField);
|
||||||
kNewcomerCount = exe.u16(::bmh::layout::CareerSession_InstallLeagueSizes_RuntimeField6);
|
kNewcomerCount = exe.u16(::bmh::layout::CareerSession_InstallLeagueSizes_RuntimeField6);
|
||||||
// EXE strings the engine posts (messages.hpp)
|
// EXE strings the engine posts (messages.hpp)
|
||||||
kContractEndsSoonText = exe.cstring(kEnglishCompetitions ? ::bmh::layout::EnglishContractExpiryWarningText : ::bmh::layout::ContractExpiryWarningText);
|
install_message_texts(exe);
|
||||||
kMastersQualificationText = kEnglishCompetitions ? "Masters entry confirmed. Your participation bonus has been credited." : exe.cstring(::bmh::layout::MastersQualificationText);
|
|
||||||
kMastersWinnerText = kEnglishCompetitions ? "Masters title won. Your prize money has been credited." : exe.cstring(::bmh::layout::MastersWinnerText);
|
|
||||||
kIndoorInvitationText = kEnglishCompetitions ? "Indoor event entry bonus credited for " : exe.cstring(::bmh::layout::IndoorInvitationText);
|
|
||||||
kChampionshipBonusText = kEnglishCompetitions ? "League title bonus credited." : exe.cstring(::bmh::layout::ChampionshipBonusText);
|
|
||||||
kFriendlyPayerPrefixText = kEnglishCompetitions ? "Your share: " : exe.cstring(::bmh::layout::NationalFriendlyPayerPrefixText);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CareerSession::CareerSession(const std::filesystem::path& data, uint32_t watcom_seed)
|
CareerSession::CareerSession(const std::filesystem::path& data, uint32_t watcom_seed)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
// SPDX-License-Identifier: GPL-3.0-only
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
#include "formats/executable_layout.hpp"
|
#include "formats/executable_layout.hpp"
|
||||||
#include "game/messages.hpp"
|
#include "game/messages.hpp"
|
||||||
|
#include "game/schedule.hpp"
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
@@ -150,4 +151,13 @@ std::string format_number(const GameState& g, int32_t value, int flags) {
|
|||||||
|
|
||||||
std::string format_amount(const GameState& g, int32_t value) { return format_number(g, value, 0x101); }
|
std::string format_amount(const GameState& g, int32_t value) { return format_number(g, value, 0x101); }
|
||||||
|
|
||||||
|
void install_message_texts(const LeImage& exe) {
|
||||||
|
kContractEndsSoonText = exe.cstring(kEnglishCompetitions ? ::bmh::layout::EnglishContractExpiryWarningText : ::bmh::layout::ContractExpiryWarningText);
|
||||||
|
kMastersQualificationText = kEnglishCompetitions ? "Masters entry confirmed. Your participation bonus has been credited." : exe.cstring(::bmh::layout::MastersQualificationText);
|
||||||
|
kMastersWinnerText = kEnglishCompetitions ? "Masters title won. Your prize money has been credited." : exe.cstring(::bmh::layout::MastersWinnerText);
|
||||||
|
kIndoorInvitationText = kEnglishCompetitions ? "Indoor event entry bonus credited for " : exe.cstring(::bmh::layout::IndoorInvitationText);
|
||||||
|
kChampionshipBonusText = kEnglishCompetitions ? "League title bonus credited." : exe.cstring(::bmh::layout::ChampionshipBonusText);
|
||||||
|
kFriendlyPayerPrefixText = kEnglishCompetitions ? "Your share: " : exe.cstring(::bmh::layout::NationalFriendlyPayerPrefixText);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace bmh
|
} // namespace bmh
|
||||||
@@ -16,6 +16,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include "formats/le.hpp"
|
||||||
#include "game/state.hpp"
|
#include "game/state.hpp"
|
||||||
|
|
||||||
namespace bmh {
|
namespace bmh {
|
||||||
@@ -59,6 +60,11 @@ inline std::string kIndoorInvitationText;
|
|||||||
inline std::string kChampionshipBonusText;
|
inline std::string kChampionshipBonusText;
|
||||||
inline std::string kFriendlyPayerPrefixText;
|
inline std::string kFriendlyPayerPrefixText;
|
||||||
|
|
||||||
|
// Installs the six texts above from the game image (the English game uses its own wording).
|
||||||
|
// Both career sessions call it at start; standalone engine tools (week_check, the season sims)
|
||||||
|
// must call it too, or these messages lose their text (#14: the indoor entry bonus mail).
|
||||||
|
void install_message_texts(const LeImage& exe);
|
||||||
|
|
||||||
// FormatNumber(buf, value, 0x101, ""): an amount of money as the messages show it: the
|
// FormatNumber(buf, value, 0x101, ""): an amount of money as the messages show it: the
|
||||||
// value converted with CurrencyMultiplier / CurrencyDivisor, digits grouped by dots, then " EU".
|
// value converted with CurrencyMultiplier / CurrencyDivisor, digits grouped by dots, then " EU".
|
||||||
std::string format_amount(const GameState& g, int32_t value);
|
std::string format_amount(const GameState& g, int32_t value);
|
||||||
|
|||||||
@@ -572,12 +572,7 @@ static void install_league_sizes(const LeImage& exe) {
|
|||||||
kNewcomerFirst = exe.u16(::bmh::layout::CareerSession_DispatchLineup_RuntimeField);
|
kNewcomerFirst = exe.u16(::bmh::layout::CareerSession_DispatchLineup_RuntimeField);
|
||||||
kNewcomerCount = exe.u16(::bmh::layout::CareerSession_InstallLeagueSizes_RuntimeField6);
|
kNewcomerCount = exe.u16(::bmh::layout::CareerSession_InstallLeagueSizes_RuntimeField6);
|
||||||
// EXE strings the engine posts (messages.hpp)
|
// EXE strings the engine posts (messages.hpp)
|
||||||
kContractEndsSoonText = exe.cstring(kEnglishCompetitions ? ::bmh::layout::EnglishContractExpiryWarningText : ::bmh::layout::ContractExpiryWarningText);
|
install_message_texts(exe);
|
||||||
kMastersQualificationText = kEnglishCompetitions ? "Masters entry confirmed. Your participation bonus has been credited." : exe.cstring(::bmh::layout::MastersQualificationText);
|
|
||||||
kMastersWinnerText = kEnglishCompetitions ? "Masters title won. Your prize money has been credited." : exe.cstring(::bmh::layout::MastersWinnerText);
|
|
||||||
kIndoorInvitationText = kEnglishCompetitions ? "Indoor event entry bonus credited for " : exe.cstring(::bmh::layout::IndoorInvitationText);
|
|
||||||
kChampionshipBonusText = kEnglishCompetitions ? "League title bonus credited." : exe.cstring(::bmh::layout::ChampionshipBonusText);
|
|
||||||
kFriendlyPayerPrefixText = kEnglishCompetitions ? "Your share: " : exe.cstring(::bmh::layout::NationalFriendlyPayerPrefixText);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ModernSession::ModernSession(const std::filesystem::path& data, uint32_t watcom_seed)
|
ModernSession::ModernSession(const std::filesystem::path& data, uint32_t watcom_seed)
|
||||||
|
|||||||
@@ -1,14 +1,17 @@
|
|||||||
// SPDX-License-Identifier: GPL-3.0-only
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "formats/le.hpp"
|
#include "formats/le.hpp"
|
||||||
|
#include "game/messages.hpp"
|
||||||
#include "game/schedule.hpp"
|
#include "game/schedule.hpp"
|
||||||
|
|
||||||
namespace bmh::test {
|
namespace bmh::test {
|
||||||
// Standalone engine tests explicitly install the supplied edition's scheduling
|
// Standalone engine tests explicitly install the supplied edition's scheduling
|
||||||
// content. CareerSession performs the same installation for normal app callers.
|
// content and the message texts. CareerSession performs the same installation for
|
||||||
|
// normal app callers.
|
||||||
inline LeImage load_executable(const std::filesystem::path& path) {
|
inline LeImage load_executable(const std::filesystem::path& path) {
|
||||||
auto executable = bmh::load_le(path);
|
auto executable = bmh::load_le(path);
|
||||||
install_fixture_tables(executable);
|
install_fixture_tables(executable);
|
||||||
|
install_message_texts(executable);
|
||||||
return executable;
|
return executable;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user