Load Modern worlds and add Modern training camps (M3, M4)

M3 - Modern world loader:
- modern/content/world: typed view of the world tables (leagues, clubs,
  players, nations, league dates, training camp catalogue).
- modern/content/world_package: opens a Modern world (runtime:modern-v1, or
  editor:world-v1 until data revision 1.4), reads only the engine entries and
  decodes the Classic payload (import: load_classic_payload).
- modern/content/world_expand: turns the Classic start into the world: club
  ids in the order of the world's leagues, per-club tables remapped (added
  clubs copy an original club of their league), added players from their
  attributes, 24 squad slots per league club, pools kept, layout, league
  sizes and league dates installed; UTF-8 names and OBW ids in ModernState.
- Fixes found by playing the Modern data set: referee pool exhausted on days
  with German and larger international leagues (Modern deviation), card
  table per league club grown, slot-to-team lookup via WorldLayout, form
  history stride from the layout, remaining slot literals.
- Classic UI projections used by the session read the layout instead of
  executable constants (Classic values unchanged).
- modern_season_sim opens .obw worlds; MODERN_DEBUG / MODERN_WATCH tracing.

M4 - training camps:
- Catalogue in ModernState (built-in 18 fictional camps on three maps, or the
  world's extended catalogue); price, booking and effect use it.
- Six-star grades: step index capped, limit +1 from pitch 5 and +1 with pitch
  and fitness 6, catering 6 one more point of condition, lodging 6 one week
  less injury. Classic data behaves as before. modern_camp_tests.

Verified: 190 tests pass; Classic replay regression identical to the M0
baseline; season_sim and modern_season_sim identical with Classic data; the
Modern data set plays full seasons (leagues 34/38/34 rounds).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
ClaudeandClaude Opus 5.5 committed 2026-10-23 22:43:25 +02:00
1 parent 13bdc56f04
commit 6f55622307
53 files changed
+1392 -87

No files matched your search

+17
View File
@@ -9,10 +9,13 @@
// Modern-only data (world layout, UTF-8 names, ...) is added here, never to GameState.
#include <cstddef>
#include <string>
#include <utility>
#include <vector>
#include "game/state.hpp"
#include "game/world_layout.hpp"
#include "modern/game/training_camps.hpp"
namespace bmh::modern {
@@ -31,7 +34,21 @@ inline size_t total_squad_slots() { return world_layout().total_slots; }
// The callbacks the shared match core uses for season functions (SeasonHooks).
const SeasonHooks& season_hooks();
// The form history per manager (manager_results) holds 10 bytes per club with a record
// (Classic: 168 clubs, stride 0x690).
inline size_t manager_history_stride() { return size_t(first_foreign_cup()) * 10; }
struct ModernState : GameState {
// --- Modern world (docs/new_engine, M3); empty when the game runs on Classic data -------
// UTF-8 names and OBW identities by runtime index. The single-byte name pools of
// GameState stay for the engine texts; interfaces show these.
std::vector<std::string> world_club_id, world_club_name, world_club_short; // per team
std::vector<std::string> world_player_id, player_first, player_last; // per player
std::vector<std::string> player_nation; // nation id per player
// Training camps (M4): Classic data gives the eight original resorts, a Modern world its catalogue.
std::vector<CampMap> camp_maps;
std::vector<TrainingCamp> training_camps;
ModernState() { season_hooks = &modern::season_hooks(); }
// Takes over a state built by shared code (save loading, career setup).
ModernState(GameState&& g) : GameState(std::move(g)) { season_hooks = &modern::season_hooks(); }