Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
5232ebf
refactor!: update to 14.1
BoltonDev Apr 25, 2025
6416352
fix: few patches fix
BoltonDev Apr 26, 2025
6f009a8
feat: new custom keycard logic
VALERA771 Apr 26, 2025
3e338d3
fix: ActivatingWarheadPanel event
BoltonDev Apr 26, 2025
e99ac6a
fix: checkpoint sequence time
BoltonDev Apr 26, 2025
6923fd0
fix: Shot event
BoltonDev Apr 26, 2025
7a52a62
fix: DroppingCandy event
BoltonDev Apr 26, 2025
2a5fbd3
Fix last Error on Release Build
louis1706 Apr 26, 2025
9df1d11
Update new PrefabType
louis1706 Apr 26, 2025
737d110
fix: AnnouncingScpTermination event
BoltonDev Apr 26, 2025
e5ecbc1
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 26, 2025
29cc800
fix: SpawningItem event error (require testing)
BoltonDev Apr 26, 2025
f524187
Merge branch 'LabAPI' into 14.1.0-update
louis1706 Apr 26, 2025
930958b
Merge branch '14.1.0-update' into new-customkeycard
VALERA771 Apr 26, 2025
c95ab2a
fix: Shot.cs fix
VALERA771 Apr 26, 2025
63838b3
Merge remote-tracking branch 'origin/new-customkeycard' into new-cust…
VALERA771 Apr 26, 2025
d9011cd
Merge pull request #3 from VALERA771/new-customkeycard
VALERA771 Apr 26, 2025
48c22df
analysis error
BoltonDev Apr 26, 2025
cb8ddc8
Fix error
louis1706 Apr 26, 2025
f84a40a
Merge branch '14.1.0-update' of https://github.com/BoltonDev/EXILED i…
louis1706 Apr 26, 2025
768482d
Fix build error
louis1706 Apr 26, 2025
a761571
NW_Documentation
louis1706 Apr 26, 2025
039279b
fix: announcing wave entrance
BoltonDev Apr 26, 2025
1211e70
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 26, 2025
25c70d9
Reference new Room
louis1706 Apr 26, 2025
0340ad6
Merge branch '14.1.0-update' of https://github.com/BoltonDev/EXILED i…
louis1706 Apr 26, 2025
b9e23e6
Fix Build error
louis1706 Apr 26, 2025
b78fb1e
fix: fixes pickingup event
BoltonDev Apr 26, 2025
1869fe1
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 26, 2025
c4a6532
Nameless Skill Issue
louis1706 Apr 26, 2025
3b94e6d
fix: locker patch
BoltonDev Apr 26, 2025
18d2fbd
fix: spawning room connector
BoltonDev Apr 26, 2025
e7e403e
CameraToy
louis1706 Apr 26, 2025
55cf24e
Merge branch '14.1.0-update' of https://github.com/BoltonDev/EXILED i…
louis1706 Apr 26, 2025
b4c1c67
Get CameraToy
louis1706 Apr 26, 2025
b6066e5
Finish InteractableToy & fix doc
louis1706 Apr 26, 2025
f093d46
fix Error for build
louis1706 Apr 26, 2025
91a199b
Remove todo
louis1706 Apr 26, 2025
76c393c
fix: generator events
BoltonDev Apr 26, 2025
c6f2368
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 26, 2025
010319c
ElevatorType.ServerRoom
louis1706 Apr 26, 2025
aa5e690
Fix a 2 hours loss
louis1706 Apr 26, 2025
13f3960
Fix NW moment
louis1706 Apr 26, 2025
0befdfd
fix: interacting generator
BoltonDev Apr 26, 2025
dfb5460
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 26, 2025
eaa3bdd
fix: interacting locker event
BoltonDev Apr 26, 2025
772a95a
fix: missing obstacle shot
BoltonDev Apr 26, 2025
35982b6
fix: KeycardInteracting again
BoltonDev Apr 26, 2025
7321ada
Fix SendingCassieMessage
louis1706 Apr 26, 2025
8759339
Merge branch '14.1.0-update' of https://github.com/BoltonDev/EXILED i…
louis1706 Apr 26, 2025
f9d3409
fix: temp fix interacting door (need to refactor)
BoltonDev Apr 27, 2025
65830ae
refactor: change the property
BoltonDev Apr 27, 2025
ed1b8df
fix doc
louis1706 Apr 27, 2025
45e6ebe
Merge branch '14.1.0-update' of https://github.com/BoltonDev/EXILED i…
louis1706 Apr 27, 2025
af8730b
extension for Scp127 & ServerRoom
louis1706 Apr 27, 2025
234b075
FirearmType.Scp127
louis1706 Apr 27, 2025
ad7138b
AdminToyList
louis1706 Apr 27, 2025
cb73874
fix: camera weren't added
BoltonDev Apr 27, 2025
cc352cd
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 27, 2025
2f1138a
new CameraType
louis1706 Apr 27, 2025
ef12710
wrong doc
louis1706 Apr 27, 2025
1fd6366
fix: interacting door event (improved)
BoltonDev Apr 27, 2025
00404c5
Merge remote-tracking branch 'bolton-repo/14.1.0-update' into 14.1.0-…
BoltonDev Apr 27, 2025
c8087b3
Invalid Camera
louis1706 Apr 27, 2025
4c5231a
Better doc
louis1706 Apr 27, 2025
cca4cef
fix: interacting door (bolton issue)
BoltonDev Apr 27, 2025
7fd35e7
FixDamagingWindow index
louis1706 Apr 27, 2025
1a7d7f4
RemoveBreakingChange
louis1706 Apr 27, 2025
799a367
Fix FailingEscapePocketDimensionEventArgs
louis1706 Apr 27, 2025
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
10 changes: 10 additions & 0 deletions EXILED/Exiled.API/Enums/AdminToyType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,15 @@ public enum AdminToyType
/// Capybara toy.
/// </summary>
Capybara,

