BFS Assets by pavelbraginskiy · Pull Request #9653 · MegaMek/mekhq

pavelbraginskiy · 2026-07-16T00:15:30Z

Must be merged with PRs MegaMek/megamek#8533, MegaMek/megameklab#2264. MegaMek/mm-data#470

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

This PR updates MekHQ’s unit selector filtering to use shared, gap-robust unit-type mapping and centralized unit-type matching logic, rather than relying on positional combo-box indices and a localized “Support Vehicle” string check.

Changes:

Replaces inlined unit-type/support-vehicle filter logic with a matchesUnitTypeSelection(...) helper.
Switches unit-type selection handling to a “code for combo index” mapping to avoid index drift when unit types are omitted from the shared combo.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

codecov · 2026-07-21T01:18:13Z

Codecov Report

❌ Patch coverage is 2.81690% with 69 lines in your changes missing coverage. Please review.
✅ Project coverage is 20.60%. Comparing base (a5395ce) to head (80aaec5).
⚠️ Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
.../src/mekhq/gui/dialog/MekHQUnitSelectorDialog.java	2.81%	69 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #9653      +/-   ##
============================================
- Coverage     20.61%   20.60%   -0.02%     
- Complexity    13351    13365      +14     
============================================
  Files          1497     1497              
  Lines        182829   182852      +23     
  Branches      28092    28092              
============================================
- Hits          37688    37673      -15     
- Misses       141403   141439      +36     
- Partials       3738     3740       +2

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

+          if git ls-remote --exit-code --heads \
+            ${{ github.event.pull_request.head.repo.owner.html_url }}/mm-data.git \
+            ${{ github.event.pull_request.head.ref }} > /dev/null 2>&1


Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Suppressed comments (1)

MekHQ/unittests/mekhq/gui/dialog/MekHQUnitSelectorDialogTest.java:89

This test relies on Mockito defaults for getUnitType() and hasDroneOs() to represent a “supported” entity. That makes it brittle (e.g., if the default int happens to match UnitType.GUN_EMPLACEMENT, or if the unsupported criteria evolve). Stub the relevant methods explicitly so the test only validates isCampaignAcquisitionCandidate logic.

    @Test
    void campaignActionsKeepSupportedStandardEntity() {
        Entity entity = mock(Entity.class);

        assertTrue(MekHQUnitSelectorDialog.isCampaignAcquisitionCandidate(entity));

+                }
+                MekTableModel mekModel = entry.getModel();
+                MekSummary mek = mekModel.getMekSummary(entry.getIdentifier());
+                ITechnology tech = UnitTechProgression.getProgression(mek, campaign.getTechFaction(), true);


Must be merged with PRs MegaMek/megameklab#2264. MegaMek/mekhq#9653, MegaMek/mm-data#470 ## Add Battlefield Support Assets This adds Battlefield Support Assets as a first-class unit type, using a new `.bfs` YAML format for their card-based stats and UUID links to corresponding standard units. Assets are integrated into the unit cache and selector, include Advanced Search filters, render printable BFS cards, and support standalone or linked unit forms. The update also adds lobby selection and configuration, Regular/Veteran crews and costs, persistent damage and MUL round-tripping, distinctive camouflage overlays, and dedicated Summary, TRO, and BFS Card views. This PR provides the data model and non-gameplay infrastructure; the Asset movement and combat rules will follow separately.

Support Battlefield Support Assets in unit selector

d62be42

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

pavelbraginskiy requested a review from a team as a code owner July 16, 2026 00:15

Copilot AI review requested due to automatic review settings July 16, 2026 00:15

Copilot started reviewing on behalf of pavelbraginskiy July 16, 2026 00:15 View session

pavelbraginskiy mentioned this pull request Jul 16, 2026

Add Battlefield Support Asset data MegaMek/mm-data#470

Merged

pavelbraginskiy added the AI ready for Review Indicates that is has been in game tested and is ready for review as it can be label Jul 16, 2026

Copilot AI reviewed Jul 16, 2026

View reviewed changes

Comment thread MekHQ/src/mekhq/gui/dialog/MekHQUnitSelectorDialog.java Outdated

This was referenced Jul 16, 2026

Add Battlefield Support Asset editing and printing MegaMek/megameklab#2264

Merged

Bfs assets MegaMek/megamek#8533

Merged

pavelbraginskiy and others added 2 commits July 15, 2026 17:42

Use matching mm-data branch in PR CI

8dcb207

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Merge remote-tracking branch 'origin/main' into bfs-assets

6d295c2

Merge remote-tracking branch 'origin/main' into bfs-assets

746a775

Copilot AI review requested due to automatic review settings July 23, 2026 05:54

Copilot started reviewing on behalf of pavelbraginskiy July 23, 2026 05:54 View session

Copilot AI reviewed Jul 23, 2026

View reviewed changes

Comment thread MekHQ/src/mekhq/gui/dialog/MekHQUnitSelectorDialog.java Outdated

Clarify unit type filter code

8f58984

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings July 23, 2026 07:46

Copilot started reviewing on behalf of pavelbraginskiy July 23, 2026 07:46 View session

Copilot AI reviewed Jul 23, 2026

View reviewed changes

Comment thread .github/workflows/ci.yml Outdated

Comment on lines +32 to +34

if git ls-remote --exit-code --heads \

${{ github.event.pull_request.head.repo.owner.html_url }}/mm-data.git \

${{ github.event.pull_request.head.ref }} > /dev/null 2>&1

pavelbraginskiy and others added 2 commits July 23, 2026 14:44

Merge remote-tracking branch 'origin/main' into bfs-assets

3448a3a

Harden matching data branch discovery

8b126d9

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings July 24, 2026 00:20

Copilot started reviewing on behalf of pavelbraginskiy July 24, 2026 00:21 View session

Copilot AI reviewed Jul 24, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into bfs-assets

88f874d

Copilot AI review requested due to automatic review settings August 2, 2026 03:17

Copilot started reviewing on behalf of pavelbraginskiy August 2, 2026 03:18 View session

Copilot AI reviewed Aug 2, 2026

View reviewed changes

fixed dialog logic for BFS filtering

80aaec5

Copilot AI review requested due to automatic review settings August 2, 2026 09:22

exeea approved these changes Aug 2, 2026

View reviewed changes

Copilot started reviewing on behalf of exeea August 2, 2026 09:22 View session

Copilot AI reviewed Aug 2, 2026

View reviewed changes

Comment thread .github/workflows/ci.yml

github-advanced-security AI found potential problems Aug 2, 2026

View reviewed changes

Comment thread MekHQ/src/mekhq/gui/dialog/MekHQUnitSelectorDialog.java

}

MekTableModel mekModel = entry.getModel();

MekSummary mek = mekModel.getMekSummary(entry.getIdentifier());

ITechnology tech = UnitTechProgression.getProgression(mek, campaign.getTechFaction(), true);

pavelbraginskiy merged commit 1a7665e into MegaMek:main Aug 2, 2026
8 checks passed

Navigation Menu

Uh oh!

BFS Assets - #9653

BFS Assets#9653
pavelbraginskiy merged 9 commits into
MegaMek:mainfrom
pavelbraginskiy:bfs-assets

pavelbraginskiy commented Jul 16, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

codecov Bot commented Jul 21, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

pavelbraginskiy commented Jul 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

codecov Bot commented Jul 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

pavelbraginskiy commented Jul 16, 2026 •

edited

Loading

codecov Bot commented Jul 21, 2026 •

edited

Loading