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

Fixed Random-Camouflage Path Handling for Alternate Directory Format #4896

Merged
merged 4 commits into from
Sep 26, 2024
Merged

Fixed Random-Camouflage Path Handling for Alternate Directory Format #4896

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c76d1b5
Fixed Random-Camouflage Path Handling for Alternate Directory Format
IllianiCBT Sep 26, 2024
65f94ac
Fix typo in ROOT_DIRECTORY_ALTERNATE path
IllianiCBT Sep 26, 2024
02e9dfe
Remove redundant path handling logic
IllianiCBT Sep 26, 2024
d355253
Fix file path separator in AtBContract
IllianiCBT Sep 26, 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
4 changes: 3 additions & 1 deletion MekHQ/src/mekhq/campaign/mission/AtBContract.java
View file
Open in desktop
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