Update to Among Us v2024.3.5 (Merge pull request #145)

SubmergedAmongUs · Mar 24, 2024 · 17896fe · 17896fe
2 parents 792f7c2 + f4332ff
commit 17896fe
Show file tree

Hide file tree

Showing 49 changed files with 865 additions and 293 deletions.
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ Submerged is a mod for Among Us which adds a new map into the game.
 <summary>Click to expand</summary>
 
 [![Submerged Trailer](http://img.youtube.com/vi/gAX_mDOX4Pc/0.jpg)](http://www.youtube.com/watch?v=gAX_mDOX4Pc "Submerged Trailer")
-  
+
 [See the trailer on YouTube](http://www.youtube.com/watch?v=gAX_mDOX4Pc)
 
 ![Screenshot 1](./.github/Images/Screenshot-1.png)
@@ -38,26 +38,27 @@ Submerged is compatible with desktop releases of Among Us. This includes Steam,
 
 The table below lists the most recent Submerged release for each Among Us version after `v2022.3.29` (for desktop platforms only). The changelog for each version can be found under the [Releases](https://github.com/SubmergedAmongUs/Submerged/releases) tab.
 
-| Among Us Version | Submerged Version | Links |
-|:-:|:-:|:-:|
-| `v2023.11.28` | `v2023.11.29` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.29/) |
-| `v2023.10.24` | `v2023.11.2` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.2/) |
-| `v2023.7.12`<br>`v2023.7.11` | `v2023.8.2` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.8.2/) |
-| `v2023.6.27`<br>`v2023.6.13`<br>`v2023.3.28`<br>`v2023.2.28`<br>`v2022.12.14`<br>`v2022.12.8` | Unavailable | - |
-| `v2022.10.25` | `v2022.10.26` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.10.26/) |
-| `v2022.10.18` | Unavailable | - |
-| `v2022.9.20`<br>`v2022.8.25`<br>`v2022.8.24`<br>`v2022.8.23` | `v2022.8.26` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.8.26/) |
-| `v2022.7.12`<br>`v2022.6.21` | `v2022.6.23` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.6.23/) |
-| `v2022.4.19`<br>`v2022.3.29` | `v2022.6.12` | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.6.12/) |
+|                                       Among Us Version                                        | Submerged Version |                                        Links                                        |
+|:---------------------------------------------------------------------------------------------:|:-----------------:|:-----------------------------------------------------------------------------------:|
+|                                          `v2024.3.5`                                          |   `v2024.3.24`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2024.3.24/)  |
+|                                         `v2023.11.28`                                         |   `v2023.11.29`   | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.29/) |
+|                                         `v2023.10.24`                                         |   `v2023.11.2`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.11.2/)  |
+|                                 `v2023.7.12`<br>`v2023.7.11`                                  |    `v2023.8.2`    |  [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2023.8.2/)  |
+| `v2023.6.27`<br>`v2023.6.13`<br>`v2023.3.28`<br>`v2023.2.28`<br>`v2022.12.14`<br>`v2022.12.8` |    Unavailable    |                                          -                                          |
+|                                         `v2022.10.25`                                         |   `v2022.10.26`   | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.10.26/) |
+|                                         `v2022.10.18`                                         |    Unavailable    |                                          -                                          |
+|                 `v2022.9.20`<br>`v2022.8.25`<br>`v2022.8.24`<br>`v2022.8.23`                  |   `v2022.8.26`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.8.26/)  |
+|                                 `v2022.7.12`<br>`v2022.6.21`                                  |   `v2022.6.23`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.6.23/)  |
+|                                 `v2022.4.19`<br>`v2022.3.29`                                  |   `v2022.6.12`    | [Download](https://github.com/SubmergedAmongUs/Submerged/releases/tag/v2022.6.12/)  |
 
 # Dependencies
 
 Submerged depends on the following mods and modding tools in order to function properly:
 
-| Mod | Version |
-|-|:-:|
-| [BepInEx](https://builds.bepinex.dev/projects/bepinex_be) (IL2CPP-win-x86) | `v6.0.0-be.671` |
-| [Reactor](https://github.com/nuclearpowered/reactor) | `v2.2.0` |
+| Mod                                                                        |     Version     |
+|----------------------------------------------------------------------------|:---------------:|
+| [BepInEx](https://builds.bepinex.dev/projects/bepinex_be) (IL2CPP-win-x86) | `v6.0.0-be.688` |
+| [Reactor](https://github.com/nuclearpowered/reactor)                       |    `v2.2.0`     |
 
 # Installation
 
@@ -72,7 +73,6 @@ This mod has been tested and works with the Steam, Epic and itch.io versions of
 1. Download the correct ZIP [release](#releases) based on your Among Us version.
 2. Navigate to your Among Us installation directory.
 3. Extract the downloaded files there. Ensure that the `BepInEx` folder is located in the same folder as the `Among Us.exe` file (Check screenshot below).
-
 ![Folder Structure](./.github/Images/Folder-Structure.png)
 
 4. Run the game (Please note that the first launch might take some time).
@@ -83,24 +83,24 @@ Alternatively, if you are already using other mods or already have BepInEx insta
 
 Submerged is available in the languages listed below. If you would like to help translate Submerged to one of the languages listed below or want to correct a translation, please [open an issue](https://github.com/SubmergedAmongUs/Submerged/issues/new/choose/) or contact us at `submergedamongus@gmail.com`.
 
-| Language | ❔ | Status |
-|-|:-:|:-:|
-| English | ✅ | - |
-| Deutsch | ✅ | Fully Translated |
-| Français | ✅ | Fully Translated |
-| Nederlands | ✅ | Fully Translated |
-| Português (Brasil) | ✅ | Fully Translated |
-| Русский | ✅ | Fully Translated |
-| 日本語 | ✅ | Fully Translated |
-| 简体中文 | ✅ | Fully Translated |
-| 繁體中文 | ✅ | Fully Translated |
-| Español | 🟡 | Partially Translated |
-| Bisaya | ❌ | Not Translated |
-| Español (Latinoamérica) | ❌ | Not Translated<br>(Using Español) |
-| Gaeilge | ❌ | Not Translated |
-| Italiano | ❌ | Not Translated |
-| Português | ❌ | Not Translated |
-| 한국어 | ❌ | Not Translated |
+| Language                | ❔  |              Status               |
+|-------------------------|:--:|:---------------------------------:|
+| English                 | ✅  |                 -                 |
+| Deutsch                 | ✅  |         Fully Translated          |
+| Français                | ✅  |         Fully Translated          |
+| Italiano                | ✅  |         Fully Translated          |
+| Nederlands              | ✅  |         Fully Translated          |
+| Português (Brasil)      | ✅  |         Fully Translated          |
+| Русский                 | ✅  |         Fully Translated          |
+| 日本語                     | ✅  |         Fully Translated          |
+| 简体中文                    | ✅  |         Fully Translated          |
+| 繁體中文                    | ✅  |         Fully Translated          |
+| Español                 | 🟡 |       Partially Translated        |
+| Bisaya                  | ❌  |          Not Translated           |
+| Español (Latinoamérica) | ❌  | Not Translated<br>(Using Español) |
+| Gaeilge                 | ❌  |          Not Translated           |
+| Português               | ❌  |          Not Translated           |
+| 한국어                     | ❌  |          Not Translated           |
 
 # Compatibility
 
@@ -156,6 +156,7 @@ For business inquiries, please contact us at `submergedamongus@gmail.com`.
   - [ItsNiceCraft](https://bento.me/itsnicecraft) - Deutsch
   - [MissJukebox](https://www.twitch.tv/missjukebox/) - Español
   - Monid73 - Русский
+  - [PENGUN](https://youtube.com/@PENGUINWITHGUN) - Italiano
   - [RevoLou](https://twitter.com/Psyco_Lou/) - Português do Brasil
   - RobinRMC - Nederlands
   - [SPRLC](https://twitter.com/SuperLanceur) - Français

diff --git a/Submerged.sln b/Submerged.sln
@@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{5819678E-32DB-4841-A4F9-89ECE2AE8ADA}"
-ProjectSection(SolutionItems) = preProject
-	nuget.config = nuget.config
-EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Submerged", "Submerged\Submerged.csproj", "{13ACAAD7-C0BE-468C-8710-14C77F7C24BA}"
 EndProject
 Global

diff --git a/Submerged/BaseGame/BaseGameCodeAttribute.cs b/Submerged/BaseGame/BaseGameCodeAttribute.cs
@@ -5,8 +5,7 @@ namespace Submerged.BaseGame;
 public enum LastChecked
 {
     // ReSharper disable InconsistentNaming
-    v2023_10_24,
-    v2023_11_28
+    v2024_3_5
     // ReSharper restore InconsistentNaming
 }
 

diff --git a/Submerged/BaseGame/Extensions/Minigame.cs b/Submerged/BaseGame/Extensions/Minigame.cs
@@ -4,7 +4,7 @@ namespace Submerged.BaseGame.Extensions;
 
 public static class MinigameExtensions
 {
-    [BaseGameCode(LastChecked.v2023_10_24, "Entire method is copied from base game because we can't call it from the base pointer since that causes an infinite loop.")]
+    [BaseGameCode(LastChecked.v2024_3_5, "Entire method is copied from base game because we can't call it from the base pointer since that causes an infinite loop.")]
     public static void BaseClose(this Minigame self)
     {
         bool isComplete;

diff --git a/Submerged/BaseGame/Interfaces/IDoorMinigame.cs b/Submerged/BaseGame/Interfaces/IDoorMinigame.cs
@@ -1,11 +1,9 @@
-using Hazel;
-
-namespace Submerged.BaseGame.Interfaces;
+namespace Submerged.BaseGame.Interfaces;
 
 // ReSharper disable once InconsistentNaming
 public sealed partial class AU
 {
-    [BaseGameCode(LastChecked.v2023_11_28)]
+    [BaseGameCode(LastChecked.v2024_3_5)]
     public interface IDoorMinigame
     {
         [UsedImplicitly]

diff --git a/Submerged/BaseGame/Interfaces/ISystemType.cs b/Submerged/BaseGame/Interfaces/ISystemType.cs
@@ -5,7 +5,7 @@ namespace Submerged.BaseGame.Interfaces;
 // ReSharper disable once InconsistentNaming
 public sealed partial class AU
 {
-    [BaseGameCode(LastChecked.v2023_10_24)]
+    [BaseGameCode(LastChecked.v2024_3_5)]
     public interface ISystemType
     {
         [UsedImplicitly]

diff --git a/Submerged/BaseGame/Interfaces/IUsable.cs b/Submerged/BaseGame/Interfaces/IUsable.cs
@@ -3,7 +3,7 @@
 // ReSharper disable once InconsistentNaming
 public sealed partial class AU
 {
-    [BaseGameCode(LastChecked.v2023_10_24)]
+    [BaseGameCode(LastChecked.v2024_3_5)]
     public interface IUsable
     {
         [UsedImplicitly]

diff --git a/Submerged/BaseGame/Patches/AirshipUploadGame.cs b/Submerged/BaseGame/Patches/AirshipUploadGame.cs
@@ -8,7 +8,7 @@ public static class AirshipUploadGameUpdatePatches
 {
     [HarmonyPatch(typeof(AirshipUploadGame), nameof(AirshipUploadGame.Update))]
     [HarmonyPrefix]
-    [BaseGameCode(LastChecked.v2023_10_24, "Patching the method with it's own code because C# > C++")]
+    [BaseGameCode(LastChecked.v2024_3_5, "Patching the method with it's own code because C# > C++")]
     public static void Prefix(AirshipUploadGame __instance, out bool __runOriginal)
     {
         __runOriginal = false;

diff --git a/Submerged/BaseGame/Patches/ExileController.cs b/Submerged/BaseGame/Patches/ExileController.cs
diff --git a/Submerged/BaseGame/Patches/TextTranslatorTMP.cs b/Submerged/BaseGame/Patches/TextTranslatorTMP.cs
@@ -8,7 +8,7 @@ public static class TextTranslatorTMPPatches
 {
     [HarmonyPatch(typeof(TextTranslatorTMP), nameof(TextTranslatorTMP.ResetText))]
     [HarmonyPrefix]
-    [BaseGameCode(LastChecked.v2023_10_24, "We are patching this with its own code to get rid of inlining that ruins our translation patches")]
+    [BaseGameCode(LastChecked.v2024_3_5, "We are patching this with its own code to get rid of inlining that ruins our translation patches")]
     public static void ResetTextPatch(TextTranslatorTMP __instance, out bool __runOriginal)
     {
         __runOriginal = false;

diff --git a/Submerged/Debugging/Patches/GameTestingPatches.cs b/Submerged/Debugging/Patches/GameTestingPatches.cs
@@ -26,4 +26,12 @@ public static void PreventBanPatch(out bool __result)
     [HarmonyPrefix]
     [HarmonyPriority(Priority.First)]
     public static bool StopGameEndingPatch() => false;
+
+    [HarmonyPatch(typeof(AprilFoolsMode), nameof(AprilFoolsMode.ShouldShowAprilFoolsToggle))]
+    [HarmonyPrefix]
+    public static bool EnableAprilFoolsTogglePatch(out bool __result)
+    {
+        __result = true;
+        return false;
+    }
 }
diff --git a/Submerged/Enums/CustomSystemTypes.cs b/Submerged/Enums/CustomSystemTypes.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 
 namespace Submerged.Enums;

diff --git a/Submerged/ExileCutscene/Patches/BaseGameResolvingPatches.cs b/Submerged/ExileCutscene/Patches/BaseGameResolvingPatches.cs
@@ -6,6 +6,16 @@ namespace Submerged.ExileCutscene.Patches;
 [HarmonyPatch]
 public static class BaseGameResolvingPatches
 {
+    public static string LastExileText { get; private set; }
+
+    [HarmonyPatch(typeof(ExileController), nameof(ExileController.Begin))]
+    [HarmonyPostfix, HarmonyPriority(Priority.Last)]
+    public static void GetTextPatch(ExileController __instance)
+    {
+        LastExileText = __instance.completeString;
+        Message("Grabbing " + __instance + " from ExileController");
+    }
+
     [HarmonyPatch(typeof(ExileController), nameof(ExileController.Begin))]
     [HarmonyPrefix]
     public static void ResolvePlayerPatch(ExileController __instance)