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:
1 parent
13bdc56f04
commit
6f55622307
53 files changed
+1392
-87
No files matched your search
+16
-1
@@ -341,8 +341,19 @@ add_subdirectory(src/import)
|
||||
|
||||
# Modern session: fork of the Classic CareerSession on the Modern season core. It still
|
||||
# uses the Classic UI projections until the Modern projections exist (docs/new_engine).
|
||||
# Modern world packages: the world tables and the Classic payload of a Modern data set.
|
||||
add_library(bmh_modern_content STATIC src/modern/content/world.cpp src/modern/content/world_package.cpp
|
||||
src/modern/content/world_expand.cpp)
|
||||
target_link_libraries(bmh_modern_content PUBLIC bmh_content bmh_season_modern PRIVATE bmh_miniz)
|
||||
if(MSVC)
|
||||
target_compile_options(bmh_modern_content PRIVATE /W4 /utf-8)
|
||||
endif()
|
||||
|
||||
add_executable(modern_world_info tests/modern_world_info.cpp)
|
||||
target_link_libraries(modern_world_info PRIVATE bmh_modern_content)
|
||||
|
||||
add_library(bmh_modern_session STATIC src/modern/app/modern_session.cpp)
|
||||
target_link_libraries(bmh_modern_session PUBLIC bmh_season_modern bmhui)
|
||||
target_link_libraries(bmh_modern_session PUBLIC bmh_season_modern bmh_modern_content bmhui)
|
||||
if(MSVC)
|
||||
target_compile_options(bmh_modern_session PRIVATE /W4 /utf-8 /bigobj)
|
||||
else()
|
||||
@@ -1152,6 +1163,10 @@ if(MSVC)
|
||||
endif()
|
||||
add_test(NAME quit_confirmation_unit_tests COMMAND quit_confirmation_unit_tests)
|
||||
|
||||
add_executable(modern_camp_tests tests/modern_camp_tests.cpp)
|
||||
target_link_libraries(modern_camp_tests PRIVATE bmh_season_modern)
|
||||
add_test(NAME modern_camp_tests COMMAND modern_camp_tests)
|
||||
|
||||
add_executable(modern_calendar_tests tests/modern_calendar_tests.cpp)
|
||||
target_link_libraries(modern_calendar_tests PRIVATE bmh_season_modern)
|
||||
add_test(NAME modern_calendar_tests COMMAND modern_calendar_tests)
|
||||
|
||||
Reference in new issue
Block a user