diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b566f73..d8cda60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,7 @@ jobs: python3 tools/public_release/check_public_tree.py --root . python3 tools/ci/test_build_runnable_tests.py python3 tools/package/test_verify_ci_release.py + python3 -m unittest discover -s tools/poc -p "test_*.py" - name: Set up MSVC x64 if: runner.os == 'Windows' uses: ilammy/msvc-dev-cmd@a102174a2b586eec2ea151a69e6fd14404a8ce7c # v1.13.0 diff --git a/src/game/state.cpp b/src/game/state.cpp index 7048eb8..f85bf14 100644 --- a/src/game/state.cpp +++ b/src/game/state.cpp @@ -165,7 +165,7 @@ void GameState::formation_position(int team, int slot, int& x, int& y) const { } SquadRange squad_range(int team) { - if (team == kNoTeam) return {kNoTeamSquadStart, 24}; + if (team == kNoTeam) return {size_t(kNoTeamSquadStart), 24}; if (team < kBigSquadTeams) return {size_t(team) * 24, 24}; if (team < runtime_dimensions.league_teams) return {size_t(team) * 16 + kBigSquadTeams * 8, 16}; return {0, 0}; diff --git a/src/ui/alltime_table.cpp b/src/ui/alltime_table.cpp index 51353c7..8f7ee87 100644 --- a/src/ui/alltime_table.cpp +++ b/src/ui/alltime_table.cpp @@ -30,7 +30,11 @@ AllTimeTableState alltime_table_from_game(const GameState&g,const LeImage&exe,De for(int t=0;t=runtime_dimensions.record_teams)continue;const auto&r=s.records[size_t(team)];int played=int(r.wins)+r.draws+r.losses;if(!played)continue;uint32_t p=r.points,gf=r.goals_for,ga=r.goals_against;if(relative){p=p*full*10U/uint32_t(played);gf=gf*full*10U/uint32_t(played);ga=ga*full*10U/uint32_t(played);}AllTimeRow row;row.team=team;row.played=played;row.points=p;row.goals_for=gf;row.goals_against=ga;row.points_key=p*0x10001U+0x7d000000U;row.goal_key=gf*0x10001U-ga*0x10000U+0x7d000000U;s.rows.push_back(row);}} + for(int part=0;part<2;++part){int first=exe.u16(start+uint32_t(part)*4),end=exe.u16(::bmh::layout::AlltimeTable_AlltimeTableFromGame_RuntimeField+uint32_t(nation)*8+uint32_t(part)*4);if (runtime_dimensions.expanded) { + if (nation == 0) { first = part == 0 ? 0 : runtime_dimensions.league_teams; end = part == 0 ? runtime_dimensions.domestic_teams : runtime_dimensions.record_teams; } + else { const int selected = nation + 4; first = league_first_team(selected); end = part == 0 ? first + kLeagueSizes[selected] : first; } + } + for(int team=first;team=runtime_dimensions.record_teams)continue;const auto&r=s.records[size_t(team)];int played=int(r.wins)+r.draws+r.losses;if(!played)continue;uint32_t p=r.points,gf=r.goals_for,ga=r.goals_against;if(relative){p=p*full*10U/uint32_t(played);gf=gf*full*10U/uint32_t(played);ga=ga*full*10U/uint32_t(played);}AllTimeRow row;row.team=team;row.played=played;row.points=p;row.goals_for=gf;row.goals_against=ga;row.points_key=p*0x10001U+0x7d000000U;row.goal_key=gf*0x10001U-ga*0x10000U+0x7d000000U;s.rows.push_back(row);}} std::stable_sort(s.rows.begin(),s.rows.end(),[](const auto&a,const auto&b){if(a.points_key!=b.points_key)return a.points_key>b.points_key;return a.goal_key>b.goal_key;});if(s.rows.size()>24)s.rows.resize(24);return s; } AllTimeTableScreen::AllTimeTableScreen(const std::filesystem::path&data,AllTimeTableState s):state_(std::move(s)),data_(data),exe_(load_le(asset_path(data,"BMH.exe"))),font_(load_font(asset_path(data/"F","BMH3.FNT"))),header_(load_font(asset_path(data/"F","BMH2.FNT"))),sprite_(data),window_(load_vga(asset_path(data/"KB","56.VGA"))),buttons_(load_vga(asset_path(data/"KB","0.VGA"))),texts_(load_textd(asset_path(data,"TEXTD.BLK"))){if(state_.underlay.width!=320||state_.underlay.height!=240)throw FormatError("alltime: invalid parent frame");} diff --git a/tools/poc/prepare_international.py b/tools/poc/prepare_international.py index 3a8d6d9..ca6528c 100644 --- a/tools/poc/prepare_international.py +++ b/tools/poc/prepare_international.py @@ -172,7 +172,7 @@ def build(source, donor, output): kits.append(old_kits[old] if old is not None else index%20) if index<194: aux.append(old_aux[old] if old is not None and old<168 else 0) - shorts.append(old_short[old] if old is not None and old<168 else 0) + shorts.append(old_short[old] if old is not None and old<168 else min(15, len(legacy_name(club['name']['default'])) - 1)) db['pools'][0]=bytes(pool); db['clubs']=words(offsets); db['aux']=words(aux) db['kits']=bytes(kits); db['short']=bytes(shorts) names=u16(db['names']); pool=bytearray(db['pools'][1]); new_words={k:[] for k in ('form','skills','identity')}