Skip to content

Commit

Permalink
Merge pull request #6051 from DM0000/DM-5991
Browse files Browse the repository at this point in the history
#5991  Mix tech mech not showing origin of weapon equipped.
  • Loading branch information
HammerGS authored Oct 2, 2024
2 parents c7f66e8 + 018e993 commit 6f0cc13
Showing 1 changed file with 6 additions and 2 deletions.
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

0 comments on commit 6f0cc13

Please sign in to comment.