Manual Invictus Install Option

Adds an option to specify a manual installation for Invictus, while improving the Steam Default option by checking the D:, E:, and F: drives. Both options now will automatically log an error if the hybrid option is selected and Invictus cannot be found.

Author: DrDudelsack

BaToImperator/DataFiles/Fronter/fronter-options.txt

@@ -10,17 +10,17 @@ option = {
 			default = true
 		}
 		radioOption = {
-			name = yes
-			displayName = HYBRIDYES
-			tooltip = HYBRIDYESTIP
+			name = invictus
+			displayName = HYBRIDINV
+			tooltip = HYBRIDINVTIP
 			default = false
 		}
 	}
 }
 
 option = {
 	name = invictusDir
-	displayName = INVICTUSDIROPTION
+	displayName = INVICTUSDIR
 	tooltip = INVICTUSDIRTIP
 	radioSelector = {
 		radioOption = {
@@ -29,6 +29,12 @@ option = {
 			tooltip = INVICTUSDIRDEFAULTTIP
 			default = true
 		}
+		radioOption = {
+			name = custom
+			displayName = INVICTUSDIRCUSTOM
+			tooltip = INVICTUSDIRCUSTOMTIP
+			default = true
+		}
 	}
 }
 

BaToImperator/DataFiles/Fronter/options_l_english.yml

@@ -7,13 +7,15 @@ l_english:
  HYBRIDOPTIONTIP: "Instead of creating a standalone mod based on vanilla, would you prefer to have the converter create a sub-mod for Imperator:Invictus"
  HYBRIDNO: "No"
  HYBRIDNOTIP: "The output will be a standalone mod based on vanilla."
- HYBRIDYES: "Yes (Requires Invictus)"
- HYBRIDYESTIP: "The output will be a sub-mod for Imperator:Invictus."
+ HYBRIDINV: "Yes (Requires Invictus)"
+ HYBRIDINVTIP: "The output will be a sub-mod for Imperator:Invictus."
 
- INVICTUSDIROPTION: "Invictus Directory"
- INVICTUSDIROPTIONTIP: "If hybridizing with Invictus, what directory is that mod located in?"
+ INVICTUSDIR: "Invictus Directory"
+ INVICTUSDIRTIP: "If hybridizing with Invictus, what directory is that mod located in?"
  INVICTUSDIRDEFAULT: "Steam Default"
  INVICTUSDIRDEFAULTTIP: "The converter will look for Invictus in your Steam Workshop folder."
+ INVICTUSDIRCUSTOM: "Custom Installation"
+ INVICTUSDIRCUSTOMTIP: "The converter will use the directory specified in BaToImperator\configurables\modDirectories.txt. Useful for manual and non-Steam installations."
 
  ANTAGONISTOPTION: "Convert Antagonists"
  ANTAGONISTOPTIONTIP: "Certain AI countries have a hidden modifier which makes them much stronger and highly aggressive. Should those countries which had it in BA also have it carried over to I:R?"

BaToImperator/DataFiles/configurables/modDirectories.txt

@@ -0,0 +1,5 @@
+#Specify where your custom Imperator:Invictus installation is located to the right of "invictus,"
+#Otherwise, it will be impossible to hybridize with Invictus!
+#By default, mods are stored in C:\Users\<USER>\Documents\Paradox Interactive\Imperator\mod
+
+invictus,C:\Users\<USER>\Documents\Paradox Interactive\Imperator\mod\Invictus\

BaToImperator/src/main/java/com/paradoxgameconverters/batoir/Main.java

@@ -199,15 +199,49 @@ public static void main (String[] args) throws IOException
 
             int splitSize = empireRank+800;
 
+            ArrayList<String> customModInstalls = Importer.importBasicFile("configurables/modDirectories.txt");
+            
             boolean invictus = false;
-            if (configDirectories[7].equals("yes")) { //if Invictus hybridization is enabled
+            if (configDirectories[7].equals("invictus")) { //if Invictus hybridization is enabled
                 invictus = true;
             }
 
             String invictusDir = "";
-            if (configDirectories[8].equals("default")){ //default directory for Invictus
-                invictusDir = "C:/Program Files (x86)/Steam/steamapps/workshop/content/859580/2532715348";
-            } 
+            if (configDirectories[8].equals("default") && invictus){ //default directory for Invictus
+                String steamInvDir = ":/Program Files (x86)/Steam/steamapps/workshop/content/859580/2532715348";
+                int dirCount = 0;
+                int dirCountMax = 4;
+                while (dirCount < dirCountMax) {
+                    String invictusDirLetter = "C";
+                    if (dirCount == 1) {
+                        invictusDirLetter = "D";
+                    } else if (dirCount == 2) {
+                        invictusDirLetter = "E";
+                    } else if (dirCount == 3) {
+                        invictusDirLetter = "F";
+                    }
+                    invictusDir = invictusDirLetter+steamInvDir;
+                    LOGGER.info("Checking for Invictus on the "+invictusDirLetter+": drive...");
+                    File invictusTest = new File(invictusDir);
+                    if (invictusTest.isDirectory()) {
+                        LOGGER.info("Invictus found on the "+invictusDirLetter+": drive!");
+                        dirCount = dirCountMax + 1;
+                    }
+                    dirCount = dirCount + 1;
+                    if (dirCount == dirCountMax) {
+                        LOGGER.severe("Unable to detect Invictus! If you have a custom or non-Steam installation, select the 'Custom Installation' Invictus Directory option before converting.");
+                    }
+                }
+                
+            } else if (configDirectories[8].equals("custom")){ //default directory for Invictus
+                invictusDir = Output.cultureOutput(customModInstalls,"invictus");
+                File invictusTest = new File(invictusDir);
+                if (invictusTest.isDirectory()) {
+                    LOGGER.info("Invictus found!");
+                } else {
+                    LOGGER.severe("Unable to detect Invictus at "+invictusDir+"");
+                }
+            }
 
             String mappingDir = "configurables/vanilla/";
             if (invictus) {