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

#5991 Mix tech mech not showing origin of weapon equipped. #6051

Merged
merged 1 commit into from
Oct 2, 2024
+6 −2
Merged

#5991 Mix tech mech not showing origin of weapon equipped. #6051

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions megamek/src/megamek/client/ui/swing/unitDisplay/WeaponPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ public String getElementAt(int index) {
StringBuilder wn = new StringBuilder(mounted.getDesc());
wn.append(" [");
wn.append(en.getLocationAbbr(mounted.getLocation()));
//Check if mixedTech and add Clan or IS tag
if (en.isMixedTech()) {
wn.insert(0, wtype.isClan() ? "(C) " : "(IS) ");
}
if (mounted.isSplit()) {
wn.append('/');
wn.append(en.getLocationAbbr(mounted.getSecondLocation()));
Expand Down Expand Up @@ -1371,7 +1375,7 @@ public int getSelectedWeaponNum() {

/**
* Selects the first valid weapon in the weapon list.
*
*
* @return The weapon id of the weapon selected
*/
public int selectFirstWeapon() {
Expand Down Expand Up @@ -2794,7 +2798,7 @@ public void preferenceChange(PreferenceChangeEvent e) {
* Updates the Weapon Panel with the information for the given entity. If the
* given entity
* is `null`, this method will do nothing.
*
*
* @param entity - The weapon panel will update info based on the {@link Entity}
* provided.
*/
Expand Down