Skip to content

Commit da34f22

Browse files
louis1706BoltonDevVALERA771
authored
refactor!: update to 14.1 (ExMod-Team#508)
* refactor!: update to 14.1 * fix: few patches fix * feat: new custom keycard logic * fix: ActivatingWarheadPanel event * fix: checkpoint sequence time * fix: Shot event * fix: DroppingCandy event * Fix last Error on Release Build * Update new PrefabType * fix: AnnouncingScpTermination event * fix: SpawningItem event error (require testing) * fix: Shot.cs fix * analysis error * Fix error * Fix build error * NW_Documentation * fix: announcing wave entrance * Reference new Room * Fix Build error * fix: fixes pickingup event * Nameless Skill Issue * fix: locker patch * fix: spawning room connector * CameraToy * Get CameraToy * Finish InteractableToy & fix doc * fix Error for build * Remove todo * fix: generator events * ElevatorType.ServerRoom * Fix a 2 hours loss * Fix NW moment * fix: interacting generator * fix: interacting locker event * fix: missing obstacle shot * fix: KeycardInteracting again * Fix SendingCassieMessage * fix: temp fix interacting door (need to refactor) * refactor: change the property * fix doc * extension for Scp127 & ServerRoom * FirearmType.Scp127 * AdminToyList * fix: camera weren't added * new CameraType * wrong doc * fix: interacting door event (improved) * Invalid Camera * Better doc * fix: interacting door (bolton issue) * FixDamagingWindow index * RemoveBreakingChange * Fix FailingEscapePocketDimensionEventArgs --------- Co-authored-by: Bolton <48883340+BoltonDev@users.noreply.github.com> Co-authored-by: VALERA771 <val.germanov@gmail.com> Co-authored-by: VALERA771 <72030575+VALERA771@users.noreply.github.com>
1 parent 8d66cc9 commit da34f22

File tree

84 files changed

+1445
-746
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1445
-746
lines changed

‎EXILED/Exiled.API/Enums/AdminToyType.cs‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,15 @@ public enum AdminToyType
3737
/// Capybara toy.
3838
/// </summary>
3939
Capybara,
40+
41+
/// <summary>
42+
/// InvisibleInteractable toy.
43+
/// </summary>
44+
InvisibleInteractableToy,
45+
46+
/// <summary>
47+
/// Camera Object toy.
48+
/// </summary>
49+
CameraToy,
4050
}
4151
}

‎EXILED/Exiled.API/Enums/CameraType.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public enum CameraType
123123
Hcz173ContChamber,
124124
[System.Obsolete("This Camera no longer exist.")]
125125
Hcz173Hallway,
126+
[System.Obsolete("This Camera no longer exist.")]
126127
HczCurve,
127128
HczJunkMain,
128129
HczJunkHallway,
@@ -137,6 +138,19 @@ public enum CameraType
137138
HczWarheadPortElevator,
138139
HczMicroHIDLab,
139140
HczPipesMain,
141+
HczScp127Lab,
142+
HczScp127Containment,
143+
HczServersUpperStorage,
144+
HczLowerServerStorage,
145+
HczServerStaircase,
146+
#endregion
147+
148+
#region custom
149+
EzArmCameraToy,
150+
EzCameraToy,
151+
HczCameraToy,
152+
LczCameraToy,
153+
SzCameraToy,
140154
#endregion
141155
}
142156
}

‎EXILED/Exiled.API/Enums/DamageType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,5 +269,10 @@ public enum DamageType
269269
/// Damage caused by <see cref="ItemType.Snowball"/>.
270270
/// </summary>
271271
SnowBall,
272+
273+
/// <summary>
274+
/// Damage caused by <see cref="ItemType.GunSCP127"/>.
275+
/// </summary>
276+
Scp127,
272277
}
273278
}

‎EXILED/Exiled.API/Enums/DoorType.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,20 @@ public enum DoorType
167167
/// <summary>
168168
/// Represents the HID_UPPER door.
169169
/// </summary>
170+
[Obsolete("This Door has been renamed too HID_LAB.")]
170171
HIDUpper,
171172

