From 7e9f23f8ea73c0f84bfb5cf7c81eb1a581b54d52 Mon Sep 17 00:00:00 2001
From: Kyle <66798345+KingslayerKyle@users.noreply.github.com>
Date: Sat, 10 Jun 2023 20:42:02 +0100
Subject: [PATCH] Fixed CoD Specular/Albedo (World War II)

Specular/Albedo for WW2 fails to process as it's expecting a different file name
---
 .../GameImageUtil/data/scripts/CoDSplitCSProcessor.cs_script  | 4 ++--
 .../data/scripts/CoDWW2GreenImageProcessor.cs_script          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/GameImageUtil/GameImageUtil/data/scripts/CoDSplitCSProcessor.cs_script b/src/GameImageUtil/GameImageUtil/data/scripts/CoDSplitCSProcessor.cs_script
index 8def263..ef442ea 100644
--- a/src/GameImageUtil/GameImageUtil/data/scripts/CoDSplitCSProcessor.cs_script
+++ b/src/GameImageUtil/GameImageUtil/data/scripts/CoDSplitCSProcessor.cs_script
@@ -54,7 +54,7 @@ namespace GameImageUtil
             if(!config.ViewModel.Extensions.Contains(Path.GetExtension(file).ToUpper()))
                 return;
 
-            var maskPath = Path.Combine(Path.GetDirectoryName(file), Path.GetFileNameWithoutExtension(file) + "_s" + Path.GetExtension(file));
+            var maskPath = Path.Combine(Path.GetDirectoryName(file), string.Join("_", Path.GetFileNameWithoutExtension(file).Substring(0, Path.GetFileNameWithoutExtension(file).LastIndexOf('_')).Remove(0, 4).Split(new string[] { "~" }, StringSplitOptions.None)[0]).Replace('~', '_').Replace('&', '_').Replace('$', '_').Replace('-', '_') + "_s" + Path.GetExtension(file));
 
             if (!File.Exists(maskPath))
                 throw new ArgumentException("Failed to locate mask image for CoDSplitCSProcessor", "maskPath");
@@ -67,7 +67,7 @@ namespace GameImageUtil
                 var outputPath = config.GetValue("OutputPath", "");
 
                 if (string.IsNullOrWhiteSpace(outputPath))
-                    outputPath = Path.Combine(Path.GetDirectoryName(file), string.Join("_", Path.GetFileNameWithoutExtension(file).Replace("~&-", "").Split(new string[] { "~" }, StringSplitOptions.None)).Replace('~', '_').Replace('&', '_').Replace('$', '_').Replace('-', '_'));
+                    outputPath = Path.Combine(Path.GetDirectoryName(file), string.Join("_", Path.GetFileNameWithoutExtension(file).Substring(0, Path.GetFileNameWithoutExtension(file).LastIndexOf('_')).Remove(0, 4).Split(new string[] { "~" }, StringSplitOptions.None)[0]).Replace('~', '_').Replace('&', '_').Replace('$', '_').Replace('-', '_'));
 
                 // Force the image to a standard format
                 inputImage.ConvertImage(ScratchImage.DXGIFormat.R8G8B8A8UNORM);
diff --git a/src/GameImageUtil/GameImageUtil/data/scripts/CoDWW2GreenImageProcessor.cs_script b/src/GameImageUtil/GameImageUtil/data/scripts/CoDWW2GreenImageProcessor.cs_script
index 2b121ad..7f61574 100644
--- a/src/GameImageUtil/GameImageUtil/data/scripts/CoDWW2GreenImageProcessor.cs_script
+++ b/src/GameImageUtil/GameImageUtil/data/scripts/CoDWW2GreenImageProcessor.cs_script
@@ -54,7 +54,7 @@ namespace GameImageUtil
                 var outputPath = config.GetValue("OutputPath", "");
 
                 if (string.IsNullOrWhiteSpace(outputPath))
-                    outputPath = Path.Combine(Path.GetDirectoryName(file), string.Join("_", Path.GetFileNameWithoutExtension(file).Replace("~&-", "").Split(new string[] { "~" }, StringSplitOptions.None)).Replace('~', '_').Replace('&', '_').Replace('$', '_').Replace('-', '_'));
+                    outputPath = Path.Combine(Path.GetDirectoryName(file), string.Join("_", Path.GetFileNameWithoutExtension(file).Substring(0, Path.GetFileNameWithoutExtension(file).LastIndexOf('_')).Remove(0, 4).Split(new string[] { "~" }, StringSplitOptions.None)[0]).Replace('~', '_').Replace('&', '_').Replace('$', '_').Replace('-', '_'));
 
                 // Force the image to a standard format
                 inputImage.ConvertImage(ScratchImage.DXGIFormat.R8G8B8A8UNORM);