Skip to content

[Exiled::API] RoomType & ZoneType & GlassType fix #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Misaka-ZeroTwo merged 4 commits into from
Nov 28, 2024
Merged

[Exiled::API] RoomType & ZoneType & GlassType fix #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2bfdb52
yipee (#244)
IRacle1 Nov 28, 2024
92ed7ff
room + docs
VALERA771 Nov 28, 2024
8de2dee
Merge branch 'scpsl14' into new-rooms
Misaka-ZeroTwo Nov 28, 2024
cbad72b
Delete Exiled/Exiled.Events/Patches/Events/Server/WaitingForPlayers.cs
Misaka-ZeroTwo Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion EXILED/Exiled.API/Enums/RoomType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,15 @@ public enum RoomType
EzCollapsedTunnel,

/// <summary>
/// Entrance Zone's straight hall with Dr.L's locked room.
/// Entrance Zone's straight hall with Dr.L's or Dr. Gear's locked room.
/// </summary>
EzConference,

/// <summary>
/// Entrance Zone's straight hall with Chef's locked room.
/// </summary>
EzChef,

/// <summary>
/// Entrance Zone's straight hall
/// </summary>
Expand Down
7 changes: 6 additions & 1 deletion EXILED/Exiled.API/Enums/ZoneType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,14 @@ public enum ZoneType
/// </summary>
Surface = 8,

/// <summary>
/// The Pocket Dimension.
/// </summary>
Pocket = 16,

/// <summary>
/// An unknown type of zone.
/// </summary>
Other = 16,
Other = 32,
}
}
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Features/Respawn.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ public static void SummonNtfChopper()
/// <summary>
/// Summons the <see cref="Side.ChaosInsurgency"/> van.
/// </summary>
/// <remarks>This will also trigger Music effect.</remarks>
public static void SummonChaosInsurgencyVan()
{
if (TryGetWaveBase(Faction.FoundationEnemy, out SpawnableWaveBase wave))
Expand Down
25 changes: 14 additions & 11 deletions EXILED/Exiled.API/Features/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,14 +434,14 @@ private static RoomType FindType(GameObject gameObject)
"HCZ_MicroHID_New" => RoomType.HczHid,
"HCZ_049" => RoomType.Hcz049,
"HCZ_Crossing" => RoomType.HczCrossing,
"HCZ_106" => RoomType.Hcz106,
"HCZ_106_Rework" => RoomType.Hcz106,
"HCZ_Nuke" => RoomType.HczNuke,
"HCZ_Tesla_Rework" => RoomType.HczTesla,
"HCZ_Servers" => RoomType.HczServers,
"HCZ_Room3" => RoomType.HczTCross,
"HCZ_457" => RoomType.Hcz096,
"HCZ_Curve" => RoomType.HczCurve,
"HCZ_Straight" => RoomType.HczStraight,
"HCZ_Room3" or "HCZ_Intersection_Junk" or "HCZ_Intersection" => RoomType.HczTCross,
"HCZ_096" => RoomType.Hcz096,
"HCZ_Curve" or "HCZ_Corner_Deep" => RoomType.HczCurve,
"HCZ_Straight_C" or "HCZ_Straight" or "HCZ_Straight_PipeRoom" or "HCZ_Straight Variant" => RoomType.HczStraight,
"HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
"EZ_Endoof" => RoomType.EzVent,
"EZ_Intercom" => RoomType.EzIntercom,
Expand All @@ -451,7 +451,8 @@ private static RoomType FindType(GameObject gameObject)
"EZ_PCs" => RoomType.EzPcs,
"EZ_Crossing" => RoomType.EzCrossing,
"EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
"EZ_Smallrooms2" => RoomType.EzConference,
"EZ_Smallrooms2" or "EZ_Smallrooms1" => RoomType.EzConference,
"EZ_Chef" => RoomType.EzChef,
"EZ_Straight" => RoomType.EzStraight,
"EZ_Cafeteria" => RoomType.EzCafeteria,
"EZ_upstairs" => RoomType.EzUpstairsPcs,
Expand All @@ -461,14 +462,13 @@ private static RoomType FindType(GameObject gameObject)
"PocketWorld" => RoomType.Pocket,
"Outside" => RoomType.Surface,
"HCZ_939" => RoomType.Hcz939,
"EZ Part" => RoomType.EzCheckpointHallway,
"EZ_HCZ_Checkpoint Part" => RoomType.EzCheckpointHallway,
"HCZ_ChkpA" => RoomType.HczElevatorA,
"HCZ_ChkpB" => RoomType.HczElevatorB,
"HCZ Part" => gameObject.transform.parent.name switch
"HCZ_EZ_Checkpoint Part" => gameObject.transform.position.z switch
{
"HCZ_EZ_Checkpoint (A)" => RoomType.HczEzCheckpointA,
"HCZ_EZ_Checkpoint (B)" => RoomType.HczEzCheckpointB,
_ => RoomType.Unknown
> 80 => RoomType.HczEzCheckpointA,
_ => RoomType.HczEzCheckpointB
},
_ => RoomType.Unknown,
};
Expand All @@ -478,6 +478,9 @@ private static ZoneType FindZone(GameObject gameObject)
{
Transform transform = gameObject.transform;

if (gameObject.name == "PocketWorld")
return ZoneType.Pocket;

return transform.parent?.name.RemoveBracketsOnEndOfName() switch
{
"HeavyRooms" => ZoneType.HeavyContainment,
Expand Down