173+
/// <summary>
174+
/// Represents the HID_LAB door.
175+
/// </summary>
176+
#pragma warning disable CS0618
177+
HIDLab = HIDUpper,
178+
#pragma warning restore CS0618
179+
172180
/// <summary>
173181
/// Represents the HID_LOWER door.
174182
/// </summary>
183+
[Obsolete("This Door has been removed from the game.")]
175184
HIDLower,
176185

177186
/// <summary>
@@ -320,5 +329,15 @@ public enum DoorType
320329
/// Represents the ESCAPE_FINAL door.
321330
/// </summary>
322331
EscapeFinal,
332+
333+
/// <summary>
334+
/// Represents the Elevator door for <see cref="ElevatorGroup.ServerRoom"/>.
335+
/// </summary>
336+
ElevatorServerRoom,
337+
338+
/// <summary>
339+
/// Represents the HCZ_127_LAB door.
340+
/// </summary>
341+
Hcz127Lab,
323342
}
324343
}

‎EXILED/Exiled.API/Enums/ElevatorType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,10 @@ public enum ElevatorType : byte
4848
/// Light Containment Zone checkpoint B elevator.
4949
/// </summary>
5050
LczB,
51+
52+
/// <summary>
53+
/// Heavy Containment Zone ServerRoom elevator.
54+
/// </summary>
55+
ServerRoom,
5156
}
5257
}

‎EXILED/Exiled.API/Enums/FirearmType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,5 +89,10 @@ public enum FirearmType
8989
/// Represents the <see cref="ItemType.GunA7"/>.
9090
/// </summary>
9191
A7,
92+
93+
/// <summary>
94+
/// Represents the <see cref="ItemType.GunSCP127"/>.
95+
/// </summary>
96+
Scp127,
9297
}
9398
}

‎EXILED/Exiled.API/Enums/GeneratorState.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ namespace Exiled.API.Enums
2020
public enum GeneratorState : byte
2121
{
2222
/// <summary>
23-
/// Generator is locked.
23+
/// Generator is doing nothing.
2424
/// </summary>
25-
None = 1,
25+
None = 0,
2626

2727
/// <summary>
2828
/// Generator is unlocked.

‎EXILED/Exiled.API/Enums/GlassType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,10 @@ public enum GlassType
6969
/// Represents the window in <see cref="RoomType.HczTestRoom"/>.
7070
/// </summary>
7171
TestRoom,
72+
73+
/// <summary>
74+
/// Represents the window in <see cref="RoomType.Hcz127"/>.
75+
/// </summary>
76+
Scp127,
7277
}
7378
}

‎EXILED/Exiled.API/Enums/LockerType.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,10 @@ public enum LockerType
115115
/// SCP-1853 pedestal.
116116
/// </summary>
117117
Scp1853Pedestal,
118+
119+
/// <summary>
120+
/// SCP-127 pedestal.
121+
/// </summary>
122+
Scp127Pedestal,
118123
}
119124
}

‎EXILED/Exiled.API/Enums/PrefabType.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,5 +345,29 @@ public enum PrefabType
345345

346346
[Prefab(1548138668, "AutoRagdoll")]
347347
AutoRagdoll,
348+
349+
[Prefab(1323017091, "ElevatorChamberCargo")]
350+
ElevatorChamberCargo,
351+
352+
[Prefab(359728307, "InvisibleInteractableToy")]
353+
InvisibleInteractableToy,
354+
355+
[Prefab(1824808402, "EzArmCameraToy")]
356+
EzArmCameraToy,
357+
358+
[Prefab(3375932423, "EzCameraToy")]
359+
EzCameraToy,
360+
361+
[Prefab(144958943, "HczCameraToy")]
362+
HczCameraToy,
363+
364+
[Prefab(2026969629, "LczCameraToy")]
365+
LczCameraToy,
366+
367+
[Prefab(1548138668, "SzCameraToy")]
368+
SzCameraToy,
369+
370+
[Prefab(2842703865, "KeycardPickup_Chaos")]
371+
KeycardPickupChaos,
348372
}
349373
}

0 commit comments

Comments
 (0)