Fork the Classic season core into src/modern and add the world layout (M1)
- src/modern/game: the season modules as bmh::modern, working on ModernState (a GameState). Data types stay shared with Classic; Modern code calls its season functions qualified (modern::...), so a missing Modern function is a compile error instead of a silent call into Classic. - src/modern/app/modern_session: the session on the Modern core. It still uses the Classic UI projections until the Modern projections exist. - SeasonHooks: the shared match core reaches player statistics and the table prediction of the season core that owns the game (Classic: unchanged). - WorldLayout: team ranges, squad slots and pools of the running world. Shared code and the Modern fork read them; Classic keeps the original numbers. - Transfer list views moved to game/transfer_offer_view.hpp (shared). - tools/modern/check_fork_calls.sh, modern_season_sim and world_layout_tests. Verified: Classic tests and replay regression unchanged; season_sim and modern_season_sim produce identical output with Classic data. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
badd08f05e
commit
f2fcb28f65
81 files changed
+29351
-91
No files matched your search
+1
-57
@@ -23,6 +23,7 @@
|
||||
#include "game/random.hpp"
|
||||
#include "game/state.hpp"
|
||||
#include "game/transfer_allocator.hpp"
|
||||
#include "game/transfer_offer_view.hpp"
|
||||
|
||||
#include <array>
|
||||
#include <cstdint>
|
||||
@@ -30,63 +31,6 @@
|
||||
|
||||
namespace bmh {
|
||||
|
||||
// Projection passed to the optional original-style seller decision callback
|
||||
// (TransferListCountdown -> IncomingTransferScreen). Rows retain raw bid slots 0..3; ranking,
|
||||
// quote RNG, and transaction remain in the synchronous weekly call site.
|
||||
struct TransferOfferCandidateView {
|
||||
int bid_index = -1;
|
||||
bool present = false;
|
||||
int buyer = -1;
|
||||
int buyer_manager = -1;
|
||||
uint32_t fee = 0;
|
||||
uint32_t monthly_salary = 0;
|
||||
uint32_t fee_reference = 0; // RateTransferBidSource for this offer's term
|
||||
uint32_t salary_reference = 0;
|
||||
uint8_t contract_months = 0; // raw term low 7 bits; high bit is loan
|
||||
bool loan = false;
|
||||
std::array<uint8_t, 7> bonuses{};
|
||||
bool affordable = false;
|
||||
bool has_squad_room = false;
|
||||
bool passes_foreign_limit = false;
|
||||
bool loan_permitted = true;
|
||||
bool transaction_supported = true; // false for human-involved loans until return lifecycle is ported
|
||||
bool eligible = false;
|
||||
};
|
||||
|
||||
struct TransferOfferListView {
|
||||
bool valid = false;
|
||||
int list_entry = -1;
|
||||
int player = -1;
|
||||
int seller = -1;
|
||||
int seller_manager = -1;
|
||||
int seller_loan_count = -1; // DeskActions_Unsupported_RuntimeField[seller_manager], -1 when unavailable
|
||||
int preferred_bid_index = -1;
|
||||
bool preferred_bid_passed_random_check = false; // TransferListCountdown uVar6 < ranking score
|
||||
int rejected_bid_index = -1;
|
||||
uint32_t notice_text_address = 0;
|
||||
uint32_t quoted_fee = 0;
|
||||
uint32_t quoted_monthly_salary = 0;
|
||||
uint8_t quoted_years = 0;
|
||||
uint32_t asking_fee = 0;
|
||||
uint32_t asking_monthly_salary = 0;
|
||||
int offer_count = 0;
|
||||
std::array<TransferOfferCandidateView, 4> offers{};
|
||||
};
|
||||
|
||||
// Source-backed read-only events around transfer settlement and countdown
|
||||
// notices. `offers` owns a snapshot of all four raw bid slots; selected_bid_index
|
||||
// is the ranked raw row, not a compact row. last_week is the system modal at
|
||||
// countdown 2 -> 1 and carries result_text_address PendingOffer_TransferLastWeekDialog_ExecutableField.
|
||||
enum class TransferDecisionEventKind { evaluation, confirmation, last_week };
|
||||
struct TransferDecisionEvent {
|
||||
TransferDecisionEventKind kind = TransferDecisionEventKind::evaluation;
|
||||
TransferOfferListView offers;
|
||||
int selected_bid_index = -1;
|
||||
bool accepted = false; // evaluation: the one W(90,110) result; confirmation: accepted/declined
|
||||
int viewer_manager = -1; // ActiveManager at evaluation; human seller first, otherwise buyer
|
||||
uint32_t result_text_address = 0; // evaluation: OK/NEIN; confirmation: PendingOffer_FormatError_ExecutableField2 / PendingOffer_PendingOfferNoticeDialog_ExecutableField
|
||||
};
|
||||
|
||||
// Projects the current live rows without mutation or RNG. The selector caller
|
||||
// performs the Source-ranked selection and ProjectTransferOfferList post-selection check.
|
||||
TransferOfferListView project_transfer_offer_list(const GameState& g, int list_entry);
|
||||
|
||||
Reference in new issue
Block a user