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.

Sign up for GitHub

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

Пых имплант. #386

Merged
merged 4 commits into from
Jan 27, 2025
Merged

Пых имплант. #386

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6452f70
weh implant
VunderFaffle Jan 17, 2025
2f9d039
микрофикс
VunderFaffle Jan 17, 2025
609a155
Update Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalo…
VunderFaffle Jan 17, 2025
c520c5c
Update Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entiti…
VunderFaffle Jan 17, 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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/action/types.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-LPPActionActivateWehImplant = Weh!
.desc = Weh!
2 changes: 2 additions & 0 deletions .../Locale/en-US/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/weh_implant_crate.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-LPPCrateWehImplants = Weh implant crate
.desc = Crate filled with 5 weh implants which let the user weh
4 changes: 4 additions & 0 deletions Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/misc/implanter.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ent-LPPLoaltyImplant = loalty implant
.desc = Do your enemies your friends!
ent-LPPWehImplant = Weh implant
.desc = Lets it's user weh on-demand
VunderFaffle marked this conversation as resolved.
Show resolved Hide resolved
ent-LPPWehImplanter = Weh implanter
.desc = Weh!
ent-LPPLoaltyImplanter = loalty implanter
.desc = Do your enemies your friends!
ent-LPPCrateLoaltyImplants = { ent-CrateGenericSteel }
Expand Down
2 changes: 2 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/action/types.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-LPPActionActivateWehImplant = Пых!
.desc = Пых!
4 changes: 4 additions & 0 deletions .../Locale/ru-RU/ss14-ru/prototypes/_lostparadise/catalog/fills/crates/weh_implant_crate.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@


Comment on lines +1 to +2
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Удалите пустые строки в начале файла.

Файл не должен начинаться с пустых строк.

ent-LPPCrateWehImplants = Ящик пых имплантов
.desc = Ящик с пятью имплантамм, позволяющими пользователю делать ПЫХ.
VunderFaffle marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/misc/implanter.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
ent-LPPLoaltyImplant = Имплант лояльности
.desc = Сделает врага - другом.
ent-LPPWehImplant = Пых имплант
.desc = Позволяет пользователю ПЫХАТЬ
ent-LPPWehImplanter = Пых имплант
.desc = Пых!
Comment on lines +3 to +6
Copy link
Contributor

Choose a reason for hiding this comment

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

🧹 Nitpick (assertive)

Обеспечьте единообразие в описаниях.

  1. Используйте одинаковый стиль написания слова "пых" во всех описаниях.
  2. Слово "ПЫХАТЬ" в верхнем регистре выглядит слишком агрессивно.
 ent-LPPWehImplant = Пых имплант
-    .desc = Позволяет пользователю ПЫХАТЬ
+    .desc = Позволяет пользователю пыхать
 ent-LPPWehImplanter = Пых имплант
     .desc = Пых!
📝 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
ent-LPPWehImplant = Пых имплант
.desc = Позволяет пользователю ПЫХАТЬ
ent-LPPWehImplanter = Пых имплант
.desc = Пых!
ent-LPPWehImplant = Пых имплант
.desc = Позволяет пользователю пыхать
ent-LPPWehImplanter = Пых имплант
.desc = Пых!

ent-LPPLoaltyImplanter = Имплантер лояльности
.desc = Сделает врага - другом.
ent-LPPCrateLoaltyImplants = { ent-CrateGenericSteel }
Expand Down
11 changes: 11 additions & 0 deletions Resources/Prototypes/_LostParadise/Action/types.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,14 @@
# sprite: _LostParadise/Interface/emotion_heart.rsi
# state: heart
# event: !type:ToggleEmotePanelActionEvent

- type: entity
id: LPPActionActivateWehImplant
name: Weh!
description: Weh!
categories: [ HideSpawnMenu ]
components:
- type: InstantAction
icon: { sprite: Objects/Fun/toys.rsi, state: plushie_lizard }
event: !type:ActivateImplantEvent
useDelay: 1
10 changes: 10 additions & 0 deletions Resources/Prototypes/_LostParadise/Catalog/Cargo/cargo_fun.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@
cost: 8000
category: Fun
group: market

- type: cargoProduct
id: LPPWehImplants
icon:
sprite: Objects/Specific/Medical/implanter.rsi
state: implanter0
product: LPPCrateWehImplants
cost: 2000
category: Service
group: market
11 changes: 11 additions & 0 deletions .../Catalog/Fills/Crates/implants_crates.yml → ...atalog/Fills/Crates/weh_implant_crate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,14 @@
contents:
- id: MacroBombImplanter
amount: 5

Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue

Удалите пробелы в конце строки

В строке 88 обнаружены лишние пробелы в конце строки. Это может вызвать проблемы при обработке файла.

-        
+
🧰 Tools
🪛 yamllint (1.35.1)

[error] 88-88: trailing spaces

(trailing-spaces)

- type: entity
id: LPPCrateWehImplants
name: Weh implant crate
description: Crate filled with 5 weh implants which let the user weh
parent: CrateMedical
components:
- type: StorageFill
contents:
- id: LPPWehImplanter
amount: 5
Comment on lines +89 to +98
Copy link
Contributor

Choose a reason for hiding this comment

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

💡 Codebase verification

Обнаружено несоответствие в типе родительского контейнера

Все остальные имплантаты в файле используют CrateSecgear в качестве родительского типа. Рекомендуется изменить тип контейнера для Weh-имплантата с CrateMedical на CrateSecgear для соблюдения единообразия.

🔗 Analysis chain

Проверьте корректность использования CrateMedical

Структура нового импланта выглядит правильно, но в отличие от других имплантов в файле, которые используют CrateSecgear, данный имплант использует CrateMedical. Пожалуйста, подтвердите, что это намеренное изменение.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверяем использование CrateMedical в других имплантах
rg "parent: CrateMedical" Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/

# Проверяем определение базового типа
rg "id: CrateMedical" Resources/Prototypes/

Length of output: 729

Script:

#!/bin/bash
# Check for CrateSecgear usage in implant crates and its definition
rg "parent: CrateSecgear" Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/
rg "id: CrateSecgear" Resources/Prototypes/

Length of output: 1024

Script:

#!/bin/bash
# Check the full content of the weh implant crate file
cat Resources/Prototypes/_LostParadise/Catalog/Fills/Crates/weh_implant_crate.yml

Length of output: 2864

🧰 Tools
🪛 yamllint (1.35.1)

[error] 95-95: wrong indentation: expected 4 but found 2

(indentation)

25 changes: 24 additions & 1 deletion Resources/Prototypes/_LostParadise/Entities/Objects/Misc/implanter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,28 @@
components:
- type: SubdermalImplant

- type: entity
parent: BaseSubdermalImplant
id: LPPWehImplant
name: Weh implant
description: Lets it's user weh on-demand
categories: [ HideSpawnMenu ]
components:
- type: SubdermalImplant
implantAction: LPPActionActivateWehImplant
- type: TriggerImplantAction
- type: EmitSoundOnTrigger
sound:
collection: Weh

- type: entity
id: LPPWehImplanter
name: Weh implanter
description: Weh!
parent: BaseImplantOnlyImplanter
components:
- type: Implanter
implant: LPPWehImplant

- type: entity
id: LPPLoaltyImplanter
Expand All @@ -16,7 +38,7 @@
components:
- type: Implanter
implant: LPPLoaltyImplant

- type: entity
id: LPPCrateLoaltyImplants
parent: CrateGenericSteel
Expand All @@ -25,3 +47,4 @@
contents:
- id: LPPLoaltyImplanter
amount: 3

Loading