feat: exiled 9

fakeman2332 · Dec 22, 2024 · ee40f12 · ee40f12
1 parent 95fe2f7
commit ee40f12
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/MERRoomReplacement/Api/RoomReplacer.cs b/MERRoomReplacement/Api/RoomReplacer.cs
@@ -44,13 +44,15 @@ public static SchematicObject ReplaceRoom(RoomType roomType, RoomSchematic roomS
                 ? null
                 : cachedRoomData.Schematic;
         }
-
+        
         DestroyRoom(room);
-
 
         var schematicSerializable = new SchematicSerializable(roomSchematic.SchematicName);
         var rotation = Quaternion.Euler(schematicRotation + room.transform.localRotation.eulerAngles);
-        var schematic = ObjectSpawner.SpawnSchematic(schematicSerializable, schematicPosition + room.Position, rotation);
+        var schematic = ObjectSpawner.SpawnSchematic(schematicSerializable, schematicPosition, rotation);
+        schematic.Position += schematicPosition;
+
+        Log.Debug($"[{roomType}->{roomSchematic.SchematicName}] Schematic spawned at {schematic.Position}");
 
         API.SpawnedObjects.Add(schematic);
 
@@ -75,8 +77,13 @@ public static SchematicObject ReplaceRoom(RoomType roomType, RoomSchematic roomS
     /// <param name="delay">Delay in seconds until replacement</param>
     public static void ReplaceRoom(RoomType roomType, RoomSchematic roomSchematic, float delay)
     {
+        Log.Debug($"[{roomType}->{roomSchematic.SchematicName}] Starting replacement coroutine with {delay} seconds delay");
+
         Timing.CallDelayed(delay, () =>
         {
+
+            Log.Debug($"[{roomType}->{roomSchematic.SchematicName}] Coroutine: Replacing...");
+
             _ = ReplaceRoom(roomType, roomSchematic);
         });
     }

diff --git a/MERRoomReplacement/Commands/ReplaceRoomCommand.cs b/MERRoomReplacement/Commands/ReplaceRoomCommand.cs
@@ -5,6 +5,7 @@
 using MapEditorReborn.API.Features;
 using MERRoomReplacement.Api;
 using MERRoomReplacement.Api.Structures;
+
 // ReSharper disable HeuristicUnreachableCode
 // ReSharper disable ConditionIsAlwaysTrueOrFalse
 

diff --git a/MERRoomReplacement/Events/Handlers/ReplacementHandler.cs b/MERRoomReplacement/Events/Handlers/ReplacementHandler.cs
@@ -1,9 +1,10 @@
 using System.Collections.Generic;
-using Exiled.Events.Handlers;
+using Exiled.API.Features;
 using MERRoomReplacement.Api;
 using MERRoomReplacement.Api.Structures;
 using MERRoomReplacement.Events.Interfaces;
 using UnityEngine;
+using Server = Exiled.Events.Handlers.Server;
 
 namespace MERRoomReplacement.Events.Handlers;
 
@@ -25,8 +26,23 @@ private void OnWaitingForPlayers()
     {
         foreach (var roomSchematic in _replacementOptions)
         {
-            if (roomSchematic.SpawnChance >= 100 || Random.Range(0, 100) > roomSchematic.SpawnChance)
-                RoomReplacer.ReplaceRoom(roomSchematic.TargetRoomType, roomSchematic, roomSchematic.SpawnDelay);
+            Log.Debug($"Schematic name: {roomSchematic.SchematicName} | Room: {roomSchematic.TargetRoomType} | Chance: {roomSchematic.SpawnChance}%");
+
+            if (roomSchematic.SpawnChance >= 100)
+            {
+                Log.Debug("Spawn chance is more or equal to 100, starting replacing");
+            }
+            else if (Random.Range(0, 101) is var chance && roomSchematic.SpawnChance >= chance)
+            {
+                Log.Debug($"Schematic chance {roomSchematic.SpawnChance} >= generated {chance}, starting replacing");
+            }
+            else
+            {
+                Log.Debug($"Generated chance {chance} is less then {roomSchematic}, skipping..");
+                continue;
+            }
+
+            RoomReplacer.ReplaceRoom(roomSchematic.TargetRoomType, roomSchematic, roomSchematic.SpawnDelay);
         }
     }
 

diff --git a/MERRoomReplacement/MERRoomReplacement.csproj b/MERRoomReplacement/MERRoomReplacement.csproj
@@ -7,9 +7,6 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="EXILEDOFFICIAL" Version="8.11.0" />
-        <PackageReference Include="Lib.Harmony" Version="2.0.4"/>
-
         <Reference Include="Assembly-CSharp-firstpass" HintPath="$(EXILED_References)\Assembly-CSharp-firstpass.dll" Private="false" />
         <Reference Include="CommandSystem.Core" HintPath="$(EXILED_References)\CommandSystem.Core.dll" Private="false" />
         <Reference Include="Mirror" HintPath="$(EXILED_References)\Mirror.dll" Private="false" />
@@ -19,4 +16,8 @@
         <Reference Include="MapEditorReborn" HintPath="$(EXILED_Plugins)\MapEditorReborn.dll" Private="false" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="ExMod.Exiled" Version="9.0.0-beta.1" />
+    </ItemGroup>
+
 </Project>