V2.4.1

-Teleport event will now only choose from connected rooms -Event startup method is now called before name/description is displayed, allowing for changing them in startup instead of ctor -Removed unneeded using directives
Gamer025 · Sep 18, 2023 · 069cb6c · 069cb6c
1 parent 87c2cd0
commit 069cb6c
Show file tree

Hide file tree

Showing 64 changed files with 75 additions and 382 deletions.
diff --git a/Attributes/InternalCEEventAttribute.cs b/Attributes/InternalCEEventAttribute.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace RainWorldCE.Attributes
 {

diff --git a/Attributes/MSCEventAttribute.cs b/Attributes/MSCEventAttribute.cs
@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RainWorldCE.Attributes
 {

diff --git a/Config/BooleanConfigEntry.cs b/Config/BooleanConfigEntry.cs
@@ -1,10 +1,6 @@
 using Menu.Remix.MixedUI;
 using RainWorldCE.Events;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
 using UnityEngine;
 
 namespace RainWorldCE.Config

diff --git a/Config/CustomChaos/CCEntry.cs b/Config/CustomChaos/CCEntry.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RainWorldCE.Config.CustomChaos
+namespace RainWorldCE.Config.CustomChaos
 {
     internal abstract class CCEntry
     {

diff --git a/Config/CustomChaos/CCError.cs b/Config/CustomChaos/CCError.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RainWorldCE.Config.CustomChaos
+namespace RainWorldCE.Config.CustomChaos
 {
     internal class CCError : CCEntry
     {

diff --git a/Config/CustomChaos/CCExecuteEvent.cs b/Config/CustomChaos/CCExecuteEvent.cs
@@ -1,9 +1,5 @@
 using RainWorldCE.Events;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RainWorldCE.Config.CustomChaos
 {
@@ -31,7 +27,7 @@ public override int doAction()
             CEEvent ceevent = (CEEvent)Activator.CreateInstance(eventClass);
             if (time > 0 && ceevent.ActiveTime > 0)
                 ceevent.ActiveTime = time;
-            RainWorldCE.activateEvent(ceevent);
+            RainWorldCE.ActivateEvent(ceevent);
             return 0;
         }
 

diff --git a/Config/CustomChaos/CCGoto.cs b/Config/CustomChaos/CCGoto.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RainWorldCE.Config.CustomChaos
+namespace RainWorldCE.Config.CustomChaos
 {
     internal class CCGoto : CCEntry
     {

diff --git a/Config/CustomChaos/CCRandomEvent.cs b/Config/CustomChaos/CCRandomEvent.cs
@@ -1,10 +1,5 @@
 using RainWorldCE.Events;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using UnityEngine;
 
 namespace RainWorldCE.Config.CustomChaos
 {
@@ -19,7 +14,7 @@ public override int doAction()
             //Need to recreate the event here and not sure it in the constructor since ctor may have run while game not active
             Type eventClass = RainWorldCE.PickEvent();
             CEEvent ceevent = (CEEvent)Activator.CreateInstance(eventClass);
-            RainWorldCE.activateEvent(ceevent);
+            RainWorldCE.ActivateEvent(ceevent);
             return 0;
         }
 

diff --git a/Config/CustomChaos/CCWait.cs b/Config/CustomChaos/CCWait.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RainWorldCE.Config.CustomChaos
+namespace RainWorldCE.Config.CustomChaos
 {
     internal class CCWait : CCEntry
     {

diff --git a/Config/CustomChaos/CustomChaos.cs b/Config/CustomChaos/CustomChaos.cs
@@ -1,10 +1,5 @@
 using BepInEx.Logging;
 using System;
-using System.CodeDom;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RainWorldCE.Config.CustomChaos
 {

diff --git a/Config/EventConfigEntry.cs b/Config/EventConfigEntry.cs
@@ -1,9 +1,5 @@
 using RainWorldCE.Events;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
 using UnityEngine;
 using Menu.Remix.MixedUI;
 

diff --git a/Config/IntegerConfigEntry.cs b/Config/IntegerConfigEntry.cs
@@ -1,13 +1,6 @@
-using BepInEx.Logging;
-using IL.RWCustom;
-using Menu.Remix.MixedUI;
+using Menu.Remix.MixedUI;
 using RainWorldCE.Events;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
 using UnityEngine;
 
 namespace RainWorldCE.Config

diff --git a/Config/RainWorldCEOI.cs b/Config/RainWorldCEOI.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using UnityEngine;
 using Menu.Remix.MixedUI;
-using RainWorldCE.Config.CustomChaos;
 using System.IO;
 using System.Reflection;
 using RainWorldCE.RWHUD;

diff --git a/Events/AllEventsFiltered.cs b/Events/AllEventsFiltered.cs
@@ -1,8 +1,4 @@
 using RainWorldCE.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/CEEvent.cs b/Events/CEEvent.cs
@@ -1,9 +1,7 @@
-using BepInEx.Configuration;
-using BepInEx.Logging;
+using BepInEx.Logging;
 using RainWorldCE.Config;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/Challenger.cs b/Events/Challenger.cs
@@ -1,10 +1,5 @@
 using BepInEx.Logging;
-using IL.LizardCosmetics;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/CreatureMigration.cs b/Events/CreatureMigration.cs
@@ -1,11 +1,4 @@
-using BepInEx.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using UnityEngine;
-
-namespace RainWorldCE.Events
+namespace RainWorldCE.Events
 {
     /// <summary>
     /// Causes all creatures in the region to migrate to the players current room

diff --git a/Events/CreatureRandomizer.cs b/Events/CreatureRandomizer.cs
@@ -1,13 +1,6 @@
 using BepInEx.Logging;
-using IL;
-using IL.JollyCoop.JollyManual;
-using On;
 using RainWorldCE.Config;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Remoting.Messaging;
-using System.Text;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/Darkness.cs b/Events/Darkness.cs
@@ -1,9 +1,5 @@
-using BepInEx.Logging;
-using RainWorldCE.Config;
-using System;
+using RainWorldCE.Config;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using UnityEngine;
 
 namespace RainWorldCE.Events
@@ -16,12 +12,6 @@ internal class Darkness : CEEvent
         public Darkness()
         {
             _name = "Darkness / Shaded Region";
-            if (EventHelpers.StoryModeActive && game.world.region is not null)
-            {
-                string regionName = Region.GetRegionFullName(game.world.region.name, (EventHelpers.MainPlayer.realizedCreature as Player).SlugCatClass);
-
-                _name = $"Shaded {regionName}";
-            }
             _description = "Darkness has fallen";
             _activeTime = (int)(60 * RainWorldCE.eventDurationMult);
         }
@@ -30,6 +20,7 @@ public Darkness()
 
         public override void StartupTrigger()
         {
+            _name = $"Shaded {Region.GetRegionFullName(game.world.region.name, (EventHelpers.MainPlayer.realizedCreature as Player).SlugCatClass)}";
             amount = TryGetConfigAsInt("amount") / 100f;
             Room room = game.cameras[0].room;
             PlayerChangedRoomTrigger(ref game.cameras[0], ref room, ref game.cameras[0].currentCameraPosition);

diff --git a/Events/EventHelpers.cs b/Events/EventHelpers.cs
@@ -1,11 +1,7 @@
-using BepInEx.Logging;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Runtime.Remoting.Messaging;
-using System.Text;
-using static SlugcatStats;
 
 namespace RainWorldCE.Events
 {
@@ -114,6 +110,18 @@ internal static List<AbstractRoom> GetConnectedRooms(AbstractRoom room)
             return returnList;
         }
 
+        internal static List<AbstractRoom> GetAllConnectedRooms(AbstractRoom room)
+        {
+            Dictionary<string, AbstractRoom> rooms =new Dictionary<string, AbstractRoom>();
+            GetConnectedRooms(room).ForEach(x => rooms[x.name] = x);
+            for (int i = 0; i < rooms.Count; i++)
+            {
+                AbstractRoom nextRoom = rooms.ElementAt(i).Value;
+                GetConnectedRooms(nextRoom).ForEach(x => rooms[x.name] = x);
+            }
+            return rooms.Values.ToList();
+        }
+
         internal static int GetNodeIdOfRoomConnection(AbstractRoom source, AbstractRoom destination)
         {
             return Array.IndexOf(destination.connections, source.index);
@@ -153,13 +161,5 @@ internal static bool RoomHasEffect(Room room, RoomSettings.RoomEffect.Type type)
             }
             return false;
         }
-
-        internal static bool StoryModeActive
-        {
-            get
-            {
-                return (CEEvent.game is not null && CEEvent.game.IsStorySession);
-            }
-        }
     }
 }
diff --git a/Events/FlipCamera.cs b/Events/FlipCamera.cs
@@ -1,10 +1,4 @@
 using RainWorldCE.PostProcessing;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace RainWorldCE.Events

diff --git a/Events/FoodLevel.cs b/Events/FoodLevel.cs
@@ -1,9 +1,4 @@
-using BepInEx.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Remoting.Messaging;
-using System.Text;
+using System;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/Friend.cs b/Events/Friend.cs
@@ -1,8 +1,4 @@
 using BepInEx.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace RainWorldCE.Events
 {

diff --git a/Events/Gift.cs b/Events/Gift.cs
@@ -1,10 +1,5 @@
 using BepInEx.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using UnityEngine;
-using static SlugcatStats;
 
 namespace RainWorldCE.Events
 {
@@ -15,19 +10,8 @@ internal class Gift : CEEvent
     {
         public Gift()
         {
-            size = GetRandomGiftSize;
             _name = "A small/normal/great gift";
-            if (EventHelpers.StoryModeActive)
-            {
-                _name = $"A {size} gift";
-            }
-            _description = size switch
-            {
-                GiftSize.small => "Take this, it's dangerous to go alone",
-                GiftSize.normal => "You will probably need this",
-                GiftSize.big => "A great gift for an amazing little creature",
-                _ => "",
-            };
+            _description = "You will probably need this";
         }
 
         enum GiftSize
@@ -37,10 +21,19 @@ enum GiftSize
             big
         }
 
-        private readonly GiftSize size;
+        private GiftSize size;
 
         public override void StartupTrigger()
         {
+            size = GetRandomGiftSize;
+            _name = $"A {size} gift";
+            _description = size switch
+            {
+                GiftSize.small => "Take this, it's dangerous to go alone",
+                GiftSize.normal => "You will probably need this",
+                GiftSize.big => "A great gift for an amazing little creature",
+                _ => "",
+            };
             foreach (AbstractCreature player in EventHelpers.AllPlayers)
             {
                 AbstractPhysicalObject reward = null;

diff --git a/Events/Grayscale.cs b/Events/Grayscale.cs
@@ -1,11 +1,5 @@
-using BepInEx.Logging;
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using static SlugcatStats;
-using UnityEngine;
-using System.CodeDom;
 
 namespace RainWorldCE.Events
 {