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

Halloween things2 #301

Merged
merged 2 commits into from
Oct 25, 2024
Merged

Halloween things2 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6d308a
PUMPKINS.mp4
Hqlle Oct 25, 2024
3128bc3
pumPkins fix
Hqlle Oct 25, 2024
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: 1 addition & 9 deletions ...ale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
ent-LPPCandy = конфета
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

Исправьте регистр первой буквы в переводе.

Согласно правилам кодирования, все переводы, начинающиеся с "ent-", должны начинаться с заглавной буквы после знака равенства.

-ent-LPPCandy = конфета
+ent-LPPCandy = Конфета
📝 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-LPPCandy = конфета
ent-LPPCandy = Конфета

.desc = Обычная конфета состоящия из сахара и других вещей
ent-LPPCandy2 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPCandy3 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPCandy4 = { ent-LPPCandy }
.desc = { ent-LPPCandy.desc }
ent-LPPLolipop = конфета на палочке
.desc = Всё такая же конфета, но на палочке.
.desc = Обычная конфета состоящия из сахара и других вещей
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

Исправьте грамматические ошибки и пунктуацию.

В описании присутствуют следующие ошибки:

  1. "состоящия" -> "состоящая" (грамматическая ошибка)
  2. Отсутствует точка в конце предложения
-    .desc = Обычная конфета состоящия из сахара и других вещей
+    .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
.desc = Обычная конфета состоящия из сахара и других вещей
.desc = Обычная конфета, состоящая из сахара и других вещей.

8 changes: 4 additions & 4 deletions ...le/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ent-HalloweenTree01 = мёртвое дерево
ent-LPPHalloweenTree01 = мёртвое дерево
.desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко.
ent-HalloweenTree02 = мёртвое дерево
ent-LPPHalloweenTree02 = мёртвое дерево
.desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко.
ent-HalloweenTree03 = мёртвое дерево
ent-LPPHalloweenTree03 = мёртвое дерево
.desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко.
ent-HalloweenTree04 = мёртвое дерево
ent-LPPHalloweenTree04 = мёртвое дерево
.desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко.
12 changes: 12 additions & 0 deletions ...s/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
ent-LPPPSpiderDeco = паучки
.desc = Муляжи паучков которые выглядят так, будто готовы вас покусать.
ent-LPPPPumpkinDeco = тыква
.desc = Маленькая декоративная тыква.
Comment on lines +3 to +4
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

Исправьте регистр первой буквы в переводе.

Согласно правилам локализации, все переводы, начинающиеся с 'ent-', должны начинаться с заглавной буквы после знака =.

-ent-LPPPPumpkinDeco = тыква
+ent-LPPPPumpkinDeco = Тыква
📝 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-LPPPPumpkinDeco = тыква
.desc = Маленькая декоративная тыква.
ent-LPPPPumpkinDeco = Тыква
.desc = Маленькая декоративная тыква.

ent-LPPPPumpkinBigDeco = тыква
.desc = Декоративные тыквы разных размеров.
Comment on lines +5 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.

⚠️ Potential issue

Исправьте регистр первой буквы в переводе.

Аналогичная проблема с регистром первой буквы после знака =.

-ent-LPPPPumpkinBigDeco = тыква
+ent-LPPPPumpkinBigDeco = Тыква
📝 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-LPPPPumpkinBigDeco = тыква
.desc = Декоративные тыквы разных размеров.
ent-LPPPPumpkinBigDeco = Тыква
.desc = Декоративные тыквы разных размеров.

ent-LPPPottedPlantHalloween1 = растение в горшке
.desc = Высохшее растение в горшке, выглядит не особо живым.
Comment on lines +7 to +8
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

Исправьте регистр первой буквы в переводе.

Та же проблема с регистром первой буквы после знака =.

-ent-LPPPottedPlantHalloween1 = растение в горшке
+ent-LPPPottedPlantHalloween1 = Растение в горшке
📝 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-LPPPottedPlantHalloween1 = растение в горшке
.desc = Высохшее растение в горшке, выглядит не особо живым.
ent-LPPPottedPlantHalloween1 = Растение в горшке
.desc = Высохшее растение в горшке, выглядит не особо живым.