/// <summary>
/// InvisibleInteractable toy.
/// </summary>
InvisibleInteractableToy,

/// <summary>
/// Camera Object toy.
/// </summary>
CameraToy,
}
}
14 changes: 14 additions & 0 deletions EXILED/Exiled.API/Enums/CameraType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public enum CameraType
Hcz173ContChamber,
[System.Obsolete("This Camera no longer exist.")]
Hcz173Hallway,
[System.Obsolete("This Camera no longer exist.")]
HczCurve,
HczJunkMain,
HczJunkHallway,
Expand All @@ -137,6 +138,19 @@ public enum CameraType
HczWarheadPortElevator,
HczMicroHIDLab,
HczPipesMain,
HczScp127Lab,
HczScp127Containment,
HczServersUpperStorage,
HczLowerServerStorage,
HczServerStaircase,
#endregion

#region custom
EzArmCameraToy,
EzCameraToy,
HczCameraToy,
LczCameraToy,
SzCameraToy,
#endregion
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/DamageType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -269,5 +269,10 @@ public enum DamageType
/// Damage caused by <see cref="ItemType.Snowball"/>.
/// </summary>
SnowBall,

/// <summary>
/// Damage caused by <see cref="ItemType.GunSCP127"/>.
/// </summary>
Scp127,
}
}
19 changes: 19 additions & 0 deletions EXILED/Exiled.API/Enums/DoorType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,20 @@ public enum DoorType
/// <summary>
/// Represents the HID_UPPER door.
/// </summary>
[Obsolete("This Door has been renamed too HID_LAB.")]
HIDUpper,

/// <summary>
/// Represents the HID_LAB door.
/// </summary>
#pragma warning disable CS0618
HIDLab = HIDUpper,
#pragma warning restore CS0618

/// <summary>
/// Represents the HID_LOWER door.
/// </summary>
[Obsolete("This Door has been removed from the game.")]
HIDLower,

/// <summary>
Expand Down Expand Up @@ -320,5 +329,15 @@ public enum DoorType
/// Represents the ESCAPE_FINAL door.
/// </summary>
EscapeFinal,

/// <summary>
/// Represents the Elevator door for <see cref="ElevatorGroup.ServerRoom"/>.
/// </summary>
ElevatorServerRoom,

/// <summary>
/// Represents the HCZ_127_LAB door.
/// </summary>
Hcz127Lab,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/ElevatorType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,10 @@ public enum ElevatorType : byte
/// Light Containment Zone checkpoint B elevator.
/// </summary>
LczB,

/// <summary>
/// Heavy Containment Zone ServerRoom elevator.
/// </summary>
ServerRoom,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/FirearmType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,5 +89,10 @@ public enum FirearmType
/// Represents the <see cref="ItemType.GunA7"/>.
/// </summary>
A7,

/// <summary>
/// Represents the <see cref="ItemType.GunSCP127"/>.
/// </summary>
Scp127,
}
}
4 changes: 2 additions & 2 deletions EXILED/Exiled.API/Enums/GeneratorState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ namespace Exiled.API.Enums
public enum GeneratorState : byte
{
/// <summary>
/// Generator is locked.
/// Generator is doing nothing.
/// </summary>
None = 1,
None = 0,

/// <summary>
/// Generator is unlocked.
Expand Down
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/GlassType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,10 @@ public enum GlassType
/// Represents the window in <see cref="RoomType.HczTestRoom"/>.
/// </summary>
TestRoom,

/// <summary>
/// Represents the window in <see cref="RoomType.Hcz127"/>.
/// </summary>
Scp127,
}
}
5 changes: 5 additions & 0 deletions EXILED/Exiled.API/Enums/LockerType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,5 +115,10 @@ public enum LockerType
/// SCP-1853 pedestal.
/// </summary>
Scp1853Pedestal,

