Browse Source

audio mapping

Laserlicht 1 year ago
parent
commit
e5f05d61ae
2 changed files with 57 additions and 55 deletions
  1. 55 55
      config/campaignOverrides.json
  2. 2 0
      launcher/modManager/cmodlistview_moc.cpp

+ 55 - 55
config/campaignOverrides.json

@@ -19,14 +19,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc1_ABvoFL4" },
-			{ "voiceProlog": "Hc1_H3x2UAe" },
-			{ "voiceProlog": "Hc1_H3x2BBa" },
-			{ "voiceProlog": "Hc1_H3x2RNd" },
+			{ "voiceProlog": "Hc1_ABVOFL4" },
+			{ "voiceProlog": "Hc1_H3X2UAE" },
+			{ "voiceProlog": "Hc1_H3X2BBA" },
+			{ "voiceProlog": "Hc1_H3X2RND" },
 			{ "voiceProlog": "Hc1_G1C" },
 			{ "voiceProlog": "Hc1_G2C" },
-			{ "voiceProlog": "Hc1_ABvoFL3" },
-			{ "voiceProlog": "Hc1_H3x2BBf", "voiceEpilog": "Hc1_N1C_D" }
+			{ "voiceProlog": "Hc1_ABVOFL3" },
+			{ "voiceProlog": "Hc1_H3X2BBF", "voiceEpilog": "Hc1_N1C_D" }
 		],
 		"loadingBackground": "Hc1_LoadBar",
 		"introVideoRim": "Hc1_INTRORIM",
@@ -52,14 +52,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc2_ABvoFL4" },
-			{ "voiceProlog": "Hc2_H3x2UAe" },
-			{ "voiceProlog": "Hc2_H3x2BBa" },
-			{ "voiceProlog": "Hc2_H3x2RNd" },
-			{ "voiceProlog": "Hc2_G1C" },
-			{ "voiceProlog": "Hc2_G2C" },
-			{ "voiceProlog": "Hc2_ABvoFL3" },
-			{ "voiceProlog": "Hc2_H3x2BBf", "voiceEpilog": "Hc2_N1C_D" }
+			{ "voiceProlog": "Hc2_H3X2ELB" },
+			{ "voiceProlog": "Hc2_H3X2NBA" },
+			{ "voiceProlog": "Hc2_H3X2RNA" },
+			{ "voiceProlog": "Hc2_ABVOAB8" },
+			{ "voiceProlog": "Hc2_H3X2UAL" },
+			{ "voiceProlog": "Hc2_E1A" },
+			{ "voiceProlog": "Hc2_ABVOAB2" },
+			{ "voiceProlog": "Hc2_G1A", "voiceEpilog": "Hc2_S1C" }
 		],
 		"loadingBackground": "Hc2_LoadBar",
 		"introVideoRim": "Hc2_INTRORIM",
@@ -85,14 +85,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc3_ABvoFL4" },
-			{ "voiceProlog": "Hc3_H3x2UAe" },
-			{ "voiceProlog": "Hc3_H3x2BBa" },
-			{ "voiceProlog": "Hc3_H3x2RNd" },
-			{ "voiceProlog": "Hc3_G1C" },
 			{ "voiceProlog": "Hc3_G2C" },
-			{ "voiceProlog": "Hc3_ABvoFL3" },
-			{ "voiceProlog": "Hc3_H3x2BBf", "voiceEpilog": "Hc3_N1C_D" }
+			{ "voiceProlog": "Hc3_ABVOAB1" },
+			{ "voiceProlog": "Hc3_G2D" },
+			{ "voiceProlog": "Hc3_E1B" },
+			{ "voiceProlog": "Hc3_ABVOAB2" },
+			{ "voiceProlog": "Hc3_ABVOAB4" },
+			{ "voiceProlog": "Hc3_ABVOAB6" },
+			{ "voiceProlog": "Hc3_G3B", "voiceEpilog": "Hc3_ABVOFL2" }
 		],
 		"loadingBackground": "Hc3_LoadBar",
 		"introVideoRim": "Hc3_INTRORIM",
@@ -118,14 +118,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc4_ABvoFL4" },
-			{ "voiceProlog": "Hc4_H3x2UAe" },
-			{ "voiceProlog": "Hc4_H3x2BBa" },
-			{ "voiceProlog": "Hc4_H3x2RNd" },
-			{ "voiceProlog": "Hc4_G1C" },
-			{ "voiceProlog": "Hc4_G2C" },
-			{ "voiceProlog": "Hc4_ABvoFL3" },
-			{ "voiceProlog": "Hc4_H3x2BBf", "voiceEpilog": "Hc4_N1C_D" }
+			{ "voiceProlog": "Hc4_ABVOAB1" },
+			{ "voiceProlog": "Hc4_ABVODB4" },
+			{ "voiceProlog": "Hc4_H3X2ELC" },
+			{ "voiceProlog": "Hc4_ABVODS2" },
+			{ "voiceProlog": "Hc4_ABVODS1" },
+			{ "voiceProlog": "Hc4_ABVODS3" },
+			{ "voiceProlog": "Hc4_ABVODS4" },
+			{ "voiceProlog": "Hc4_H3X2NBD", "voiceEpilog": "Hc4_S1C" }
 		],
 		"loadingBackground": "Hc4_LoadBar",
 		"introVideoRim": "Hc4_INTRORIM",
