Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Tweak] Security statuses micro update (#629)

Browse Source 
* Tweak: Sec statuses update WIP

* fix: Для новых статусов требуется указать причину

* Fix: for review
This commit is contained in:
keslik
2024-08-16 23:46:26 +03:00
committed by GitHub
parent ecbc00a4b2
commit 775fd5e96c
27 changed files with 172 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/CriminalRecords/Systems/CriminalRecordsConsoleSystem.cs
View File

@@ -75,7 +75,11 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
{
// prevent malf client violating wanted/reason nullability
if (msg.Status == SecurityStatus.Wanted != (msg.Reason != null) &&
msg.Status == SecurityStatus.Suspected != (msg.Reason != null))
msg.Status == SecurityStatus.Suspected != (msg.Reason != null) &&
msg.Status == SecurityStatus.Demote != (msg.Reason != null) && // WD start
msg.Status == SecurityStatus.Monitoring != (msg.Reason != null) &&
msg.Status == SecurityStatus.Paroled != (msg.Reason != null) &&
msg.Status == SecurityStatus.Execute != (msg.Reason != null)) // WD end
return;
if (!CheckSelected(ent, msg.Session, out var mob, out var key))
@@ -127,10 +131,18 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
(_, SecurityStatus.Suspected) => "suspected",
// released on parole
(_, SecurityStatus.Paroled) => "paroled",
// prisoner did their time
(_, SecurityStatus.Discharged) => "released",
// person was demoted
(_, SecurityStatus.Demote) => "demoted", // WD start
// going from any other state to wanted, AOS or prisonbreak / lazy secoff never set them to released and they reoffended
(_, SecurityStatus.Wanted) => "wanted",
// Person is xenos
(_, SecurityStatus.Execute) => "execute",
// Person requires supervision
(_, SecurityStatus.Monitoring) => "monitoring",
// Person works in cargo
(_, SecurityStatus.Search) => "search",
// Released
(_, SecurityStatus.Released) => "released",
// person is no longer sus
(SecurityStatus.Suspected, SecurityStatus.None) => "not-suspected",
// going from wanted to none, must have been a mistake
@@ -139,6 +151,14 @@ public sealed class CriminalRecordsConsoleSystem : SharedCriminalRecordsConsoleS
(SecurityStatus.Detained, SecurityStatus.None) => "released",
// criminal is no longer on parole
(SecurityStatus.Paroled, SecurityStatus.None) => "not-parole",
// person dont require supervision
(SecurityStatus.Monitoring, SecurityStatus.None) => "not-monitoring",
// person was searched
(SecurityStatus.Search, SecurityStatus.None) => "not-search",
// person was demoted
(SecurityStatus.Demote, SecurityStatus.None) => "not-demoted",
// person is not xenos
(SecurityStatus.Execute, SecurityStatus.None) => "not-execute", // WD end
// this is impossible
_ => "not-wanted"
};