Update TOUR to v6.0.0

.github/workflows/main.yml

@@ -0,0 +1,48 @@
+name: CI
+
+on: ["workflow_dispatch", "push", "pull_request"]
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.nuget/packages
+            ~/.cache/bepinex
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+
+      - name: Run the Cake script
+        uses: cake-build/cake-action@v3
+        with:
+          verbosity: Diagnostic
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: TownOfUsReactivated.dll
+          path: source/bin/Release/net6.0/TownOfUsReactivated.dll
+          retention-days: 7
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: TownOfUsReactivated.nupkg
+          path: source/bin/Release/net6.0/TownOfUsReactivated.*.nupkg
+          retention-days: 7
+
+      - uses: softprops/action-gh-release@v2
+        if: github.ref_type == 'tag'
+        with:
+          draft: true
+          files: source/bin/Release/net6.0/TownOfUsReactivated.dll

TownOfUs.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.10.35122.118
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TownOfUs", "source\TownOfUs.csproj", "{7B91EF68-B9BB-4138-9DEF-79C91FA554D6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TownOfUsReactivated", "source\TownOfUsReactivated.csproj", "{7B91EF68-B9BB-4138-9DEF-79C91FA554D6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

build.cake

@@ -0,0 +1,28 @@
+var target = Argument("target", "Build");
+
+var workflow = BuildSystem.GitHubActions.Environment.Workflow;
+var buildId = workflow.RunNumber;
+var tag = workflow.RefType == GitHubActionsRefType.Tag ? workflow.RefName : null;
+
+Task("Build")
+    .Does(() =>
+{
+    var settings = new DotNetBuildSettings
+    {
+        Configuration = "Release",
+        MSBuildSettings = new DotNetMSBuildSettings()
+    };
+
+    if (tag != null) 
+    {
+        settings.MSBuildSettings.Version = tag;
+    }
+    else if (buildId != 0)
+    {
+        settings.MSBuildSettings.VersionSuffix = "ci." + buildId;
+    }
+
+    DotNetBuild(".", settings);
+});
+
+RunTarget(target);

source/Extensions/AmongUsExtensions.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using TownOfUs.Roles;
-using TownOfUs.Roles.Modifiers;
+using TownOfUs.Modifiers;
 using UnityEngine;
 using System;
 using Il2CppInterop.Runtime.InteropTypes;
@@ -104,7 +104,7 @@ public static bool IsNullOrDestroyed(this System.Object obj)
         }
         public static Texture2D CreateEmptyTexture(int width = 0, int height = 0)
         {
-            return new Texture2D(width, height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, IntPtr.Zero);
+            return new Texture2D(width, height, TextureFormat.RGBA32, Texture.GenerateAllMips, false, false);
         }
 
         private static class CastExtension<T> where T : Il2CppObjectBase

source/GlobalUsings.cs

@@ -0,0 +1 @@
+global using TownOfUs.Interfaces;

source/Patches/Roles/IGuesser.cs → source/Interfaces/IGuesser.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using TMPro;
 
-namespace TownOfUs.Roles
+namespace TownOfUs.Interfaces
 {
     public interface IGuesser
     {

source/Patches/Roles/IVisualAlteration.cs → source/Interfaces/IVisualAlteration.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles
+namespace TownOfUs.Interfaces
 {
     public interface IVisualAlteration
     {

source/Patches/Roles/Modifiers/Aftermath.cs → source/Modifiers/Aftermath.cs

@@ -9,8 +9,9 @@
 using Hazel;
 using TownOfUs.Patches;
 using System.Linq;
+using TownOfUs.Roles;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Aftermath : Modifier
     {

source/Patches/Roles/Modifiers/Assassin.cs → source/Modifiers/Assassin.cs

@@ -6,7 +6,7 @@
 using TownOfUs.NeutralRoles.ExecutionerMod;
 using TownOfUs.NeutralRoles.GuardianAngelMod;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Assassin : Ability, IGuesser
     {

source/Patches/Roles/Modifiers/Bait.cs → source/Modifiers/Bait.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Bait : Modifier
     {

source/Patches/Roles/Modifiers/ButtonBarry.cs → source/Modifiers/ButtonBarry.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class ButtonBarry : Modifier
     {

source/Patches/Roles/Modifiers/Celebrity.cs → source/Modifiers/Celebrity.cs

@@ -1,8 +1,9 @@
 using Hazel.Dtls;
 using System;
 using TownOfUs.Extensions;
+using TownOfUs.Roles;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Celebrity : Modifier
     {

source/Patches/Roles/Modifiers/Diseased.cs → source/Modifiers/Diseased.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Diseased : Modifier
     {

source/Patches/Roles/Modifiers/Disperser.cs → source/Modifiers/Disperser.cs

@@ -11,7 +11,7 @@
 using TownOfUs.Modifiers.ShyMod;
 using TownOfUs.Extensions;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Disperser : Modifier
     {

source/Patches/Roles/Modifiers/DoubleShot.cs → source/Modifiers/DoubleShot.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class DoubleShot : Modifier
     {

source/Patches/Roles/Modifiers/Flash.cs → source/Modifiers/Flash.cs

@@ -1,6 +1,6 @@
 using TownOfUs.Extensions;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Flash : Modifier, IVisualAlteration
     {

source/Patches/Roles/Modifiers/Frosty.cs → source/Modifiers/Frosty.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Frosty : Modifier
     {

source/Patches/Roles/Modifiers/Giant.cs → source/Modifiers/Giant.cs

@@ -1,7 +1,7 @@
 using TownOfUs.Extensions;
 using UnityEngine;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Giant : Modifier, IVisualAlteration
     {

source/Patches/Roles/Modifiers/Immovable.cs → source/Modifiers/Immovable.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Immovable : Modifier
     {

source/Patches/Roles/Modifiers/Lover.cs → source/Modifiers/Lover.cs

@@ -3,8 +3,9 @@
 using TownOfUs.Patches;
 using UnityEngine;
 using TownOfUs.Extensions;
+using TownOfUs.Roles;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Lover : Modifier
     {

source/Patches/Roles/Modifiers/Mini.cs → source/Modifiers/Mini.cs

@@ -2,7 +2,7 @@
 using TownOfUs.Extensions;
 using UnityEngine;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Mini : Modifier, IVisualAlteration
     {

source/Patches/Roles/Modifiers/Modifier.cs → source/Modifiers/Modifier.cs

@@ -5,7 +5,7 @@
 using TownOfUs.Extensions;
 using UnityEngine;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public abstract class Modifier
     {

source/Patches/Roles/Modifiers/Multitasker.cs → source/Modifiers/Multitasker.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Multitasker : Modifier
     {

source/Patches/Roles/Modifiers/Radar.cs → source/Modifiers/Radar.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Radar : Modifier
     {

source/Patches/Roles/Modifiers/Saboteur.cs → source/Modifiers/Saboteur.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Saboteur : Modifier
     {

source/Patches/Roles/Modifiers/Satellite.cs → source/Modifiers/Satellite.cs

@@ -5,7 +5,7 @@
 using UnityEngine;
 using Reactor.Utilities;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Satellite : Modifier
     {

source/Patches/Roles/Modifiers/Shy.cs → source/Modifiers/Shy.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Shy : Modifier
     {

source/Patches/Roles/Modifiers/SixthSense.cs → source/Modifiers/SixthSense.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class SixthSense : Modifier
     {

source/Patches/Roles/Modifiers/Sleuth.cs → source/Modifiers/Sleuth.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Sleuth : Modifier
     {

source/Patches/Roles/Modifiers/Taskmaster.cs → source/Modifiers/Taskmaster.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Taskmaster : Modifier
     {

source/Patches/Roles/Modifiers/Tiebreaker.cs → source/Modifiers/Tiebreaker.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Tiebreaker : Modifier
     {

source/Patches/Roles/Modifiers/Torch.cs → source/Modifiers/Torch.cs

@@ -1,4 +1,4 @@
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Torch : Modifier
     {

source/Patches/Roles/Modifiers/Underdog.cs → source/Modifiers/Underdog.cs

@@ -1,6 +1,6 @@
 using TownOfUs.Modifiers.UnderdogMod;
 
-namespace TownOfUs.Roles.Modifiers
+namespace TownOfUs.Modifiers
 {
     public class Underdog : Modifier
     {

source/Patches/AmongUsClient_OnGameEnd.cs

@@ -2,7 +2,7 @@
 using Il2CppSystem.Collections.Generic;
 using System.Linq;
 using TownOfUs.Roles;
-using TownOfUs.Roles.Modifiers;
+using TownOfUs.Modifiers;
 using TownOfUs.Extensions;
 
 namespace TownOfUs

source/Patches/AssetLoader.cs

@@ -11,18 +11,17 @@ namespace TownOfUs.Patches
 {
     public class AssetLoader
     {
-        public static string[] AssetBundles = { "trappershader", "soundvision" };
 
         public AssetLoader() { Initialize(); }
 
         public void Initialize()
         {
-            Array.ForEach(AssetBundles, x => {
-                var b = loadBundle(x);
-                bundles.Add(b.name, b);
-                b.GetAllAssetNames().ToList().ForEach(y => {
-                    objectname_to_bundle.Add(ConvertToBaseName(y), x);
-                });
+            var arch = OperatingSystem.IsAndroid() ? "android" : "win";
+            var bundle = $"tour-assets-{arch}.bundle";
+            var b = loadBundle(bundle);
+            bundles.Add(b.name, b);
+            b.GetAllAssetNames().ToList().ForEach(y => {
+                objectname_to_bundle.Add(ConvertToBaseName(y), bundle);
             });
         }
 
@@ -39,7 +38,7 @@ private string ConvertToBaseName(string name)
             return name.Split('/').Last().Split('.').First();
         }
 
-        private T? LoadAsset<T>(AssetBundle assetBundle, string name) where T : UnityObject
+        private T LoadAsset<T>(AssetBundle assetBundle, string name) where T : UnityObject
         {
             var asset = assetBundle.LoadAsset(name, Il2CppType.Of<T>())?.Cast<T>().DontUnload();
             loadedObjects.Add(name, asset);

source/Patches/CancelCountdownStart.cs

@@ -40,6 +40,7 @@ public static void PrefixStart(GameStartManager __instance)
                 if (__instance.countDownTimer < 4f) __instance.ResetStartState();
             }));
             CancelStartButton.gameObject.SetActive(false);
+            __instance.MinPlayers = 2;
         }
 
         [HarmonyPatch(typeof(GameStartManager), nameof(GameStartManager.Update))]

source/Patches/ChatCommands.cs

@@ -1,6 +1,6 @@
 using HarmonyLib;
 using TownOfUs.Roles;
-using TownOfUs.Roles.Modifiers;
+using TownOfUs.Modifiers;
 
 namespace TownOfUs.Patches
 {

source/Patches/CrewmateRoles/AltruistMod/Coroutine.cs

@@ -14,7 +14,7 @@
 using Reactor.Networking.Extensions;
 using TownOfUs.CrewmateRoles.HaunterMod;
 using TownOfUs.NeutralRoles.PhantomMod;
-using TownOfUs.Roles.Modifiers;
+using TownOfUs.Modifiers;
 
 namespace TownOfUs.CrewmateRoles.AltruistMod
 {