Skip to content

Add docs to some RoomType & remove types no longer present #293

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
BoltonDev merged 4 commits into from
Dec 3, 2024
Merged

Add docs to some RoomType & remove types no longer present #293

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
c0ba598
docs + fix: remove unused types
BoltonDev Dec 2, 2024
b429c9c
fix: missing servers
BoltonDev Dec 2, 2024
e18f802
fix: missing ez straight column
BoltonDev Dec 3, 2024
6ded48d
Merge branch 'scpsl14' into fix-room
BoltonDev Dec 3, 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
3 changes: 0 additions & 3 deletions EXILED/Exiled.API/Enums/CameraType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ public enum CameraType
HczElevSysB,
HczHallway,
HczThreeWay,
HczServersBottom,
HczServersStairs,
HczServersTop,
HczTeslaGate,
HczTestroomBridge,
HczTestroomMain,
Expand Down
5 changes: 0 additions & 5 deletions EXILED/Exiled.API/Enums/DoorType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,6 @@ public enum DoorType
/// </summary>
EscapeSecondary,

/// <summary>
/// Represents the SERVERS_BOTTOM door.
/// </summary>
ServersBottom,

/// <summary>
/// Represents the GATE_A door.
/// </summary>
Expand Down
30 changes: 10 additions & 20 deletions EXILED/Exiled.API/Enums/RoomType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,6 @@ public enum RoomType
/// </summary>
HczTesla,

/// <summary>
/// Heavy Containment Zone's Servers room.
/// </summary>
HczServers,

/// <summary>
/// Heavy Containment Zone's 3-way intersection.
/// </summary>
HczTCross,

/// <summary>
/// Heavy Containment Zone's cruved hall.
/// </summary>
Expand Down Expand Up @@ -255,7 +245,7 @@ public enum RoomType
Surface,

/// <summary>
/// Heavy Containment Zone's straight hall.
/// Heavy Containment Zone's straight hall with ceiling fan.
/// </summary>
HczStraight,

Expand All @@ -265,7 +255,7 @@ public enum RoomType
EzTCross,

/// <summary>
/// Light Containment ZOne's SCP-330 room.
/// Light Containment Zone's SCP-330 room.
/// </summary>
Lcz330,

Expand Down Expand Up @@ -295,42 +285,42 @@ public enum RoomType
HczElevatorB,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's cross room with waterfall.
/// </summary>
HczCrossRoomWater,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's corner.
/// </summary>
HczCornerDeep,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's 3-way intersection with storage crates obstructing the passage.
/// </summary>
HczIntersectionJunk,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's 3-way intersection.
/// </summary>
HczIntersection,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's straight hall with pipelines and sanitary door.
/// </summary>
HczStraightC,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's straight hall with pipelines obstructing the passage.
/// </summary>
HczStraightPipeRoom,

/// <summary>
/// Lazy TODO.
/// Heavy Containment Zone's straight hall.
/// </summary>
HczStraightVariant,

/// <summary>
/// Lazy TODO.
/// Entrance Zone's straight hall with Dr.L's and conference room 9b locked room.
/// </summary>
EzSmallrooms,
}
Expand Down
5 changes: 0 additions & 5 deletions EXILED/Exiled.API/Enums/SpawnLocationType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,5 @@ public enum SpawnLocationType
/// Just inside the LCZ WC door.
/// </summary>
InsideLczWc,

