Skip to content

Commit

Permalink
Merge pull request #4896 from IllianiCBT/opFor_camouflageSelector
Browse files Browse the repository at this point in the history
Fixed Random-Camouflage Path Handling for Alternate Directory Format
  • Loading branch information
HammerGS authored Sep 26, 2024
2 parents 50ed32c + d355253 commit 5337910
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion MekHQ/src/mekhq/campaign/mission/AtBContract.java
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ public void initContractDetails(Campaign campaign) {
public static Camouflage pickRandomCamouflage(int currentYear, String factionCode) {
// Define the root directory and get the faction-specific camouflage directory
final String ROOT_DIRECTORY = "data/images/camo/";

String camouflageDirectory = getCamouflageDirectory(currentYear, factionCode);

// Use Java File to represent directories
Expand Down Expand Up @@ -242,7 +243,8 @@ public static Camouflage pickRandomCamouflage(int currentYear, String factionCod
File randomFile = allFiles.get(new Random().nextInt(allFiles.size()));

String fileName = randomFile.getName();
String fileCategory = randomFile.getParent().replaceAll(ROOT_DIRECTORY, "");
String fileCategory = randomFile.getParent().replaceAll("\\\\", "/");
fileCategory = fileCategory.replaceAll(ROOT_DIRECTORY, "");

return new Camouflage(fileCategory, fileName);
} else {
Expand Down

0 comments on commit 5337910

Please sign in to comment.