Контент для Феликса - #693
Open
DeimonFly wants to merge 2 commits into
Open
Conversation
Contributor
WalkthroughДобавлена кислотная поверхность с ядовитым уроном и пузырьками. Реализованы объекты Felix: C-4, наручники, деревья, антенна, баррикады, кресты, ящики, полки, знаки и лабораторный стол. Добавлены параметры разрушения, отображения и выпадения материалов, русские локализации и метаданные RSI-текстур. Обновлён Estimated code review effort: 4 (Complex) | ~45 minutes Sequence Diagram(s)sequenceDiagram
participant FloorAcidEntity
participant TimedSpawner
participant AcidBubble
participant PoisonDamage
FloorAcidEntity->>PoisonDamage: наносит Poison-урон 4
FloorAcidEntity->>TimedSpawner: запускает периодический спавн
TimedSpawner->>AcidBubble: создаёт пузырёк с вероятностью 0.12
AcidBubble->>AcidBubble: удаляется через 2.2 секунды
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
github-actions
Bot
added
Resprite
Contributor
|
Линтеры должны проходить |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@Resources/Prototypes/Imperial/DeimonFly/object/acid.yml`:
- Line 3: Replace the acid surface prototype’s parent FloorWaterEntity with a
neutral floor prototype so it does not inherit water mechanics such as
extinguishing, pumping, slowing, slipping, or water sounds. Preserve the
acid-specific behavior while removing the inherited water components rather than
duplicating them.
In `@Resources/Prototypes/Imperial/DeimonFly/object/felix_content.yml`:
- Around line 262-296: Удалите дублирующий блок Fixtures из сущности
FelixBarricadeMetal и оставьте параметры коллизии унаследованными от
BaseFelixBarricade. Сохраните остальные компоненты и настройки
FelixBarricadeMetal без изменений.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: ASSERTIVE
Plan: Pro Plus
Run ID: b7b25946-3f4e-46a3-8a11-4036da013a30
⛔ Files ignored due to path filters (51)
Resources/Textures/Imperial/DeimonFly/Acid/acid.rsi/full.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water0.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water1.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water2.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water3.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water4.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water5.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water6.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/water7.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Acid/acid_bubble.rsi/bubble.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Bombs/felix_c4.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Bombs/felix_c4.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Bombs/felix_c4.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Bombs/felix_c4.rsi/primed.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/antenna.rsi/animation.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/antenna.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi/icon.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_sandy.rsi/bags4.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_sandy.rsi/bags5.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_snowy.rsi/bags4.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_snowy.rsi/bags5.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_animated.rsi/animated.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_large.rsi/large.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_small.rsi/small.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/Base_Brute_10.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/Base_Brute_20.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/Base_Brute_30.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/Base_Brute_40.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/Base_Brute_50.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/base.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier2.rsi/Base_Brute_15.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier2.rsi/Base_Brute_30.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier2.rsi/Base_Brute_45.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier2.rsi/base.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crates.rsi/event1.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crates.rsi/event2.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_shelves.rsi/shelf1.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_shelves.rsi/shelf2.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/danger_mines.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/lab_area.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/no_guns.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/radiation.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/secure_area.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_64.rsi/minefield.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_64.rsi/stop.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_wide.rsi/area_map.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_wide.rsi/broken_display.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_wide.rsi/whiteboard.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_tablet.rsi/tablet.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/grave_crosses.rsi/grave1.pngis excluded by!**/*.pngResources/Textures/Imperial/DeimonFly/Felix/Structures/grave_crosses.rsi/grave2.pngis excluded by!**/*.png
📒 Files selected for processing (23)
.gitignoreResources/Locale/ru-RU/Imperial/DeimonFly/FelixContent.ftlResources/Prototypes/Imperial/DeimonFly/object/acid.ymlResources/Prototypes/Imperial/DeimonFly/object/felix_content.ymlResources/Textures/Imperial/DeimonFly/Acid/acid.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Acid/acid_bubble.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Bombs/felix_c4.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/antenna.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_sandy.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/barricade_snowy.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_animated.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_large.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/black_tree_small.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier1.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crate_tier2.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_crates.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_shelves.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_32.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_64.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_signs_wide.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/felix_tablet.rsi/meta.jsonResources/Textures/Imperial/DeimonFly/Felix/Structures/grave_crosses.rsi/meta.json
| @@ -0,0 +1,41 @@ | |||
| - type: entity | |||
| id: FloorAcidEntity | |||
| parent: FloorWaterEntity | |||
Contributor
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | 🏗️ Heavy lift
Не наследуйте водную механику для кислотной поверхности.
parent: FloorWaterEntity переносит на кислоту водный раствор, возможность откачки, замедление, скольжение, водные звуки шагов и Extinguish. В результате кислотный тайл тушит огонь и ведёт себя как вода, что противоречит заявленному назначению токсичной поверхности. Используйте нейтральный родительский прототип либо явно удалите/замените водные компоненты.
Основание: Resources/Prototypes/Entities/Tiles/water.yml:20-63 из предоставленного контекста.
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Prototypes/Imperial/DeimonFly/object/acid.yml` at line 3, Replace
the acid surface prototype’s parent FloorWaterEntity with a neutral floor
prototype so it does not inherit water mechanics such as extinguishing, pumping,
slowing, slipping, or water sounds. Preserve the acid-specific behavior while
removing the inherited water components rather than duplicating them.
Comment on lines
+262
to
+296
| - type: entity | ||
| id: FelixBarricadeMetal | ||
| parent: BaseFelixBarricade | ||
| name: metal barricade | ||
| description: A low barricade assembled from metal posts. | ||
| components: | ||
| - type: Sprite | ||
| sprite: Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi | ||
| state: icon | ||
| - type: Fixtures | ||
| fixtures: | ||
| fix1: | ||
| shape: | ||
| !type:PhysShapeAabb | ||
| bounds: "-0.49,-0.35,0.49,0.35" | ||
| density: 1000 | ||
| mask: | ||
| - FullTileMask | ||
| layer: | ||
| - MidImpassable | ||
| - LowImpassable | ||
| - type: Damageable | ||
| damageContainer: StructuralInorganic | ||
| damageModifierSet: MetalBarricadeDamageModifierSet | ||
| - type: Destructible | ||
| thresholds: | ||
| - trigger: | ||
| !type:DamageTrigger | ||
| damage: 150 | ||
| behaviors: | ||
| - !type:PlaySoundBehavior | ||
| sound: | ||
| collection: MetalBreak | ||
| - !type:DoActsBehavior | ||
| acts: [ "Destruction" ] |
Contributor
There was a problem hiding this comment.
📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win
Дублирование блока Fixtures у FelixBarricadeMetal.
FelixBarricadeMetal наследуется от BaseFelixBarricade, но заново объявляет абсолютно идентичный блок Fixtures (те же bounds, density, mask, layer), уже заданный в родителе (строки 201-212). Это избыточно и создаёт риск рассинхронизации, если параметры коллизии родителя изменятся в будущем, а тут — нет.
♻️ Предлагаемое исправление
- type: Sprite
sprite: Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi
state: icon
- - type: Fixtures
- fixtures:
- fix1:
- shape:
- !type:PhysShapeAabb
- bounds: "-0.49,-0.35,0.49,0.35"
- density: 1000
- mask:
- - FullTileMask
- layer:
- - MidImpassable
- - LowImpassable
- type: Damageable
damageContainer: StructuralInorganic
damageModifierSet: MetalBarricadeDamageModifierSet📝 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
| - type: entity | |
| id: FelixBarricadeMetal | |
| parent: BaseFelixBarricade | |
| name: metal barricade | |
| description: A low barricade assembled from metal posts. | |
| components: | |
| - type: Sprite | |
| sprite: Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi | |
| state: icon | |
| - type: Fixtures | |
| fixtures: | |
| fix1: | |
| shape: | |
| !type:PhysShapeAabb | |
| bounds: "-0.49,-0.35,0.49,0.35" | |
| density: 1000 | |
| mask: | |
| - FullTileMask | |
| layer: | |
| - MidImpassable | |
| - LowImpassable | |
| - type: Damageable | |
| damageContainer: StructuralInorganic | |
| damageModifierSet: MetalBarricadeDamageModifierSet | |
| - type: Destructible | |
| thresholds: | |
| - trigger: | |
| !type:DamageTrigger | |
| damage: 150 | |
| behaviors: | |
| - !type:PlaySoundBehavior | |
| sound: | |
| collection: MetalBreak | |
| - !type:DoActsBehavior | |
| acts: [ "Destruction" ] | |
| - type: entity | |
| id: FelixBarricadeMetal | |
| parent: BaseFelixBarricade | |
| name: metal barricade | |
| description: A low barricade assembled from metal posts. | |
| components: | |
| - type: Sprite | |
| sprite: Imperial/DeimonFly/Felix/Structures/barricade_metal.rsi | |
| state: icon | |
| - type: Damageable | |
| damageContainer: StructuralInorganic | |
| damageModifierSet: MetalBarricadeDamageModifierSet | |
| - type: Destructible | |
| thresholds: | |
| - trigger: | |
| !type:DamageTrigger | |
| damage: 150 | |
| behaviors: | |
| - !type:PlaySoundBehavior | |
| sound: | |
| collection: MetalBreak | |
| - !type:DoActsBehavior | |
| acts: [ "Destruction" ] |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@Resources/Prototypes/Imperial/DeimonFly/object/felix_content.yml` around
lines 262 - 296, Удалите дублирующий блок Fixtures из сущности
FelixBarricadeMetal и оставьте параметры коллизии унаследованными от
BaseFelixBarricade. Сохраните остальные компоненты и настройки
FelixBarricadeMetal без изменений.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
О ПР`е
Тип: feat
Изменения:
Технические детали
Нет
Изменения кода официальных разработчиков
Нет
Summary by CodeRabbit
Новые возможности
Локализация
Визуальные улучшения