From 3881b960661e30faddeb5f220f70936a5777f322 Mon Sep 17 00:00:00 2001 From: Snivy Films Date: Fri, 3 Jan 2025 11:46:30 -0500 Subject: [PATCH 1/5] Actually did the thing involving me not being stupid --- EXILED/Exiled.API/Enums/SpawnLocationType.cs | 12 ++++++------ EXILED/Exiled.API/Extensions/SpawnExtensions.cs | 11 +++++------ 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs index 0cd2c6dded..2a099f2245 100644 --- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs +++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs @@ -124,19 +124,19 @@ public enum SpawnLocationType InsideHczArmory, /// - /// Inside the Micro-HID room. + /// Inside the chamber that contains the Micro-HID in Micro-HID room. /// - InsideHid, + InsideHidChamber, /// - /// Just inside the left door next to Micro-HID room. + /// Inside the lower door that leads to the stairs in Micro-HID room. /// - InsideHidLeft, + InsideHidLower, /// - /// Just inside the right door next to Micro-HID room. + /// Inside the upper door that leads into the Micro-HID room just after the stairs. /// - InsideHidRight, + InsideHidUpper, /// /// Just inside the LCZ WC door. diff --git a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs index 5c1c31f89c..b7d35f4048 100644 --- a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs +++ b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs @@ -25,16 +25,15 @@ public static class SpawnExtensions { SpawnLocationType.InsideHczArmory, SpawnLocationType.Inside079First, - SpawnLocationType.InsideHidRight, + SpawnLocationType.InsideHidUpper, SpawnLocationType.Inside173Gate, - SpawnLocationType.InsideHidLeft, SpawnLocationType.InsideGateA, SpawnLocationType.InsideGateB, SpawnLocationType.InsideLczWc, SpawnLocationType.InsideGr18, SpawnLocationType.Inside914, - SpawnLocationType.InsideHid, SpawnLocationType.Inside049Armory, + SpawnLocationType.InsideLczCafe, }; /// @@ -81,16 +80,16 @@ public static Vector3 GetPosition(this SpawnLocationType location) SpawnLocationType.Inside330 => "330", SpawnLocationType.Inside096 => "096", SpawnLocationType.Inside914 => "914", - SpawnLocationType.InsideHid => "HID", + SpawnLocationType.InsideHidChamber => "HID_CHAMBER", SpawnLocationType.InsideGr18 => "GR18", SpawnLocationType.InsideGateA => "GATE_A", SpawnLocationType.InsideGateB => "GATE_B", SpawnLocationType.InsideLczWc => "LCZ_WC", - SpawnLocationType.InsideHidLeft => "HID_LEFT", + SpawnLocationType.InsideHidLower => "HID_LOWER", SpawnLocationType.InsideLczCafe => "LCZ_CAFE", SpawnLocationType.Inside173Gate => "173_GATE", SpawnLocationType.InsideIntercom => "INTERCOM", - SpawnLocationType.InsideHidRight => "HID_RIGHT", + SpawnLocationType.InsideHidUpper => "HID_UPPER", SpawnLocationType.Inside079First => "079_FIRST", SpawnLocationType.Inside330Chamber => "330_CHAMBER", SpawnLocationType.Inside049Armory => "049_ARMORY", From 204fc2fd712e0cabf46eb8ad224dc689e42a1f4e Mon Sep 17 00:00:00 2001 From: Snivy Films Date: Sat, 11 Jan 2025 12:09:50 -0500 Subject: [PATCH 2/5] Updated Spawn Location Type Enums for Dynamic Locations --- EXILED/Exiled.API/Enums/SpawnLocationType.cs | 30 +++++++++++++++---- .../Exiled.API/Extensions/SpawnExtensions.cs | 7 ++++- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs index 2a099f2245..7a11afd0a3 100644 --- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs +++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs @@ -78,11 +78,6 @@ public enum SpawnLocationType /// InsideLczCafe, - /// - /// Inside the Nuke armory. - /// - InsideNukeArmory, - /// /// Inside the surface nuke room. /// @@ -142,5 +137,30 @@ public enum SpawnLocationType /// Just inside the LCZ WC door. /// InsideLczWc, + + /// + /// Inside the Glass Box in GR-18. + /// + InsideGr18Glass, + + /// + /// Inside 106's Primary Door + /// + Inside106Primary, + + /// + /// Inside 106's Secondary Door + /// + Inside106Secondary, + + /// + /// Inside 939 Cryo Chamber + /// + Inside939Cryo, + + /// + /// Inside SCP-079's Armory + /// + Inside079Armory, } } \ No newline at end of file diff --git a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs index b7d35f4048..29da4ab802 100644 --- a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs +++ b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs @@ -34,6 +34,7 @@ public static class SpawnExtensions SpawnLocationType.Inside914, SpawnLocationType.Inside049Armory, SpawnLocationType.InsideLczCafe, + SpawnLocationType.Inside939Cryo, }; /// @@ -97,12 +98,16 @@ public static Vector3 GetPosition(this SpawnLocationType location) SpawnLocationType.Inside173Bottom => "173_BOTTOM", SpawnLocationType.InsideLczArmory => "LCZ_ARMORY", SpawnLocationType.InsideHczArmory => "HCZ_ARMORY", - SpawnLocationType.InsideNukeArmory => "NUKE_ARMORY", SpawnLocationType.InsideSurfaceNuke => "SURFACE_NUKE", SpawnLocationType.Inside079Secondary => "079_SECOND", SpawnLocationType.Inside173Connector => "173_CONNECTOR", SpawnLocationType.InsideEscapePrimary => "ESCAPE_PRIMARY", SpawnLocationType.InsideEscapeSecondary => "ESCAPE_SECONDARY", + SpawnLocationType.InsideGr18Glass => "GR18_INNER", + SpawnLocationType.Inside106Primary => "106_PRIMARY", + SpawnLocationType.Inside106Secondary => "106_SECONDARY", + SpawnLocationType.Inside939Cryo => "939_CRYO", + SpawnLocationType.Inside079Armory => "079_ARMORY", _ => default, }; } From 48179e7481698c4d2a602c95193760576efcd8bf Mon Sep 17 00:00:00 2001 From: Snivy Films Date: Sat, 15 Mar 2025 09:15:49 -0400 Subject: [PATCH 3/5] Fixes the Frenchie's English --- EXILED/Exiled.API/Features/Player.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EXILED/Exiled.API/Features/Player.cs b/EXILED/Exiled.API/Features/Player.cs index 0210830293..2f6597d830 100644 --- a/EXILED/Exiled.API/Features/Player.cs +++ b/EXILED/Exiled.API/Features/Player.cs @@ -3278,7 +3278,7 @@ public void EnableEffect(EffectType type, float duration = 0f, bool addDurationI /// The intensity of the effect will be active for. /// The amount of time the effect will be active for. /// If the effect is already active, setting to will add this duration onto the effect. - /// return if the effect has been Enable. + /// A bool indicating whether the effect was valid and successfully enabled. public bool EnableEffect(EffectType type, byte intensity, float duration = 0f, bool addDurationIfActive = false) => TryGetEffect(type, out StatusEffectBase statusEffect) && EnableEffect(statusEffect, intensity, duration, addDurationIfActive); From 0ae93e5a844ae715194cee7a2c111bed9b4a6a25 Mon Sep 17 00:00:00 2001 From: Snivy Films Date: Tue, 12 Aug 2025 13:43:10 -0400 Subject: [PATCH 4/5] Dynamic Spawn Point Stuff --- EXILED/Exiled.API/Enums/SpawnLocationType.cs | 10 ++++++++-- EXILED/Exiled.API/Extensions/SpawnExtensions.cs | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs index ae957d3362..4d2d8519c0 100644 --- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs +++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs @@ -132,12 +132,13 @@ public enum SpawnLocationType /// /// Inside the lower door that leads to the stairs in Micro-HID room. /// + [Obsolete("This Location has been removed from the game.")] InsideHidLower, /// - /// Inside the upper door that leads into the Micro-HID room just after the stairs. + /// Inside the upper door that leads into the Micro-HID Lab Room. /// - InsideHidUpper, + InsideHidLab, /// /// Just inside the LCZ WC door. @@ -168,5 +169,10 @@ public enum SpawnLocationType /// Inside SCP-079's Armory /// Inside079Armory, + + /// + /// Inside SCP-127's Lab + /// + Inside127Lab, } } \ No newline at end of file diff --git a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs index 29da4ab802..5e21f52eaa 100644 --- a/EXILED/Exiled.API/Extensions/SpawnExtensions.cs +++ b/EXILED/Exiled.API/Extensions/SpawnExtensions.cs @@ -25,7 +25,7 @@ public static class SpawnExtensions { SpawnLocationType.InsideHczArmory, SpawnLocationType.Inside079First, - SpawnLocationType.InsideHidUpper, + SpawnLocationType.InsideHidLab, SpawnLocationType.Inside173Gate, SpawnLocationType.InsideGateA, SpawnLocationType.InsideGateB, @@ -86,11 +86,10 @@ public static Vector3 GetPosition(this SpawnLocationType location) SpawnLocationType.InsideGateA => "GATE_A", SpawnLocationType.InsideGateB => "GATE_B", SpawnLocationType.InsideLczWc => "LCZ_WC", - SpawnLocationType.InsideHidLower => "HID_LOWER", SpawnLocationType.InsideLczCafe => "LCZ_CAFE", SpawnLocationType.Inside173Gate => "173_GATE", SpawnLocationType.InsideIntercom => "INTERCOM", - SpawnLocationType.InsideHidUpper => "HID_UPPER", + SpawnLocationType.InsideHidLab => "HID_LAB", SpawnLocationType.Inside079First => "079_FIRST", SpawnLocationType.Inside330Chamber => "330_CHAMBER", SpawnLocationType.Inside049Armory => "049_ARMORY", @@ -108,6 +107,7 @@ public static Vector3 GetPosition(this SpawnLocationType location) SpawnLocationType.Inside106Secondary => "106_SECONDARY", SpawnLocationType.Inside939Cryo => "939_CRYO", SpawnLocationType.Inside079Armory => "079_ARMORY", + SpawnLocationType.Inside127Lab => "HCZ_127_LAB", _ => default, }; } From f94b33980e8e6b1e027ed4ea4fc68f682978b4df Mon Sep 17 00:00:00 2001 From: Snivy Films Date: Wed, 13 Aug 2025 10:13:17 -0400 Subject: [PATCH 5/5] Made changes that the frenchie asked for --- EXILED/Exiled.API/Enums/SpawnLocationType.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/EXILED/Exiled.API/Enums/SpawnLocationType.cs b/EXILED/Exiled.API/Enums/SpawnLocationType.cs index 4d2d8519c0..2fc9d2a780 100644 --- a/EXILED/Exiled.API/Enums/SpawnLocationType.cs +++ b/EXILED/Exiled.API/Enums/SpawnLocationType.cs @@ -132,13 +132,14 @@ public enum SpawnLocationType /// /// Inside the lower door that leads to the stairs in Micro-HID room. /// - [Obsolete("This Location has been removed from the game.")] + [Obsolete("This location has been removed from the game.")] InsideHidLower, /// - /// Inside the upper door that leads into the Micro-HID Lab Room. + /// Inside the upper door that leads into the Micro-HID room just after the stairs. /// - InsideHidLab, + [Obsolete("This location has been removed from the game. Use InsideHidLab instead.")] + InsideHidUpper, /// /// Just inside the LCZ WC door. @@ -174,5 +175,10 @@ public enum SpawnLocationType /// Inside SCP-127's Lab /// Inside127Lab, + + /// + /// Inside the upper door that leads into the Micro-HID Lab room. + /// + InsideHidLab, } } \ No newline at end of file