Skip to content
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

Fix 4739 custom protomech bay does not load #4740

Merged
merged 3 commits into from
Sep 4, 2023
Merged

Fix 4739 custom protomech bay does not load #4740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fc12656
Initial fix for ProtoMekBay/ProtoMechBay output and loading issue cau…
Sleet01 Sep 2, 2023
c23daaa
Revert some changes, add dual compatibility and comments
Sleet01 Sep 2, 2023
4b02ca8
Final part of fix for #4739: add dropships as ProtoMek loaders
Sleet01 Sep 3, 2023
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
78 changes: 47 additions & 31 deletions megamek/src/megamek/client/ui/swing/lobby/LobbyMekPopup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ static ScalingPopup getPopup(List<Entity> entities, List<Force> forces, ActionLi
popup.add(squadronMenu(clientGui, true, listener, joinedEntities));
}

if (accessibleProtomeks) {
if (allProtomeks) {
popup.add(protoMenu(clientGui, allProtomeks, listener, joinedEntities));
}

Expand Down Expand Up @@ -326,40 +326,56 @@ private static JMenu loadMenu(ClientGUI cg, boolean enabled, ActionListener list
private static JMenu protoMenu(ClientGUI cg, boolean enabled, ActionListener listener,
Collection<Entity> entities) {
JMenu menu = new JMenu("Load ProtoMek");
if (enabled && entities.stream().anyMatch(e -> e.hasETypeFlag(Entity.ETYPE_PROTOMECH))) {
Entity entity = entities.stream().filter(e -> e.hasETypeFlag(Entity.ETYPE_PROTOMECH)).findAny().get();
for (Entity loader: cg.getClient().getGame().getEntitiesVector()) {
if (!loader.hasETypeFlag(Entity.ETYPE_MECH) || !loader.canLoad(entity, false)) {
continue;
}
Transporter front = null;
Transporter rear = null;
for (Transporter t : loader.getTransports()) {
if (t instanceof ProtomechClampMount) {
if (((ProtomechClampMount) t).isRear()) {
rear = t;
} else {
front = t;
}
if(!(enabled || entities.stream().allMatch(e -> e.hasETypeFlag(Entity.ETYPE_PROTOMECH)))){
return menu;
}

Game game = cg.getClient().getGame();
Entity entity = entities.stream().filter(e -> e.hasETypeFlag(Entity.ETYPE_PROTOMECH)).findAny().get();
List<Entity> loaders = game.getEntitiesVector();

// Handle front and rear Magnetic Clamp Mounts
for (Entity loader: loaders) {
if (!loader.hasETypeFlag(Entity.ETYPE_MECH)) {
continue;
}
Transporter front = null;
Transporter rear = null;
for (Transporter t : loader.getTransports()) {
if (t instanceof ProtomechClampMount) {
if (((ProtomechClampMount) t).isRear()) {
rear = t;
} else {
front = t;
}
}
JMenu loaderMenu = new JMenu(loader.getShortName());
if ((front != null) && front.canLoad(entity)
&& ((entity.getWeightClass() < EntityWeightClass.WEIGHT_SUPER_HEAVY)
|| (rear == null) || rear.getLoadedUnits().isEmpty())) {
loaderMenu.add(menuItem("Onto Front", LMP_LOAD + "|" + loader.getId() + ":0" + enToken(entities), enabled, listener));
}
boolean frontUltra = (front != null)
&& front.getLoadedUnits().stream()
.anyMatch(l -> l.getWeightClass() == EntityWeightClass.WEIGHT_SUPER_HEAVY);
if ((rear != null) && rear.canLoad(entity) && !frontUltra) {
loaderMenu.add(menuItem("Onto Rear", LMP_LOAD + "|" + loader.getId() + ":1" + enToken(entities), enabled, listener));
}
if (loaderMenu.getItemCount() > 0) {
menu.add(loaderMenu);
}
}
JMenu loaderMenu = new JMenu(loader.getShortName());
if ((front != null) && front.canLoad(entity)
&& ((entity.getWeightClass() < EntityWeightClass.WEIGHT_SUPER_HEAVY)
|| (rear == null) || rear.getLoadedUnits().isEmpty())) {
loaderMenu.add(menuItem("Onto Front", LMP_LOAD + "|" + loader.getId() + ":0" + enToken(entities), enabled, listener));
}
boolean frontUltra = (front != null)
&& front.getLoadedUnits().stream()
.anyMatch(l -> l.getWeightClass() == EntityWeightClass.WEIGHT_SUPER_HEAVY);
if ((rear != null) && rear.canLoad(entity) && !frontUltra) {
loaderMenu.add(menuItem("Onto Rear", LMP_LOAD + "|" + loader.getId() + ":1" + enToken(entities), enabled, listener));
}
if (loaderMenu.getItemCount() > 0) {
menu.add(loaderMenu);
}
}

// Handle all other valid loaders, such as Dropships
loaders.stream()
.filter(e -> !e.isCapitalFighter(true))
.filter(e -> !entities.contains(e))
.filter(e -> canLoadAll(e, entities))
.forEach(e -> menu.add(menuItem(
"<HTML>" + e.getShortNameRaw() + idString(game, e.getId()),
LMP_LOAD + "|" + e.getId() + ":-1" + enToken(entities), enabled, listener)));

menu.setEnabled(enabled && (menu.getItemCount() > 0));
return menu;
}
Expand Down
6 changes: 3 additions & 3 deletions megamek/src/megamek/common/ProtomechBay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public boolean canLoad(Entity unit) {
if (doors <= loadedThisTurn) {
result = false;
}

// Return our result.
return result;
}
Expand Down Expand Up @@ -104,14 +104,14 @@ public String toString() {
bayNumber
);
}

public static TechAdvancement techAdvancement() {
return new TechAdvancement(TECH_BASE_CLAN).setClanAdvancement(3060, 3066, 3070)
.setClanApproximate(true, false, false).setTechRating(RATING_C)
.setAvailability(RATING_X, RATING_X, RATING_D, RATING_D)
.setStaticTechLevel(SimpleTechLevel.STANDARD);
}

@Override
public TechAdvancement getTechAdvancement() {
return ProtomechBay.techAdvancement();
Expand Down
3 changes: 3 additions & 0 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 @@ -1193,7 +1193,10 @@ protected void addTransports(Entity e) throws EntityLoadingException {
pbi = new ParsedBayInfo(numbers, usedBayNumbers);
e.addTransporter(new Bay(pbi.getSize(), pbi.getDoors(), pbi.getBayNumber()), isPod);
break;
case "protomekbay":
// Newer custom BLK handling
case "protomechbay":
// Backward compatibility
pbi = new ParsedBayInfo(numbers, usedBayNumbers);
e.addTransporter(new ProtomechBay(pbi.getSize(), pbi.getDoors(), pbi.getBayNumber()), isPod);
break;
Expand Down