Skip to content
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.

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

add body camera #711

Closed
wants to merge 11 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
5 changes: 5 additions & 0 deletions Resources/Locale/ru-RU/_Cats/devices/device-frequency.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
device-frequency-prototype-name-body-camera = Бодикамеры

ent-SurveillanceCameraRouterHandheld = { ent-SurveillanceCameraRouterBase }
.suffix = Бодикамеры
.desc = { ent-SurveillanceCameraRouterBase.desc }
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
ClothingHeadHatSecsoft: 3
ClothingHeadBandRed: 3
ClothingHeadHatPilotkaSec: 3
SurveillanceWirelessCameraBodySecurity: 5 # Cats
ClothingMaskNeckGaiterRed: 3
ClothingHandsGlovesColorBlack: 3
ClothingHandsGlovesFingerless: 3
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Security/detective.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
id: DetectivePDA
ears: ClothingHeadsetSecurity
belt: ClothingBeltHolster
neck: SurveillanceWirelessCameraBodySecurity
storage:
back:
- Flash
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
shoes: ClothingShoesColorWhite
id: ReporterPDA
ears: ClothingHeadsetService
neck: SurveillanceWirelessCameraBody
#storage:
#back:
#- Stuff
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- type: deviceFrequency
id: SurveillanceCameraHandheld
name: device-frequency-prototype-name-body-camera
frequency: 1940
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
- type: entity
parent: BaseItem
id: SurveillanceWirelessCameraBodySecurity
name: боди-камера безопасности
description: Camera
components:
- type: StationAiVision
range: 2
- type: Item
sprite: _SpaceCats/Clothing/Neck/Misc/nopro.rsi
- type: Sprite
state: icon
sprite: _SpaceCats/Clothing/Neck/Misc/nopro.rsi
- type: Clothing
quickEquip: true
slots:
- neck
- type: Eye
- type: UserInterface
interfaces:
enum.SurveillanceCameraSetupUiKey.Camera:
type: SurveillanceCameraSetupBoundUi
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCameraSecurity
transmitFrequencyId: SurveillanceCamera
- type: SurveillanceCamera
networkSet: true
setupAvailableNetworks:
- SurveillanceCameraHandheld
- SurveillanceCamera
- type: SpamEmitSound
minInterval: 90
maxInterval: 300
sound:
path: /Audio/Machines/timer.ogg
params:
volume: -8
maxDistance: 10
variation: 0.05
Comment on lines +32 to +40
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Настройки звука таймера требуют корректировки

Текущие настройки звука действительно могут быть навязчивыми:

  • Интервал 90-300 секунд слишком частый для таймера, учитывая что это постоянный звук
  • Громкость -8 и дистанция 10 единиц являются стандартными параметрами, но в сочетании с частым интервалом могут раздражать
  • В других найденных конфигурациях SpamEmitSound используются более специфичные звуки (например, CluwneHorn, BikeHorn) с меньшей частотой воспроизведения

Рекомендации:

  • Увеличить минимальный интервал до 180-240 секунд
  • Уменьшить громкость до -10 или -12
  • Уменьшить maxDistance до 8 единиц
🔗 Analysis chain

Проверить настройки звука таймера

Текущие настройки звука могут быть слишком навязчивыми:

  • Интервал 90-300 секунд может быть слишком частым
  • Громкость -8 и дистанция 10 требуют проверки в игре

Предлагаю проверить наличие похожих настроек в других устройствах:


Let me search for other timer sound configurations to compare with.


Let me search for other SpamEmitSound configurations with sound parameters to compare.


Let me fix the search pattern.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Поиск других конфигураций SpamEmitSound для сравнения
rg -A 10 "type: SpamEmitSound" --type yaml

Length of output: 68590


Script:

#!/bin/bash
# Search for timer sound configurations
rg -A 10 "path: .*timer\.ogg" --type yaml

Length of output: 1051


Script:

#!/bin/bash
# Search for SpamEmitSound configurations with sound parameters
rg -A 15 "type: SpamEmitSound\n.*sound:" --type yaml

Length of output: 246


Script:

#!/bin/bash
# Search for SpamEmitSound configurations with sound parameters using multiline mode
rg -U -A 15 'type: SpamEmitSound.*\n.*sound:' --type yaml

Length of output: 2695


- type: entity
id: SurveillanceWirelessCameraBody
parent: SurveillanceWirelessCameraBodySecurity
name: боди-камера
suffix: HandHeld
components:
- type: DeviceNetwork
deviceNetId: Wired
receiveFrequencyId: SurveillanceCameraService
transmitFrequencyId: SurveillanceCamera
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: entity
parent: SurveillanceCameraRouterBase
id: SurveillanceCameraRouterHandheld
name: Camerahelds
description:
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Добавьте описание для сущности

Поле описания не должно быть пустым. Добавьте соответствующее описание для камеры.

  name: Camerahelds
- description:
+ description: Портативный роутер для управления нательными камерами наблюдения.
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
description:
description: Портативный роутер для управления нательными камерами наблюдения.

components:
- type: SurveillanceCameraRouter
subnetFrequency: SurveillanceCameraHandheld
subnetColor: "#DE20AA"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Исправьте опечатку в имени файла

Файл находится в директории с опечаткой: survelliance вместо правильного surveillance.

Необходимо переименовать файл:

- Resources/Prototypes/_SpaceCats/Entities/Structures/Machines/survelliance_camera_routers.yml
+ Resources/Prototypes/_SpaceCats/Entities/Structures/Machines/surveillance_camera_routers.yml
🧰 Tools
🪛 yamllint (1.35.1)

[error] 9-9: no new line character at the end of file

(new-line-at-end-of-file)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by NeKognitoHazard",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "inhand-right",
"directions": 4
},
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-NECK-vox",
"directions": 4
},
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
}
]
}
Loading