@@ -148,11 +148,11 @@
 		},
 		"scenarioCount": 5,
 		"scenarios": [
-			{ "voiceProlog": "Hc5_ABvoFL4" },
-			{ "voiceProlog": "Hc5_H3x2UAe" },
-			{ "voiceProlog": "Hc5_H3x2BBa" },
-			{ "voiceProlog": "Hc5_H3x2RNd" },
-			{ "voiceProlog": "Hc5_G1C" }
+			{ "voiceProlog": "Hc5_ABVOAB1" },
+			{ "voiceProlog": "Hc5_H3X2RNA" },
+			{ "voiceProlog": "Hc5_ABVOFL2" },
+			{ "voiceProlog": "Hc5_ABVOFL4" },
+			{ "voiceProlog": "Hc5_H3X2UAH", "voiceEpilog": "Hc5_N1C_D"  }
 		],
 		"loadingBackground": "Hc5_LoadBar",
 		"introVideoRim": "Hc5_INTRORIM",
@@ -175,11 +175,11 @@
 		},
 		"scenarioCount": 5,
 		"scenarios": [
-			{ "voiceProlog": "Hc6_ABvoFL4" },
-			{ "voiceProlog": "Hc6_H3x2UAe" },
-			{ "voiceProlog": "Hc6_H3x2BBa" },
-			{ "voiceProlog": "Hc6_H3x2RNd" },
-			{ "voiceProlog": "Hc6_G1C" }
+			{ "voiceProlog": "Hc6_H3X2ELB" },
+			{ "voiceProlog": "Hc6_E1A" },
+			{ "voiceProlog": "Hc6_H3X2BBA" },
+			{ "voiceProlog": "Hc6_ABVOAB2" },
+			{ "voiceProlog": "Hc6_ABVOAB5", "voiceEpilog": "Hc6_ABVODB2"  }
 		],
 		"loadingBackground": "Hc6_LoadBar",
 		"introVideoRim": "Hc6_INTRORIM",
@@ -205,14 +205,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc7_ABvoFL4" },
-			{ "voiceProlog": "Hc7_H3x2UAe" },
-			{ "voiceProlog": "Hc7_H3x2BBa" },
-			{ "voiceProlog": "Hc7_H3x2RNd" },
-			{ "voiceProlog": "Hc7_G1C" },
-			{ "voiceProlog": "Hc7_G2C" },
-			{ "voiceProlog": "Hc7_ABvoFL3" },
-			{ "voiceProlog": "Hc7_H3x2BBf", "voiceEpilog": "Hc7_N1C_D" }
+			{ "voiceProlog": "Hc7_ABVOFL2" },
+			{ "voiceProlog": "Hc7_ABVOFL3" },
+			{ "voiceProlog": "Hc7_N1C_D" },
+			{ "voiceProlog": "Hc7_S1C" },
+			{ "voiceProlog": "Hc7_H3X2UAB" },
+			{ "voiceProlog": "Hc7_E2C" },
+			{ "voiceProlog": "Hc7_H3X2NBE" },
+			{ "voiceProlog": "Hc7_ABVOFW4", "voiceEpilog": "Hc7_ABVOAB1" }
 		],
 		"loadingBackground": "Hc7_LoadBar",
 		"introVideoRim": "Hc7_INTRORIM",
@@ -238,14 +238,14 @@
 		},
 		"scenarioCount": 8,
 		"scenarios": [
-			{ "voiceProlog": "Hc8_ABvoFL4" },
-			{ "voiceProlog": "Hc8_H3x2UAe" },
-			{ "voiceProlog": "Hc8_H3x2BBa" },
-			{ "voiceProlog": "Hc8_H3x2RNd" },
-			{ "voiceProlog": "Hc8_G1C" },
-			{ "voiceProlog": "Hc8_G2C" },
-			{ "voiceProlog": "Hc8_ABvoFL3" },
-			{ "voiceProlog": "Hc8_H3x2BBf", "voiceEpilog": "Hc8_N1C_D" }
+			{ "voiceProlog": "Hc8_H3X2RNB" },
+			{ "voiceProlog": "Hc8_ABVOAB9" },
+			{ "voiceProlog": "Hc8_H3X2BBB" },
+			{ "voiceProlog": "Hc8_ABVODS1" },
+			{ "voiceProlog": "Hc8_H3X2ELA" },
+			{ "voiceProlog": "Hc8_E1B" },
+			{ "voiceProlog": "Hc8_H3X2BBD" },
+			{ "voiceProlog": "Hc8_H3X2ELE", "voiceEpilog": "Hc8_ABVOAB7" }
 		],
 		"loadingBackground": "Hc8_LoadBar",
 		"introVideoRim": "Hc8_INTRORIM",

+ 2 - 0
launcher/modManager/cmodlistview_moc.cpp

@@ -32,6 +32,8 @@
 #include "../../lib/modding/CModVersion.h"
 #include "../../lib/filesystem/Filesystem.h"
 
+#include <future>
+
 static double mbToBytes(double mb)
 {
 	return mb * 1024 * 1024;