/// <summary>
/// SCP-127 pedestal.
/// </summary>
Scp127Pedestal,
}
}
24 changes: 24 additions & 0 deletions EXILED/Exiled.API/Enums/PrefabType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -345,5 +345,29 @@ public enum PrefabType

[Prefab(1548138668, "AutoRagdoll")]
AutoRagdoll,

[Prefab(1323017091, "ElevatorChamberCargo")]
ElevatorChamberCargo,

[Prefab(359728307, "InvisibleInteractableToy")]
InvisibleInteractableToy,

[Prefab(1824808402, "EzArmCameraToy")]
EzArmCameraToy,

[Prefab(3375932423, "EzCameraToy")]
EzCameraToy,

[Prefab(144958943, "HczCameraToy")]
HczCameraToy,

[Prefab(2026969629, "LczCameraToy")]
LczCameraToy,

[Prefab(1548138668, "SzCameraToy")]
SzCameraToy,

[Prefab(2842703865, "KeycardPickup_Chaos")]
KeycardPickupChaos,
}
}
10 changes: 10 additions & 0 deletions EXILED/Exiled.API/Enums/RoomType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -328,5 +328,15 @@ public enum RoomType
/// Entrance Zone's straight hall with Dr.L's and conference room 9b locked room.
/// </summary>
EzSmallrooms,

/// <summary>
/// Heavy Containment Zone's SCP-330 room.
/// </summary>
Hcz127,

/// <summary>
/// Heavy Containment Zone's storage / server room.
/// </summary>
HczServerRoom,
}
}
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/DamageTypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ public static class DamageTypeExtensions
{ ItemType.Jailbird, DamageType.Jailbird },
{ ItemType.GunFRMG0, DamageType.Frmg0 },
{ ItemType.GunA7, DamageType.A7 },
{ ItemType.GunSCP127, DamageType.Scp127 },
};

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Extensions/DoorTypeExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ public static bool IsGate(this DoorType door) => door is DoorType.GateA or DoorT
/// <param name="door">The door to be checked.</param>
/// <returns>Returns whether the <see cref="DoorType"/> is an elevator.</returns>
public static bool IsElevator(this DoorType door) => door is DoorType.ElevatorGateA or DoorType.ElevatorGateB
or DoorType.ElevatorLczA or DoorType.ElevatorLczB or DoorType.ElevatorNuke or DoorType.ElevatorScp049;
or DoorType.ElevatorLczA or DoorType.ElevatorLczB or DoorType.ElevatorNuke or DoorType.ElevatorScp049 or DoorType.ElevatorServerRoom;
}
}
2 changes: 2 additions & 0 deletions EXILED/Exiled.API/Extensions/ItemExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ public static int GetMaxAmmo(this FirearmType item)
ItemType.GunCom45 => FirearmType.Com45,
ItemType.GunFRMG0 => FirearmType.FRMG0,
ItemType.ParticleDisruptor => FirearmType.ParticleDisruptor,
ItemType.GunSCP127 => FirearmType.Scp127,
_ => FirearmType.None,
};

Expand Down Expand Up @@ -220,6 +221,7 @@ public static int GetMaxAmmo(this FirearmType item)
FirearmType.Com45 => ItemType.GunCom45,
FirearmType.FRMG0 => ItemType.GunFRMG0,
FirearmType.ParticleDisruptor => ItemType.ParticleDisruptor,
FirearmType.Scp127 => ItemType.GunSCP127,
_ => ItemType.None,
};

Expand Down
1 change: 1 addition & 0 deletions EXILED/Exiled.API/Extensions/LockerExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static class LockerExtensions
"RegularMedkitStructure" => LockerType.Medkit,
"AdrenalineMedkitStructure" => LockerType.Adrenaline,
"MicroHIDpedestal" => LockerType.MicroHid,
"SCP_127_Container" => LockerType.Scp127Pedestal,
_ => LockerType.Unknown,
};
}
Expand Down
2 changes: 1 addition & 1 deletion EXILED/Exiled.API/Extensions/RoomExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public static bool IsCheckpoint(this RoomType room) => room is RoomType.LczCheck
/// <returns>Returns whether the <see cref="RoomType"/> contains any SCP.</returns>
public static bool IsScp(this RoomType room)
=> room is RoomType.Lcz173 or RoomType.Lcz330 or RoomType.Lcz914 or RoomType.Hcz049 or RoomType.Hcz079 or
RoomType.Hcz096 or RoomType.Hcz106 or RoomType.Hcz939;
RoomType.Hcz096 or RoomType.Hcz106 or RoomType.Hcz939 or RoomType.Hcz127;