ent-LPPPottedPlantHalloween2 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
ent-LPPPottedPlantHalloween3 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
ent-LPPPottedPlantHalloween4 = { ent-LPPPottedPlantHalloween1 }
.desc = { ent-LPPPottedPlantHalloween1.desc }
59 changes: 10 additions & 49 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@
components:
- type: Sprite
sprite: _LostParadise/Objects/Consumable/halloween.rsi
state: candy_1
layers:
- state: candy_1
map: [ "enum.DamageStateVisualLayers.Base" ]
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
candy_1: Material
candy_2: Material
candy_3: Material
candy_4: Material
- type: Item
size: Tiny
shape:
Expand All @@ -22,54 +31,6 @@
Quantity: 1
- ReagentId: Theobromine
Quantity: 1
- type: Tag
tags:
- LPPCandy

- type: entity
parent: LPPCandy
id: LPPCandy2
components:
- type: Sprite
state: candy_2

- type: entity
parent: LPPCandy
id: LPPCandy3
components:
- type: Sprite
state: candy_3

- type: entity
parent: LPPCandy
id: LPPCandy4
components:
- type: Sprite
state: candy_4

- type: entity
name: lolipop
parent: LPPCandy
id: LPPLolipop
description: This is my kingdom come, this is my kingdom come...
components:
- type: Sprite
state: lollipop
- type: Item
size: Tiny
shape:
- 0, 0, 0, 1
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Sugar
Quantity: 8
- ReagentId: Nutriment
Quantity: 4
- ReagentId: Theobromine
Quantity: 3
- type: Tag
tags:
- LPPCandy
8 changes: 4 additions & 4 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/Flora/halloween.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: entity
parent: BaseTree
id: HalloweenTree01
id: LPPHalloweenTree01
name: dead tree
description: Dead tree with leaves on it, looks creepy.
components:
Expand All @@ -10,7 +10,7 @@

- type: entity
parent: BaseTree
id: HalloweenTree02
id: LPPHalloweenTree02
name: dead tree
description: Dead tree with leaves on it, looks creepy.
components:
Expand All @@ -20,7 +20,7 @@

- type: entity
parent: BaseTree
id: HalloweenTree03
id: LPPHalloweenTree03
name: dead tree
description: Dead tree with leaves on it, looks creepy.
components:
Expand All @@ -30,7 +30,7 @@

- type: entity
parent: BaseTree
id: HalloweenTree04
id: LPPHalloweenTree04
name: dead tree
description: Dead tree with leaves on it, looks creepy.
components:
Expand Down
97 changes: 94 additions & 3 deletions Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/halloween.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
- type: entity
parent: BaseSign
id: LPPPSpiderDeco
name: spiders
description: Fake spiders that look like they're ready to bite you.
placement:
mode: SnapgridCenter
components:
- type: Sprite
sprite: _LostParadise/Objects/Decoration/halloween.rsi
snapCardinals: true
noRot: false
layers:
- state: spider_big
map: [ "enum.DamageStateVisualLayers.Base" ]
- type: InteractionOutline
- type: Clickable
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
Expand All @@ -31,4 +33,93 @@
sound:
collection: WoodDestroyHeavy
- !type:DoActsBehavior
acts: [ "Destruction" ]
acts: [ "Destruction" ]

- type: entity
id: LPPPumpkinDeco
name: pumpkin
placement:
mode: SnapgridCenter
description: Small decorative pumpkin with brush marks on it
components:
- type: Sprite
sprite: _LostParadise/Objects/Decoration/halloween.rsi
noRot: false
snapCardinals: true
layers:
- state: pumpkin_minis
map: [ "enum.DamageStateVisualLayers.Base" ]
- type: InteractionOutline
- type: Clickable
- type: RandomSprite
available:
- enum.DamageStateVisualLayers.Base:
pumpkin_minis: ""
pumpkin_minis2: ""
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:PlaySoundBehavior
sound:
collection: WoodDestroyHeavy
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
id: LPPPumpkinBigDeco
name: pumpkin
parent: BaseSign
description: Decorative pumpkins with brush marks on it
components:
- type: Sprite
sprite: _LostParadise/Objects/Decoration/halloween.rsi
state: pumpkins
- type: Damageable
damageContainer: Inorganic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 10
behaviors:
- !type:PlaySoundBehavior
sound:
collection: WoodDestroyHeavy
- !type:DoActsBehavior
Comment on lines +73 to +94
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Рассмотрите возможность оптимизации конфигурации урона

Конфигурация урона и разрушения идентична для обеих тыкв. Предлагаю создать базовый прототип с общими настройками урона.

Пример реорганизации:

