Enable expanded international careers and private Classic-format preparation (by Codex)

This commit is contained in:
Codex committed 2026-10-31 10:20:09 +01:00
1 parent aae6556708
commit b5d60ef8a7
78 files changed
+816 -269

No files matched your search

+12 -12
View File
@@ -69,7 +69,7 @@ FriendlyBookingQuote make_friendly_quote(const GameState& g, int manager, int op
return out;
}
const int own_team = g.manager_teams[size_t(manager)];
if (own_team < 0 || own_team >= 168 || opponent < 0 || opponent >= 168 || opponent == own_team) {
if (own_team < 0 || own_team >= runtime_dimensions.record_teams || opponent < 0 || opponent >= runtime_dimensions.record_teams || opponent == own_team) {
out.status = FriendlyQuoteStatus::invalid_opponent;
return out;
}
@@ -122,7 +122,7 @@ NationalFriendlyQuote make_national_friendly_quote(const GameState& g,
return out;
}
// Page 4 cannot return Germany (0); the engine boundary repeats that gate.
if (opponent <= kNoTeam || opponent > 0x1a2 || opponent == kNoTeam) {
if (opponent <= kNoTeam || opponent > (kNoTeam + 61) || opponent == kNoTeam) {
out.terms.status = FriendlyQuoteStatus::invalid_opponent;
return out;
}
@@ -624,7 +624,7 @@ TransferActionResult submit_transfer_bid_impl(GameState& g, const TransferBidReq
const bool source_direct_candidate = source_hooks && seller_manager < 0 &&
fee_pct >= 110 && salary_pct >= g.memory.u8(entry + 0x55);
if (source_direct_candidate) {
if (request.list_entry >= 40 || seller < 0 || (seller >= 0x8a && seller != 0x0fff) || seller == buyer ||
if (request.list_entry >= 40 || seller < 0 || (seller >= runtime_dimensions.league_teams && seller != 0x0fff) || seller == buyer ||
request.manager < 0 || size_t(request.manager) >= g.manager_teams.size() ||
!g.memory.has(::bmh::layout::ActiveManager) || g.memory.u8(::bmh::layout::ActiveManager) != request.manager ||
source_hooks->direct_mode != HumanBuyerSaleDirectMode::ordinary_ai_purchase ||
@@ -790,7 +790,7 @@ TransferActionResult submit_transfer_bid_source_impl(GameState& g, const Transfe
// ordinary settlement already removes players using that actual range.
// Higher club IDs have no ordinary squad; do not invent their settlement
// or let ReleasePlayer reach its missing-player/internal-error21 boundary.
if (seller != 0x0fff && seller >= 138) {
if (seller != 0x0fff && seller >= runtime_dimensions.league_teams) {
report.fail(kOrdinarySellerBoundary);
out.status = TransferActionStatus::unsupported;
out.player = player; out.list_entry = request.list_entry;
@@ -1009,7 +1009,7 @@ TransferActionResult submit_transfer_bid_source_impl(GameState& g, const Transfe
std::optional<TransferMarketSnapshotPreview> transfer_market_snapshot_preview(
const GameState& g,int manager,int runtime_club,int index) {
if(manager<0||manager>=4||size_t(manager)>=g.manager_teams.size()||
g.manager_teams[size_t(manager)]!=runtime_club||runtime_club<0||runtime_club>=138||index<0||index>=12)
g.manager_teams[size_t(manager)]!=runtime_club||runtime_club<0||runtime_club>=runtime_dimensions.league_teams||index<0||index>=12)
return std::nullopt;
const auto owner=squad_range(runtime_club);
int count=0,ordinal=-1;
@@ -1036,7 +1036,7 @@ std::optional<TransferMarketSnapshotPreview> transfer_market_snapshot_preview(
// Require exactly one genuine ledger and its authenticated owner.
if(borrower!=-1||int(loan>>12&0x3ff)!=runtime_club)return std::nullopt;
borrower=int(loan>>22&0x3ff);
if(borrower<0||borrower>=138||borrower==runtime_club)return std::nullopt;
if(borrower<0||borrower>=runtime_dimensions.league_teams||borrower==runtime_club)return std::nullopt;
}
if(borrower<0)return std::nullopt;
const auto range=squad_range(borrower);
@@ -1072,9 +1072,9 @@ TransferMarketPreviewResult quote_transfer_market_preview_source(
return unsupported("market preview: stale Source player/slot");
if(request.purchase) {
if(request.snapshot_index!=-1)return unsupported("market preview: snapshot is not a purchase row");
if(request.source_slot<2928||request.source_slot>=2928+40)
if(request.source_slot<runtime_dimensions.pool_first||request.source_slot>=runtime_dimensions.pool_first+40)
return unsupported("market preview: purchase is not an ordinary market row");
const uint32_t seller_at=::bmh::layout::EditorList+uint32_t(request.source_slot-2928)*0x58+8;
const uint32_t seller_at=::bmh::layout::EditorList+uint32_t(request.source_slot-runtime_dimensions.pool_first)*0x58+8;
if(!g.memory.has(seller_at)||!g.memory.has(seller_at+1))
return unsupported("market preview: missing Source seller word");
const uint16_t raw=g.memory.u16(seller_at);
@@ -1091,7 +1091,7 @@ TransferMarketPreviewResult quote_transfer_market_preview_source(
// with the unchanged42307 formula; do not synthesize a Native slot.
} else {
if(request.snapshot_index!=-1)return unsupported("market preview: invalid snapshot index");
if(request.seller!=request.runtime_club||request.runtime_club>=138)
if(request.seller!=request.runtime_club||request.runtime_club>=runtime_dimensions.league_teams)
return unsupported("market preview: outgoing club is not an ordinary owned squad");
const auto range=squad_range(request.runtime_club);
if(range.count==0||range.first+range.count>g.squad_slots.size()||
@@ -1133,7 +1133,7 @@ int editor_slot(const GameState& g,const TransferOfferEditorRequest& r) {
std::string editor_identity(const GameState& g,const TransferOfferEditorRequest& r) {
if(r.manager<0||r.manager>=4||size_t(r.manager)>=g.manager_teams.size()||
!g.memory.has(::bmh::layout::ActiveManager)||g.memory.u8(::bmh::layout::ActiveManager)!=r.manager||
g.manager_teams[size_t(r.manager)]!=r.runtime_club||r.runtime_club<0||r.runtime_club>=138)
g.manager_teams[size_t(r.manager)]!=r.runtime_club||r.runtime_club<0||r.runtime_club>=runtime_dimensions.league_teams)
return "OpenTransferEditor: stale ordinary manager/team";
const size_t record=size_t(r.manager)*kRecordSize;
if(record+kRecordSize>g.manager_records.size()||
@@ -1143,7 +1143,7 @@ std::string editor_identity(const GameState& g,const TransferOfferEditorRequest&
const bool ordinary_entry = r.list_entry >= 0 && r.list_entry < 40 && !r.poach && !r.loan_return_entry;
const bool poach_entry = r.list_entry >= 40 && r.list_entry < 44 && r.poach && !r.loan_return_entry;
const bool return_entry = r.list_entry >= 40 && r.list_entry < 44 && r.loan_return_entry && !r.poach;
if((!ordinary_entry&&!poach_entry&&!return_entry)||r.source_slot!=2928+r.list_entry||
if((!ordinary_entry&&!poach_entry&&!return_entry)||r.source_slot!=runtime_dimensions.pool_first+r.list_entry||
size_t(r.source_slot)>=g.squad_slots.size()||r.expected_player<0||r.expected_player>=0x0fff||
size_t(r.expected_player)>=g.players.size()||
int(g.squad_slots[size_t(r.source_slot)]&0x0fff)!=r.expected_player)
@@ -1159,7 +1159,7 @@ std::string editor_identity(const GameState& g,const TransferOfferEditorRequest&
const int seller=int(r.expected_seller_word&0x7fff);
if(r.expected_seller_word==0xffff||seller==r.runtime_club)
return "OpenTransferEditor: targeted/invalid seller is outside ordinary editor";
if(seller!=0x0fff&&seller>=138)return kOrdinarySellerBoundary;
if(seller!=0x0fff&&seller>=runtime_dimensions.league_teams)return kOrdinarySellerBoundary;
// OpenTransferEditor: the original refuses a loan from a free agent (seller 0x0fff) with the message
// DeskActionsRuntimeField6 (SDLFlushEvents3) - a rule of the game, not a gap: the code names it
if(r.loan&&r.expected_seller_word==0x0fff)return "free_agent_loan_refused";