Merge pull request #279 from luponix/master

Adds Audio taunts similar to how Descent 3 did them
overload-development-community · Dec 25, 2022 · 3b5715f · 3b5715f
2 parents bd9f3d5 + 600a63d
commit 3b5715f
Show file tree

Hide file tree

Showing 7 changed files with 1,748 additions and 7 deletions.
diff --git a/GameMod/GameMod.csproj b/GameMod/GameMod.csproj
@@ -124,6 +124,7 @@
     <Compile Include="MoreAudio.cs" />
     <Compile Include="MPAlwaysCloaked.cs" />
     <Compile Include="MPAnticheat.cs" />
+    <Compile Include="MPAudioTaunts.cs" />
     <Compile Include="MPAutomap.cs" />
     <Compile Include="MPAutoSelection.cs" />
     <Compile Include="MPAutoSelectionUI.cs" />
@@ -230,4 +231,4 @@
     <None Include="olmodsettings.json" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/GameMod/MPAudioTaunts.cs b/GameMod/MPAudioTaunts.cs
diff --git a/GameMod/MPModPrivateData.cs b/GameMod/MPModPrivateData.cs
@@ -1256,6 +1256,12 @@ public static bool DamageNumbers
             set { MPObserver.DamageNumbersEnabled = value; }
         }
 
+        public static bool AudioTauntsSupported
+        {
+            get { return true; }
+            set { MPAudioTaunts.AServer.server_supports_audiotaunts = value; }
+        }
+
         public static JObject Serialize()
         {
             JObject jobject = new JObject();
@@ -1280,6 +1286,7 @@ public static JObject Serialize()
             jobject["joystickrotationfixsupported"] = JoystickRotationFixSupported;
             jobject["thunderboltpassthrough"] = ThunderboltPassthrough;
             jobject["damagenumbers"] = DamageNumbers;
+            jobject["audiotauntsupport"] = AudioTauntsSupported;
             return jobject;
         }
 
@@ -1310,6 +1317,7 @@ public static void Deserialize(JToken root)
             JoystickRotationFixSupported = root["joystickrotationfixsupported"].GetBool(false);
             ThunderboltPassthrough = root["thunderboltpassthrough"].GetBool(false);
             DamageNumbers = root["damagenumbers"].GetBool(false);
+            AudioTauntsSupported = root["audiotauntsupport"].GetBool(false);
         }
 
         public static string GetModeString(MatchMode mode)

diff --git a/GameMod/MPSetup.cs b/GameMod/MPSetup.cs
@@ -283,6 +283,15 @@ static void Postfix(string filename)
                 MPLoadouts.Loadouts[3].weapons[0] = (WeaponType)ModPrefs.GetInt("MP_PM_LOADOUT_GUNNER2_W1", (int)MPLoadouts.Loadouts[1].weapons[0]);
                 MPLoadouts.Loadouts[3].weapons[1] = (WeaponType)ModPrefs.GetInt("MP_PM_LOADOUT_GUNNER2_W2", (int)MPLoadouts.Loadouts[1].weapons[1]);
                 MPLoadouts.Loadouts[3].missiles[0] = (MissileType)ModPrefs.GetInt("MP_PM_LOADOUT_GUNNER2_M1", (int)MPLoadouts.Loadouts[1].missiles[0]);
+
+                MPAudioTaunts.AClient.active = ModPrefs.GetBool("MP_AUDIOTAUNTS_ACTIVE", true);
+                MPAudioTaunts.AClient.loaded_local_taunts = ModPrefs.GetString("MP_LOCAL_AUDIOTAUNTS", MPAudioTaunts.AClient.loaded_local_taunts);
+                MPAudioTaunts.AClient.LoadLocalAudioTauntsFromPilotPrefs();
+                MPAudioTaunts.AClient.audio_taunt_volume = ModPrefs.GetInt("MP_AUDIOTAUNT_VOLUME", 50);
+                for (int i = 0; i < MPAudioTaunts.AMOUNT_OF_TAUNTS_PER_CLIENT; i++){
+                    MPAudioTaunts.AClient.keybinds[i] = ModPrefs.GetInt("MP_AUDIOTAUNT_KEYBIND_" + i.ToString(), -1);}
+                MPAudioTaunts.AClient.display_audio_spectrum = ModPrefs.GetBool("MP_AUDIOTAUNT_SHOW_FREQUENCYBAND", true);
+
             }
             else // for compatibility with old olmod, no need to add new settings
             {
@@ -367,6 +376,13 @@ private static void Prefix(string filename)
             ModPrefs.SetBool("MP_CLASSIC_SPAWNS", Menus.mms_classic_spawns);
             ModPrefs.SetBool("MP_ASSIST_SCORING", Menus.mms_assist_scoring);
             ModPrefs.SetBool("MP_ALLOW_SMASH", Menus.mms_allow_smash);
+            ModPrefs.SetBool("MP_AUDIOTAUNTS_ACTIVE", MPAudioTaunts.AClient.active);
+            ModPrefs.SetString("MP_LOCAL_AUDIOTAUNTS", MPAudioTaunts.AClient.ChainTogetherHashesOfLocalTaunts());
+            ModPrefs.SetInt("MP_AUDIOTAUNT_VOLUME", MPAudioTaunts.AClient.audio_taunt_volume);
+            for (int i = 0; i < MPAudioTaunts.AMOUNT_OF_TAUNTS_PER_CLIENT; i++){
+                ModPrefs.SetInt("MP_AUDIOTAUNT_KEYBIND_" + i.ToString(), MPAudioTaunts.AClient.keybinds[i]);}
+            ModPrefs.SetBool("MP_AUDIOTAUNT_SHOW_FREQUENCYBAND", MPAudioTaunts.AClient.display_audio_spectrum);
+
 
             ModPrefs.Flush(filename + "mod");
         }

diff --git a/GameMod/MPTweaks.cs b/GameMod/MPTweaks.cs
@@ -286,7 +286,7 @@ private static void Prefix(AcceptedToLobbyMessage accept_msg)
             caps.Add("ModVersion", OlmodVersion.FullVersionString);
             caps.Add("Modded", Core.GameMod.Modded ? "1" : "0");
             caps.Add("ModsLoaded", Core.GameMod.ModsLoaded);
-            caps.Add("SupportsTweaks", "changeteam,deathreview,sniper,jip,nocompress_0_3_6,customloadouts,damagenumbers");
+            caps.Add("SupportsTweaks", "changeteam,deathreview,sniper,jip,nocompress_0_3_6,customloadouts,damagenumbers" + (MPAudioTaunts.AClient.active ? ",audiotaunts":""));
             caps.Add("ModPrivateData", "1");
             caps.Add("ClassicWeaponSpawns", "1");
             caps.Add("NetVersion", MPTweaks.NET_VERSION.ToString());