- type: entity
  id: LPPHalloweenDestructibleBase
  abstract: true
  components:
  - type: Damageable
    damageContainer: Inorganic
  - type: Destructible
    thresholds:
    - trigger:
        !type:DamageTrigger
        damage: 10
      behaviors:
      - !type:PlaySoundBehavior
        sound:
          collection: WoodDestroyHeavy
      - !type:DoActsBehavior
        acts: [ "Destruction" ]

- type: entity
  id: LPPPumpkinBigDeco
  parent: [ BaseSign, LPPHalloweenDestructibleBase ]
  # ... остальные компоненты
🧰 Tools
🪛 yamllint

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

(indentation)

[error] 86-86: wrong indentation: expected 6 but found 4

(indentation)

[error] 90-90: wrong indentation: expected 8 but found 6

(indentation)

[error] 94-94: too many spaces inside brackets

(brackets)

[error] 94-94: too many spaces inside brackets

(brackets)

acts: [ "Destruction" ]

- type: entity
id: LPPPottedPlantHalloween1
parent: PottedPlantBase
description: Withered houseplant, looks dead.
components:
- type: Sprite
sprite: _LostParadise/Objects/Decoration/halloween.rsi
state: plant1

- type: entity
id: LPPPottedPlantHalloween2
parent: LPPPottedPlantHalloween1
components:
- type: Sprite
state: plant2

- type: entity
id: LPPPottedPlantHalloween3
parent: LPPPottedPlantHalloween1
components:
- type: Sprite
state: plant3

- type: entity
id: LPPPottedPlantHalloween4
parent: LPPPottedPlantHalloween1
components:
- type: Sprite
state: plant4

4 changes: 2 additions & 2 deletions Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
- type: Sprite
sprite: _LostParadise/Structures/Wallmounts/halloween.rsi
state: checkboxes
noRot: true
noRot: false

- type: entity
parent: BaseSign
Expand All @@ -44,4 +44,4 @@
- type: Sprite
sprite: _LostParadise/Structures/Wallmounts/halloween.rsi
state: light_bulbs
noRot: true
noRot: false
22 changes: 22 additions & 0 deletions Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,28 @@
},
{
"name": "spider_mini3"
},
{
"name": "pumpkin_minis"
},
{
"name": "pumpkin_minis2"
},
{
"name": "pumpkins",
"directions": 4
},
Comment on lines +32 to +34
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

Обнаружено несоответствие между метаданными и файлами спрайтов

Анализ показал:

  • В meta.json состояние "pumpkins" определено с 4 направлениями (directions: 4)
  • Найден только один файл спрайта: pumpkins.png
  • Отсутствуют отдельные файлы для каждого из 4 направлений

Необходимо:

  • Добавить недостающие спрайты для всех направлений
  • Или исправить значение directions в meta.json, если объект не требует разных направлений
🔗 Analysis chain

Необходима проверка спрайтов для всех направлений

Состояние "pumpkins" указывает на наличие 4 направлений (directions: 4). Необходимо убедиться, что:

  • Присутствуют спрайты для всех 4 направлений
  • Все спрайты корректно отображаются в игре
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия всех необходимых спрайтов для состояния pumpkins
echo "Поиск файлов спрайтов для всех направлений..."
find Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi -name "pumpkins*.png"

Length of output: 274

Script:

#!/bin/bash
# Проверяем содержимое файла meta.json для получения полной информации о состоянии
cat Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/meta.json

# Проверяем размеры и детали изображения
file Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkins.png

Length of output: 1068

{
"name": "plant1"
},
{
"name": "plant2"
},
{
"name": "plant3"
},
{
"name": "plant4"
Comment on lines +35 to +45
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)

Рекомендация по улучшению именования растений

Текущие имена состояний (plant1, plant2, plant3, plant4) слишком общие. Рекомендуется использовать более описательные названия, отражающие внешний вид или тематику растений.

Пример более информативных названий:

-            "name": "plant1"
+            "name": "halloween_plant_thorny"
-            "name": "plant2"
+            "name": "halloween_plant_twisted"
-            "name": "plant3"
+            "name": "halloween_plant_dead"
-            "name": "plant4"
+            "name": "halloween_plant_spooky"
📝 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
{
"name": "plant1"
},
{
"name": "plant2"
},
{
"name": "plant3"
},
{
"name": "plant4"
{
"name": "halloween_plant_thorny"
},
{
"name": "halloween_plant_twisted"
},
{
"name": "halloween_plant_dead"
},
{
"name": "halloween_plant_spooky"

}
]
}
Binary file added Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant4.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...urces/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...rces/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkins.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading