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

Jump to bottom

Various Mek crit table improvements #1646

Merged
merged 3 commits into from
Oct 29, 2024
Merged

Various Mek crit table improvements #1646

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
3b1cc21
Refresh equipment list on myomer change
pavelbraginskiy Oct 28, 2024
e03599b
Allow moving slots of fixed equipment within a location
pavelbraginskiy Oct 28, 2024
48b29e1
Sort RISC SCM after other equipment
pavelbraginskiy Oct 28, 2024
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
56 changes: 38 additions & 18 deletions megameklab/src/megameklab/ui/mek/BMCriticalTransferHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.StringSelection;
import java.awt.datatransfer.Transferable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Vector;
import java.util.*;

import javax.swing.JComboBox;
import javax.swing.JComponent;
Expand Down Expand Up @@ -131,7 +127,7 @@
// It's obvious that the equipment can't be placed on an occupied slot, so in
// that case
// a good free slot can be chosen in the location
if (freePrimarySlots == 0) {
if (freePrimarySlots < neededTotalSlots) {
int maxSpace = MekUtil.getMaxContiguousNumOfCrits(mek, location, true);
slotNumber = MekUtil.findSlotWithContiguousNumOfCrits(mek, location, maxSpace);
freePrimarySlots = MekUtil.availableContiguousCrits(mek, location, slotNumber, true);
Expand Down Expand Up @@ -221,16 +217,33 @@
}

try {
Mounted<?> eq = getUnit().getEquipment(Integer.parseInt(
(String) t.getTransferData(DataFlavor.stringFlavor)));
var data = (String) t.getTransferData(DataFlavor.stringFlavor);
boolean fixedEquipment = false;
int fixedLocation = Entity.LOC_NONE;
Mounted<?> eq;
if (!data.contains(":")) {
eq = getUnit().getEquipment(Integer.parseInt(data));
} else {
fixedEquipment = true;
var parts = Arrays.stream(data.split(":")).mapToInt(Integer::parseInt).toArray();

Check notice

Code scanning / CodeQL

Missing catch of NumberFormatException Note

Potential uncaught 'java.lang.NumberFormatException'.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll let someone comment or fix before merging.

eq = getUnit().getEquipment(parts[0]);
fixedLocation = parts[1];
if (fixedLocation != location) {
PopupMessages.showInvalidLocationInfo(null, eq.getName(), getUnit().getLocationName(location));
return false;
}
}

// If this equipment is already mounted, clear the criticals it's mounted in
if (eq.getLocation() != Entity.LOC_NONE
|| eq.getSecondLocation() != Entity.LOC_NONE) {
UnitUtil.removeCriticals(getUnit(), eq);
UnitUtil.changeMountStatus(getUnit(), eq, Entity.LOC_NONE, -1, false);
if (!fixedEquipment) {
if (eq.getLocation() != Entity.LOC_NONE || eq.getSecondLocation() != Entity.LOC_NONE) {
UnitUtil.removeCriticals(getUnit(), eq);
UnitUtil.changeMountStatus(getUnit(), eq, Entity.LOC_NONE, -1, false);
} else {
eq.setOmniPodMounted(UnitUtil.canPodMount(getUnit(), eq));
}
} else {
eq.setOmniPodMounted(UnitUtil.canPodMount(getUnit(), eq));
UnitUtil.removeCriticals(getUnit(), eq, fixedLocation);
}

StringBuffer errors = new StringBuffer();
Expand Down Expand Up @@ -286,7 +299,7 @@
// check if the dragged mounted should be transferrable
Mounted<?> mounted = null;
try {
int index = Integer.parseInt((String) info.getTransferable().getTransferData(DataFlavor.stringFlavor));
int index = Integer.parseInt(((String) info.getTransferable().getTransferData(DataFlavor.stringFlavor)).split(":")[0]);
mounted = getUnit().getEquipment(index);
} catch (Exception e) {
logger.error("", e);
Expand All @@ -295,23 +308,30 @@
if (mounted == null) {
return false;
}
// stuff that has a fixed location is also not transferable
return !UnitUtil.isFixedLocationSpreadEquipment(mounted.getType());

return true;
}

@Override
protected Transferable createTransferable(JComponent c) {
Mounted<?> mount = null;
int location = Entity.LOC_NONE;
if (c instanceof JTable) {
JTable table = (JTable) c;
mount = (Mounted<?>) table.getModel().getValueAt(table.getSelectedRow(), CriticalTableModel.EQUIPMENT);
} else if (c instanceof BAASBMDropTargetCriticalList) {
BAASBMDropTargetCriticalList<?> list = (BAASBMDropTargetCriticalList<?>) c;
mount = list.getMounted();
location = list.getCritLocation();
}
if (mount != null) {
parentView.markUnavailableLocations(mount);
return new StringSelection(Integer.toString(getUnit().getEquipmentNum(mount)));
if (UnitUtil.isFixedLocationSpreadEquipment(mount.getType())) {
parentView.markUnavailableLocations(location);
return new StringSelection("%d:%d".formatted(getUnit().getEquipmentNum(mount), location));
} else {
parentView.markUnavailableLocations(mount);
return new StringSelection(Integer.toString(getUnit().getEquipmentNum(mount)));
}
} else {
return null;
}
Expand Down
9 changes: 9 additions & 0 deletions megameklab/src/megameklab/ui/mek/BMCriticalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,15 @@ private String caseSuffix(int location) {
}
}

/**
* Darkens all crit blocks other than the one for the given location
*/
public void markUnavailableLocations(int location) {
currentCritBlocks.stream()
.filter(b -> b.getCritLocation() != location)
.forEach(b -> b.setDarkened(true));
}

/**
* Darkens all crit blocks that are unavailable to the given equipment, e.g. all but Torsos for CASE.
*/
Expand Down
1 change: 1 addition & 0 deletions megameklab/src/megameklab/ui/mek/BMStructureTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,6 +930,7 @@ public void enhancementChanged(EquipmentType enhancement) {
refresh.refreshPreview();
refresh.refreshStatus();
refresh.refreshSummary();
refresh.refreshEquipment();
}

@Override
Expand Down
12 changes: 7 additions & 5 deletions megameklab/src/megameklab/util/MekUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,16 +1150,18 @@ public static int getCoarseOrdering(Mek mek, Mounted<?> mounted) {
return 4;
} else if (mounted.getType() instanceof AmmoType) {
return 5;
} else if (mounted.getType().isHittable()) {
} else if (mounted.getType().isHittable() && !mounted.getType().hasFlag(MiscType.F_SCM)) {
return 6;
} else if (isCASE(mounted)) {
} else if(mounted.getType().hasFlag(MiscType.F_SCM)) {
return 7;
} else if (EquipmentType.isStructureType(mounted.getType())) {
} else if (isCASE(mounted)) {
return 8;
} else if (EquipmentType.isArmorType(mounted.getType())) {
} else if (EquipmentType.isStructureType(mounted.getType())) {
return 9;
} else {
} else if (EquipmentType.isArmorType(mounted.getType())) {
return 10;
} else {
return 11;
}
}

Expand Down
33 changes: 33 additions & 0 deletions megameklab/src/megameklab/util/UnitUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,39 @@ public static void removeCriticals(Entity unit, Mounted<?> eq) {
}
}

/**
* Sets the corresponding critical slots to null for the Mounted object in the given location.
*
* @param unit The entity
* @param eq The equipment to test
* @param loc The location to remove crits from.
*/
public static void removeCriticals(Entity unit, Mounted<?> eq, int loc) {
if (eq.getLocation() == Entity.LOC_NONE) {
return;
}
for (int slot = 0; slot < unit.getNumberOfCriticals(loc); slot++) {
CriticalSlot cs = unit.getCritical(loc, slot);
if ((cs != null)
&& (cs.getType() == CriticalSlot.TYPE_EQUIPMENT)) {
if (cs.getMount().equals(eq)) {
// If there are two pieces of equipment in this slot,
// remove first one, and replace it with the second
if (cs.getMount2() != null) {
cs.setMount(cs.getMount2());
cs.setMount2(null);
} else { // If it's the only Mounted, clear the slot
cs = null;
unit.setCritical(loc, slot, cs);
}
} else if ((cs.getMount2() != null)
&& cs.getMount2().equals(eq)) {
cs.setMount2(null);
}
}
}
}

public static void addMounted(Entity unit, Mounted<?> mounted, int loc, boolean rearMounted)
throws LocationFullException {
unit.addEquipment(mounted, loc, rearMounted);
Expand Down