Merge pull request #1 from E0HH/main

Update to not require GameBuild 2189
ultrahacx · Jul 17, 2021 · 5919efe · 5919efe
2 parents 4ceec95 + 30fa051
commit 5919efe
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 3 deletions.
diff --git a/audiodata/dlchei4_game.dat151 b/audiodata/dlchei4_game.dat151
diff --git a/audiodata/dlchei4_game.dat151.nametable b/audiodata/dlchei4_game.dat151.nametable
diff --git a/audiodata/dlchei4_game.dat151.rel b/audiodata/dlchei4_game.dat151.rel
diff --git a/audiodata/dlchei4_sounds.dat54 b/audiodata/dlchei4_sounds.dat54
diff --git a/audiodata/dlchei4_sounds.dat54.nametable b/audiodata/dlchei4_sounds.dat54.nametable
diff --git a/audiodata/dlchei4_sounds.dat54.rel b/audiodata/dlchei4_sounds.dat54.rel
diff --git a/client.lua b/client.lua
@@ -254,13 +254,15 @@ end
 -- Load audio and texture stuff
 
 local requiredTxd = {'MPIsland_Voltage', 'MPIsland_Voltage_BG'}
-local requiredAudioBank = 'DLC_HEI4/DLC_HEI4_V_MG'
+local requiredAudioBank = 'DLC_HEI4\\DLC_HEI4_V_MG'
+local requiredAudioBank2 = 'DLC_HEI4\\DLC_HEI4_FH_MG'
 
 for i=1,#requiredTxd do
 	RequestStreamedTextureDict(requiredTxd[i], false)
 end
 
 RequestScriptAudioBank(requiredAudioBank, false, -1)
+RequestScriptAudioBank(requiredAudioBank2, false, -1)
 
 CreateThread(function()
 
@@ -759,4 +761,4 @@ AddEventHandler("ultra-voltlab", function(time, returnFn)
 			end
 		end
 	end)
-end)
+end)
diff --git a/dlc_hei4/dlc_hei4_fh_mg.awc b/dlc_hei4/dlc_hei4_fh_mg.awc
diff --git a/dlc_hei4/dlc_hei4_v_mg.awc b/dlc_hei4/dlc_hei4_v_mg.awc
diff --git a/fxmanifest.lua b/fxmanifest.lua
@@ -9,12 +9,24 @@ files {
     'html/*.html',
     'html/*.gif',
     'html/*.png',
+    'dlc_hei4/dlc_hei4_v_mg.awc',
+    'dlc_hei4/dlc_hei4_fh_mg.awc',
+    'audiodata/dlchei4_game.dat151',
+    'audiodata/dlchei4_game.dat151.nametable',
+    'audiodata/dlchei4_game.dat151.rel',
+    'audiodata/dlchei4_sounds.dat54',
+    'audiodata/dlchei4_sounds.dat54.nametable',
+    'audiodata/dlchei4_sounds.dat54.rel',
 }
 
+data_file 'AUDIO_GAMEDATA' 'audiodata/dlchei4_game.dat'
+data_file 'AUDIO_SOUNDDATA' 'audiodata/dlchei4_sounds.dat'
+data_file 'AUDIO_WAVEPACK' 'dlc_hei4'
+
 ui_page 'html/screen.html'
 
 client_script 'client.lua'
 
 server_script 'server.lua'
 
-client_script 'config.lua'
+client_script 'config.lua'