/// <summary>
/// Converts the provided <see cref="FacilityZone"/> into the corresponding <see cref="ZoneType"/>.
Expand Down
17 changes: 12 additions & 5 deletions EXILED/Exiled.API/Features/Camera.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
["HCZ ARMORY"] = CameraType.HczArmory,
["HCZ ARMORY INTERIOR"] = CameraType.HczArmoryInterior,
["HCZ CROSSING"] = CameraType.HczCrossing,
["HCZ CURVE"] = CameraType.HczCurve,
["HCZ ELEV SYS A"] = CameraType.HczElevSysA,
["HCZ ELEV SYS B"] = CameraType.HczElevSysB,
["HCZ HALLWAY"] = CameraType.HczHallway,
Expand Down Expand Up @@ -134,6 +133,18 @@ public class Camera : IWrapper<Scp079Camera>, IWorldSpace
["WARHEAD TOP ELEVATORS"] = CameraType.HczWarheadTopElevators,
["WARHEAD CONNECTOR"] = CameraType.HczWarheadConnector,
["WARHEAD PORT ELEVATOR"] = CameraType.HczWarheadPortElevator,
["HCZ SCP-127 LAB"] = CameraType.HczScp127Lab,
["HCZ SCP-127 CONTAINMENT"] = CameraType.HczScp127Containment,
["HCZ SERVERS UPPER STORAGE"] = CameraType.HczServersUpperStorage,
["HCZ LOWER SERVER STORAGE"] = CameraType.HczLowerServerStorage,
["HCZ SERVERS STAIRCASE"] = CameraType.HczServerStaircase,

// CustomCamera
["EZ ARM CAMERA TOY"] = CameraType.EzArmCameraToy,
["EZ CAMERA TOY"] = CameraType.EzCameraToy,
["HCZ CAMERA TOY"] = CameraType.HczCameraToy,
["LCZ CAMERA TOY"] = CameraType.LczCameraToy,
["SZ CAMERA TOY"] = CameraType.SzCameraToy,
};

private Room room;
Expand All @@ -147,10 +158,6 @@ internal Camera(Scp079Camera camera079)
Base = camera079;
Camera079ToCamera.Add(camera079, this);
Type = GetCameraType();
#if DEBUG
if (Type is CameraType.Unknown)
Log.Error($"[CAMERATYPE UNKNOWN] {this} BASE = {Base}");
#endif
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,14 @@ public class CustomHumeShieldStat : HumeShieldStat
/// </summary>
public float ShieldRegenerationMultiplier { get; set; } = 1;

private float ShieldRegeneration => TryGetHsModule(out HumeShieldModuleBase controller) ? controller.HsRegeneration * ShieldRegenerationMultiplier : 0;
private float ShieldRegeneration
{
get
{
IHumeShieldProvider.GetForHub(Hub, out _, out _, out float hsRegen, out _);
return hsRegen * ShieldRegenerationMultiplier;
}
}

/// <inheritdoc/>
public override void Update()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ public GenericDamageHandler(Player player, Player attacker, float damage, Damage
case DamageType.A7:
GenericFirearm(player, attacker, damage, damageType, ItemType.GunA7);
break;
case DamageType.Scp127:
GenericFirearm(player, attacker, damage, damageType, ItemType.GunSCP127);
break;
case DamageType.ParticleDisruptor:
Base = new DisruptorDamageHandler(new (Item.Create(ItemType.ParticleDisruptor, attacker).Base as InventorySystem.Items.Firearms.Firearm, InventorySystem.Items.Firearms.Modules.DisruptorActionModule.FiringState.FiringSingle), Vector3.up, damage);
break;
Expand Down
6 changes: 4 additions & 2 deletions EXILED/Exiled.API/Features/Doors/BasicDoor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ namespace Exiled.API.Features.Doors
{
using System.Collections.Generic;

using Exiled.API.Enums;
using PlayerRoles;
using UnityEngine;

using Basegame = Interactables.Interobjects.BasicDoor;
Expand All @@ -35,9 +37,9 @@ public BasicDoor(Basegame door, List<Room> room)
public new Basegame Base { get; }

/// <summary>
/// Gets the list with all SCP-106's colliders.
/// Gets the list with all Ignored's colliders for <see cref="RoleTypeId.Scp106"/> or <see cref="EffectType.Ghostly"/>.
/// </summary>
public IEnumerable<Collider> Scp106Colliders => Base.Scp106Colliders;
public IEnumerable<Collider> Scp106Colliders => Base.IgnoredColliders;

/// <summary>
/// Gets or sets the total cooldown before door can be triggered again.
Expand Down
Loading
Loading