Merge branch 'main' into Dev-Hydra

Author: Hydraxous

src/CultOfJakito.UltraTelephone2/Assets/UKPrefabs.cs

@@ -22,6 +22,8 @@ public static class UkPrefabs
     public static UKAsset<GameObject> MannequinEnemy { get; private set; } = new ("Assets/Prefabs/Enemies/Mannequin.prefab");
 
     public static UKAsset<AudioClip> ThroatDrone { get; private set; } = new("Assets/Music/Drones/Throat Drone.ogg");
+
+    public static UKAsset<GameObject> Book { get; private set; } = new("Assets/Prefabs/Items/Book.prefab");
 }
 
 public class UKAsset<T> where T : UnityEngine.Object

src/CultOfJakito.UltraTelephone2/Chaos/ChaosManager.cs

@@ -1,5 +1,7 @@
 using System.Reflection;
+using System.Text;
 using Configgy;
+using CultOfJakito.UltraTelephone2.Assets;
 using CultOfJakito.UltraTelephone2.DependencyInjection;
 using CultOfJakito.UltraTelephone2.Events;
 using CultOfJakito.UltraTelephone2.Util;
@@ -18,6 +20,11 @@ public class ChaosManager : MonoBehaviour, IDisposable
     [Configgable("Extras/Advanced", "Panic Button")]
     private static ConfigKeybind s_panicButton = new ConfigKeybind(KeyCode.P);
 
+    [Configgable(displayName:"Chaos Enabled")]
+    private static ConfigToggle s_enabled = new ConfigToggle(true);
+
+    public static int ChaosBookHashCode { get; private set; }
+
     public void BeginEffects()
     {
         //Seed is global and scene name to give a unique seed for each scene, while still being deterministic
@@ -53,11 +60,27 @@ public void BeginEffects()
         Debug.Log("Chaos started");
         activatedEffects = _ctx.GetCurrentSelection();
 
+        StringBuilder effectlistString = new();
+
         foreach (IChaosEffect effect in activatedEffects)
         {
+            effectlistString.AppendLine(effect.GetType().Name);
             Debug.Log($"Beginning Effect: {effect.GetType().Name}");
             effect.BeginEffect(new UniRandom(random.Next()));
         }
+
+        if(random.Chance(0.2f))
+            DropChaosBook(effectlistString.ToString());
+    }
+
+    private void DropChaosBook(string bookText)
+    {
+        GameObject book = GameObject.Instantiate(UkPrefabs.Book.GetObject());
+        Readable readable = book.GetComponent<Readable>();
+        readable.content = bookText;
+        ChaosBookHashCode = readable.gameObject.GetHashCode();
+
+        book.transform.position = CameraController.Instance.transform.position;
     }
 
     private List<IChaosEffect> activatedEffects;

src/CultOfJakito.UltraTelephone2/Chaos/Effects/CantRead.cs

@@ -33,11 +33,14 @@ public override void BeginEffect(UniRandom random)
 
 
         [HarmonyPatch(typeof(ScanningStuff), nameof(ScanningStuff.ScanBook)), HarmonyPrefix]
-        private static void OnScanBook(ScanningStuff __instance, ref string text)
+        private static void OnScanBook(ScanningStuff __instance, ref string text, int instanceId)
         {
             if (!s_enabled.Value || !s_effectActive)
                 return;
 
+            if (instanceId == ChaosManager.ChaosBookHashCode)
+                return;
+
             int option = s_rng.Next(0, 3);
 
             //0 = Write console log to book

src/CultOfJakito.UltraTelephone2/Chaos/Effects/RealisticExplosions.cs

@@ -40,7 +40,7 @@ public static void SoundReplacement(Explosion __instance)
 
         AudioSource source = __instance.GetComponent<AudioSource>();
 
-        if(source != null)
+        if(source != null && !source.loop)
         {
             source.dopplerLevel = 0;
             source.clip = Sound;