[Tweak] Security statuses micro update (#629)

* Tweak: Sec statuses update WIP

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

* Fix: for review

Resources/Locale/ru-RU/criminal-records/criminal-records.ftl

@@ -9,13 +9,21 @@ criminal-records-console-no-record-found = Не найдены записи дл
 criminal-records-console-status = Статус
 criminal-records-status-none = Нет
 criminal-records-status-wanted = В розыске
-criminal-records-status-detained = В заключении
 criminal-records-status-suspected = Подозреваемый
-criminal-records-status-discharged = Освобождён
-criminal-records-status-paroled = Досрочно освобождён
+criminal-records-status-demote = Подлежит понижению
+criminal-records-status-search = Обыскать
+criminal-records-status-monitoring = Установить слежку
+criminal-records-status-detained = Под стражей
+criminal-records-status-paroled = Условно-досрочно освобождён
+criminal-records-status-released = Освобождён
+criminal-records-status-execute = Ликвидировать
 
 criminal-records-console-wanted-reason = [color=gray]Причина розыска[/color]
 criminal-records-console-suspected-reason = [color=gray]Причина подозрения[/color]
+criminal-records-console-demote-reason = [color=gray]Причина понижения[/color]
+criminal-records-console-monitoring-reason = [color=gray]Причина слежки[/color]
+criminal-records-console-paroled-reason = [color=gray]Основание УДО[/color]
+criminal-records-console-execute-reason = [color=gray]Причина устранения[/color]
 criminal-records-console-reason = Причина
 criminal-records-console-reason-placeholder = Например: {$placeholder}
 
@@ -37,9 +45,13 @@ criminal-records-console-not-suspected = {$name} больше не под под
 criminal-records-console-detained = {$name} был задержан {$officer}.
 criminal-records-console-released = {$name} был освобожден {$officer}.
 criminal-records-console-not-wanted = {$name} больше не в розыске.
-criminal-records-console-paroled = {$name} был отпущен условно-досрочно {$officer}.
-criminal-records-console-not-parole = {$name} больше не условно-досрочно освобождённый.
-criminal-records-console-unknown-officer = <неизвестный офицер>
+criminal-records-console-paroled = {$name} был условно-досрочно освобождён {$officer} на основании {$reason}.
+criminal-records-console-not-parole = {$name} нарушил условия условно-досрочного освобождения.
+criminal-records-console-search = {$name} требуется обыскать по указу {$officer}.
+criminal-records-console-monitoring = За {$name} требуется вести наблюдание по причине {$reason}.
+criminal-records-console-execute = {$name} требуется ликвидировать по приказу {$officer} по причине {$reason}.
+criminal-records-console-demoted = {$name} должен быть понижен в должности по указу {$officer} по причине {$reason}.
+criminal-records-console-unknown-officer = <неопознанный офицер>
 
 
 ## Filters

Resources/Locale/ru-RU/white/criminal-console.ftl

@@ -9,16 +9,17 @@ criminal-login-in-desc = Войти
 criminal-login-info = ID: { $user }
 criminal-login-hint = Вставьте ID карту в консоль, нажав на "{ $name }" (нужно держать ID карту в руке)
 criminal-login-warn = WARNING: Доступ к системе осуществляется уровнем доступа "службы безопасности"
-criminal-status-released = Освобожден
-criminal-status-discharged = Выписан
-criminal-status-parolled = Закодирован
+criminal-status-released = Освобождён
+criminal-status-demote = Понизить
+criminal-status-parolled = Условно-досрочно освобождён
 criminal-status-suspected = Подозреваемый
 criminal-status-wanted = В розыске
 criminal-status-incarcerated = Заключенный
+criminal-status-execute = Ликвидировать
+criminal-status-monitoring = Наблюдать
+criminal-status-search = Обыскать
 criminal-targetchannel-set-released = { $target } освобожден(а).
 criminal-targetchannel-set-released-reason = { $target } освобожден(а). Заметка: { $reason }.
-criminal-targetchannel-set-discharged = { $target } выписан(а).
-criminal-targetchannel-set-discharged-reason = { $target } выписан(а). Заметка: { $reason }.
 criminal-targetchannel-set-parolled = { $target } закодирован(а).
 criminal-targetchannel-set-parolled-reason = { $target } закодирован(а). Заметка: { $reason }.
 criminal-targetchannel-set-suspected = { $target } под подозрением.

Resources/Prototypes/StatusEffects/security.yml

@@ -6,44 +6,72 @@
   locationPreference: Right
   isShaded: true
 
-- type: statusIcon
+- type: statusIcon # WD start
   parent: SecurityIcon
-  id: SecurityIconDischarged
+  id: SecurityIconDemote
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
-    state: hud_discharged
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_demote
 
 - type: statusIcon
   parent: SecurityIcon
   id: SecurityIconIncarcerated
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
+    sprite: /Textures/White/Interface/records.rsi
     state: hud_incarcerated
 
 - type: statusIcon
   parent: SecurityIcon
   id: SecurityIconParoled
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
+    sprite: /Textures/White/Interface/records.rsi
     state: hud_paroled
 
 - type: statusIcon
   parent: SecurityIcon
   id: SecurityIconSuspected
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
+    sprite: /Textures/White/Interface/records.rsi
     state: hud_suspected
 
 - type: statusIcon
   parent: SecurityIcon
   id: SecurityIconWanted
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
+    sprite: /Textures/White/Interface/records.rsi
     state: hud_wanted
 
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconExecute
+  icon:
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_execute
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconMonitoring
+  icon:
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_monitoring
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconReleased
+  icon:
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_released
+
+- type: statusIcon
+  parent: SecurityIcon
+  id: SecurityIconSearch
+  icon:
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_search
+
 - type: statusIcon
   parent: SecurityIcon
   id: CriminalRecordIconRemove
   icon:
-    sprite: /Textures/Interface/Misc/security_icons.rsi
-    state: hud_discharged
+    sprite: /Textures/White/Interface/records.rsi
+    state: hud_demote # WD end

Resources/Prototypes/_White/sechud.yml

@@ -8,11 +8,15 @@
     access: [["Security"]]
   - type: SecurityHud
     criminalrecords:
-    - SecurityIconDischarged
+    - SecurityIconDemote
     - SecurityIconParoled
     - SecurityIconSuspected
     - SecurityIconWanted
     - SecurityIconIncarcerated
+    - SecurityIconExecute
+    - SecurityIconMonitoring
+    - SecurityIconSearch
+    - SecurityIconReleased
     - CriminalRecordIconRemove
   - type: UserInterface
     interfaces:

Resources/Textures/White/Interface/records.rsi/meta.json

@@ -5,23 +5,35 @@
     "size": { "y": 8, "x": 8 },
     "states": [
         {
-            "name": "wanted"
+            "name": "hud_demote"
         },
         {
-            "name": "suspected"
+            "name": "hud_incarcerated"
         },
         {
-            "name": "released"
+            "name": "hud_monitoring"
         },
         {
-            "name": "parolled"
+            "name": "hud_paroled"
         },
         {
-            "name": "incarcerated"
+            "name": "hud_released"
         },
         {
-            "name": "discharged"
+            "name": "hud_search"
+        },
+        {
+            "name": "hud_suspected"
+        },
+        {
+            "name": "hud_wanted"
+        },
+        {
+            "name": "hud_execute",
+            "delays":
+            [
+                [0.5, 0.5, 1.0]
+            ]
         }
-
     ]
 }

Resources/Textures/White/Interface/securityhud.rsi/meta.json

@@ -5,19 +5,34 @@
     "size": { "y": 32, "x": 32 },
     "states": [
         {
-            "name": "wanted"
+            "name": "demote"
         },
         {
-            "name": "suspected"
-        },
-        {
-            "name": "released"
+            "name": "execute"
         },
         {
             "name": "incarcerated"
         },
+        {
+            "name": "monitoring"
+        },
+        {
+            "name": "paroled"
+        },
+        {
+            "name": "released"
+        },
         {
             "name": "remove"
+        },
+        {
+            "name": "search"
+        },
+        {
+            "name": "suspected"
+        },
+        {
+            "name": "wanted"
         }
     ]
 }