/// <summary>
/// Just inside the door at the bottom of the server's room.
/// </summary>
InsideServersBottom,
}
}
2 changes: 0 additions & 2 deletions EXILED/Exiled.API/Extensions/SpawnExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public static class SpawnExtensions
/// </summary>
public static readonly SpawnLocationType[] ReversedLocations =
{
SpawnLocationType.InsideServersBottom,
SpawnLocationType.InsideHczArmory,
SpawnLocationType.Inside079First,
SpawnLocationType.InsideHidRight,
Expand Down Expand Up @@ -103,7 +102,6 @@ public static Vector3 GetPosition(this SpawnLocationType location)
SpawnLocationType.InsideSurfaceNuke => "SURFACE_NUKE",
SpawnLocationType.Inside079Secondary => "079_SECOND",
SpawnLocationType.Inside173Connector => "173_CONNECTOR",
SpawnLocationType.InsideServersBottom => "SERVERS_BOTTOM",
SpawnLocationType.InsideEscapePrimary => "ESCAPE_PRIMARY",
SpawnLocationType.InsideEscapeSecondary => "ESCAPE_SECONDARY",
_ => default,
Expand Down
3 changes: 0 additions & 3 deletions EXILED/Exiled.API/Features/Camera.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
["HCZ ELEV SYS B"] = CameraType.HczElevSysB,
["HCZ HALLWAY"] = CameraType.HczHallway,
["HCZ THREE-WAY"] = CameraType.HczThreeWay,
["SERVERS BOTTOM"] = CameraType.HczServersBottom,
["SERVERS STAIRS"] = CameraType.HczServersStairs,
["SERVERS TOP"] = CameraType.HczServersTop,
["TESLA GATE"] = CameraType.HczTeslaGate,
["TESTROOM BRIDGE"] = CameraType.HczTestroomBridge,
["TESTROOM MAIN"] = CameraType.HczTestroomMain,
Expand Down
1 change: 0 additions & 1 deletion EXILED/Exiled.API/Features/Doors/Door.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ private DoorType GetDoorType()
"079_FIRST" => DoorType.Scp079First,
"GATE_B" => DoorType.GateB,
"079_SECOND" => DoorType.Scp079Second,
"SERVERS_BOTTOM" => DoorType.ServersBottom,
"173_CONNECTOR" => DoorType.Scp173Connector,
"LCZ_WC" => DoorType.LczWc,
"HID_CHAMBER" => DoorType.HIDChamber,
Expand Down
71 changes: 35 additions & 36 deletions EXILED/Exiled.API/Features/Room.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,70 +412,69 @@ private static RoomType FindType(GameObject gameObject)
// Try to remove brackets if they exist.
return gameObject.name.RemoveBracketsOnEndOfName() switch
{
"LCZ_Armory" => RoomType.LczArmory,
"LCZ_Curve" => RoomType.LczCurve,
"LCZ_Straight" => RoomType.LczStraight,
"LCZ_330" => RoomType.Lcz330,
"LCZ_914" => RoomType.Lcz914,
"LCZ_Crossing" => RoomType.LczCrossing,
"LCZ_TCross" => RoomType.LczTCross,
"PocketWorld" => RoomType.Pocket,
"Outside" => RoomType.Surface,
"LCZ_Cafe" => RoomType.LczCafe,
"LCZ_Plants" => RoomType.LczPlants,
"LCZ_Toilets" => RoomType.LczToilets,
"LCZ_TCross" => RoomType.LczTCross,
"LCZ_Airlock" => RoomType.LczAirlock,
"LCZ_173" => RoomType.Lcz173,
"LCZ_ClassDSpawn" => RoomType.LczClassDSpawn,
"LCZ_ChkpA" => RoomType.LczCheckpointA,
"LCZ_ChkpB" => RoomType.LczCheckpointB,
"LCZ_Plants" => RoomType.LczPlants,
"LCZ_Straight" => RoomType.LczStraight,
"LCZ_Armory" => RoomType.LczArmory,
"LCZ_Crossing" => RoomType.LczCrossing,
"LCZ_Curve" => RoomType.LczCurve,
"LCZ_173" => RoomType.Lcz173,
"LCZ_330" => RoomType.Lcz330,
"LCZ_372" => RoomType.LczGlassBox,
"LCZ_ChkpA" => RoomType.LczCheckpointA,
"HCZ_079" => RoomType.Hcz079,
"LCZ_914" => RoomType.Lcz914,
"LCZ_ClassDSpawn" => RoomType.LczClassDSpawn,
"HCZ_Nuke" => RoomType.HczNuke,
"HCZ_TArmory" => RoomType.HczArmory,
"HCZ_Testroom" => RoomType.HczTestRoom,
"HCZ_MicroHID_New" => RoomType.HczHid,
"HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
"HCZ_Testroom" => RoomType.HczTestRoom,
"HCZ_049" => RoomType.Hcz049,
"HCZ_Crossing" => RoomType.HczCrossing,
"HCZ_079" => RoomType.Hcz079,
"HCZ_096" => RoomType.Hcz096,
"HCZ_106_Rework" => RoomType.Hcz106,
"HCZ_Nuke" => RoomType.HczNuke,
"HCZ_939" => RoomType.Hcz939,
"HCZ_Tesla_Rework" => RoomType.HczTesla,
"HCZ_Servers" => RoomType.HczServers,
"HCZ_Room3" => RoomType.HczTCross,
"HCZ_Intersection_Junk" => RoomType.HczIntersectionJunk,
"HCZ_Intersection" => RoomType.HczIntersectionJunk,
"HCZ_096" => RoomType.Hcz096,
"HCZ_Curve" => RoomType.HczCurve,
"HCZ_Crossing" => RoomType.HczCrossing,
"HCZ_Intersection" => RoomType.HczIntersection,
"HCZ_Intersection_Junk" => RoomType.HczIntersectionJunk,
"HCZ_Corner_Deep" => RoomType.HczCornerDeep,
"HCZ_Straight_C" => RoomType.HczStraightC,
"HCZ_Straight" => RoomType.HczStraight,
"HCZ_Straight_C" => RoomType.HczStraightC,
"HCZ_Straight_PipeRoom"=> RoomType.HczStraightPipeRoom,
"HCZ_Straight Variant" => RoomType.HczStraightVariant,
"HCZ_Crossroom_Water" => RoomType.HczCrossRoomWater,
"EZ_Endoof" => RoomType.EzVent,
"EZ_Intercom" => RoomType.EzIntercom,
"HCZ_ChkpA" => RoomType.HczElevatorA,
"HCZ_ChkpB" => RoomType.HczElevatorB,
"EZ_GateA" => RoomType.EzGateA,
"EZ_PCs_small" => RoomType.EzDownstairsPcs,
"EZ_GateB" => RoomType.EzGateB,
"EZ_ThreeWay" => RoomType.EzTCross,
"EZ_Crossing" => RoomType.EzCrossing,
"EZ_Curve" => RoomType.EzCurve,
"EZ_PCs" => RoomType.EzPcs,
"EZ_Crossing" => RoomType.EzCrossing,
"EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
"EZ_Smallrooms1" => RoomType.EzConference,
"EZ_upstairs" => RoomType.EzUpstairsPcs,
"EZ_Intercom" => RoomType.EzIntercom,
"EZ_Smallrooms2" => RoomType.EzSmallrooms,
"EZ_PCs_small" => RoomType.EzDownstairsPcs,
"EZ_Chef" => RoomType.EzChef,
"EZ_Endoof" => RoomType.EzVent,
"EZ_CollapsedTunnel" => RoomType.EzCollapsedTunnel,
"EZ_Smallrooms1" => RoomType.EzConference,
"EZ_Straight" => RoomType.EzStraight,
"EZ_StraightColumn" => RoomType.EzStraight,
"EZ_Cafeteria" => RoomType.EzCafeteria,
"EZ_upstairs" => RoomType.EzUpstairsPcs,
"EZ_GateB" => RoomType.EzGateB,
"EZ_Shelter" => RoomType.EzShelter,
"EZ_ThreeWay" => RoomType.EzTCross,
"PocketWorld" => RoomType.Pocket,
"Outside" => RoomType.Surface,
"HCZ_939" => RoomType.Hcz939,
"EZ_HCZ_Checkpoint Part" => gameObject.transform.position.z switch
{
> 80 => RoomType.EzCheckpointHallwayA,
_ => RoomType.EzCheckpointHallwayB,
},
"HCZ_ChkpA" => RoomType.HczElevatorA,
"HCZ_ChkpB" => RoomType.HczElevatorB,
"HCZ_EZ_Checkpoint Part" => gameObject.transform.position.z switch
{
> 80 => RoomType.HczEzCheckpointA,
Expand Down