Skip to content

Commit

Permalink
Merge pull request #4935 from IllianiCBT/toe_mekNames
Browse files Browse the repository at this point in the history
Added Further Portrait <50.01 Compatibility Handlers
  • Loading branch information
HammerGS authored Oct 2, 2024
2 parents db9e86e + b7a348c commit bbd85b8
Show file tree
Hide file tree
Showing 97 changed files with 7 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,15 @@
*/
package mekhq.campaign.personnel.generator;

import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;

import megamek.common.Compute;
import megamek.common.icons.Portrait;
import megamek.logging.MMLogger;
import mekhq.MHQStaticDirectoryManager;
import mekhq.campaign.personnel.Person;

import java.io.File;
import java.util.*;

public class RandomPortraitGenerator {
private static final MMLogger logger = MMLogger.create(RandomPortraitGenerator.class);

Expand All @@ -52,7 +47,7 @@ public static Portrait generate(Collection<Person> personnel, Person p) {
// duplicates
Set<String> existingPortraits = new HashSet<>();
for (Person existingPerson : personnel) {
existingPortraits.add(existingPerson.getPortrait().getCategory() + ":"
existingPortraits.add(existingPerson.getPortrait().getCategory() + ':'
+ existingPerson.getPortrait().getFilename());
}

Expand All @@ -72,6 +67,8 @@ public static Portrait generate(Collection<Person> personnel, Person p) {
searchCat_RoleGroup = "Admin";
} else if (p.getPrimaryRole().isVesselCrew()) {
searchCat_RoleGroup = "Vessel Crew";
} else if (p.getPrimaryRole().isVehicleCrewMember()) {
searchCat_RoleGroup = "Vehicle Crew";
} else if (p.getPrimaryRole().isTech()) {
searchCat_RoleGroup = "Tech";
} else if (p.getPrimaryRole().isMedicalStaff()) {
Expand Down Expand Up @@ -134,7 +131,7 @@ private static List<String> getPossibleRandomPortraits(final Set<String> existin

final Iterator<String> names = MHQStaticDirectoryManager.getPortraits().getItemNames(category);
while (names.hasNext()) {
final String location = category + ":" + names.next();
final String location = category + ':' + names.next();
if (existingPortraits.contains(location)) {
continue;
}
Expand Down

0 comments on commit bbd85b8

Please sign in to comment.