Skip to content

manual/automatic roles #8317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
exeea wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

manual/automatic roles #8317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f2ca760
manual/automatic roles
exeea Jun 7, 2026
d0d8b78
removed debug logs
exeea Jun 7, 2026
3ebfe61
in SNIPER calculation, LRM damage doubles the negative score
exeea Jun 7, 2026
cfe648d
missing break
exeea Jun 7, 2026
6defad7
tweaks in role identification
exeea Jun 7, 2026
ebeaaa7
tweaks on missile boat detection
exeea Jun 7, 2026
4f2f5ff
missile boat tweaks
exeea Jun 8, 2026
1628330
artillery
exeea Jun 8, 2026
72302c0
sniper
exeea Jun 8, 2026
8cc0308
consider also IF*
exeea Jun 8, 2026
365bb7b
Merge branch 'main' into dynamicroles
exeea Jun 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion megamek/src/megamek/common/alphaStrike/AlphaStrikeElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,18 @@ public String getModel() {

@Override
public UnitRole getRole() {
UnitRole roleOverride = getRoleOverride();
return roleOverride.hasRole() ? roleOverride : UnitRole.bestRoleFor(this);
}

public UnitRole getRoleOverride() {
return (role == null) ? UnitRole.UNDETERMINED : role;
}

public boolean hasRoleOverride() {
return getRoleOverride() != UnitRole.UNDETERMINED;
}

/**
* @return The AS element's display name, including duplicate markers such as "#2".
*/
Expand Down Expand Up @@ -376,7 +385,7 @@ public void setModel(String newModel) {
* Sets the AS element's battlefield role (ROLE).
*/
public void setRole(UnitRole newRole) {
role = newRole;
role = (newRole == null) ? UnitRole.UNDETERMINED : newRole;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/alphaStrike/conversion/ASConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ private static AlphaStrikeElement performConversion(Entity entity, boolean inclu
element.setModel(entity.getModel());
element.setChassis(entity.getFullChassis());
element.setMulId(entity.getMulId());
element.setRole(entity.getRole());
element.setRole(entity.getRoleOverride());
element.setFluff(entity.getFluff());
element.setId(entity.getId());

Expand All @@ -129,7 +129,7 @@ private static AlphaStrikeElement performConversion(Entity entity, boolean inclu
conversionReport.addLine("Chassis:", element.getChassis(), "");
conversionReport.addLine("Model:", element.getModel(), "");
conversionReport.addLine("MUL ID:", Integer.toString(element.getMulId()), "");
conversionReport.addLine("Unit Role:", element.getRole().toString(), "");
conversionReport.addLine("Unit Role:", element.getRoleOverride().toString(), "");

// Type
element.setType(ASUnitType.getUnitType(entity));
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/loaders/BLKFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,8 +765,8 @@ public static BuildingBlock getBlock(Entity t) throws EntitySavingException {
String type = getType(t);
blk.writeBlockData("type", type);

if (t.hasRole()) {
blk.writeBlockData("role", t.getRole().toString());
if (t.hasRoleOverride()) {
blk.writeBlockData("role", t.getRoleOverride().toString());
}

List<String> quirkList = t.getQuirks()
Expand Down
13 changes: 11 additions & 2 deletions megamek/src/megamek/common/units/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17519,12 +17519,21 @@ protected final IGameOptions gameOptions() {
}

public void setUnitRole(UnitRole role) {
this.role = role;
this.role = (role == null) ? UnitRole.UNDETERMINED : role;
}

public UnitRole getRoleOverride() {
return (role == null) ? UnitRole.UNDETERMINED : role;
}

public boolean hasRoleOverride() {
return getRoleOverride() != UnitRole.UNDETERMINED;
}

@Override
public UnitRole getRole() {
return (role == null) ? UnitRole.UNDETERMINED : role;
UnitRole roleOverride = getRoleOverride();
return roleOverride.hasRole() ? roleOverride : UnitRole.bestRoleFor(this);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions megamek/src/megamek/common/units/Mek.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5083,8 +5083,8 @@ public String getMtf() {
sb.append(MtfFile.RULES_LEVEL).append(
TechConstants.T_SIMPLE_LEVEL[techLevel]);
sb.append(newLine);
if (hasRole()) {
sb.append(MtfFile.ROLE).append(getRole().toString());
if (hasRoleOverride()) {
sb.append(MtfFile.ROLE).append(getRoleOverride().toString());
sb.append(newLine);
}
if (techFaction != null && techFaction != Faction.NONE) {
Expand Down
Loading
Loading