Обновление снаряжения ПХ & изменение вооружения#1051
Open
MrZero1984 wants to merge 15 commits into
Open
Conversation
Contributor
Author
|
@WardexOfficial ждём |
Contributor
|
RSI Diff Bot; head commit 6d07ee5 merging into 0ce6a7f Resources/Textures/_Scp/Clothing/Belts/chaos.rsi
Resources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi
Resources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi
Resources/Textures/_Scp/Clothing/Mask/gaschaos.rsi
Resources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi
Resources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi
Resources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi
Resources/Textures/_Scp/Clothing/Uniforms/chaosins.rsi
Resources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi
|
Contributor
📝 WalkthroughWalkthroughЗаменены AK-74M→AK-103 в прототипах, локалях, GunLocker и uplink; добавлена тяжёлая броня и локали Chaos; обновлены спрайты/метаданные; выполнена крупная пересборка карты ChaosShuttle и добавлены миграционные маппинги. ChangesЗамена винтовки AK-74M на AK-103
Обновление экипировки Chaos Insurgency
Метаданные текстур и авторство
Карта ChaosShuttle
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes Possibly related PRs
Suggested labels
Suggested reviewers
Poem
🚥 Pre-merge checks | ✅ 10✅ Passed checks (10 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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 |
![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: 6
🤖 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/Locale/en-US/_prototypes/_scp/entities/objects/weapons/guns/rifles/rifles.ftl`:
- Around line 5-6: The English localization for ent-WeaponRifleAK103 (.desc)
repeats the YAML prototype's logical error by saying "designed to replace the
classic AK-103"; update the .desc text so it matches the corrected prototype
wording (do not claim the AK-103 replaces itself) — e.g., rephrase to indicate
it is a modernized/replacement for the AK-74M or similar target as in the
prototype YAML, and ensure the ent-WeaponRifleAK103 .desc string is synchronized
with that prototype fix.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/catalog/fills/gunlocker/gunlocker.ftl`:
- Line 25: The localization entry ent-GunLockerFilledAK103 is inconsistent with
the file's pattern; change its value to use the shared base token like the
others by replacing the direct string "оружейный сейф АК-103" with the pattern
"{ ent-GunLockerBase } АК-103" so it matches entries such as
ent-GunLockerFilledAK47 and ent-GunLockerFilledM4A1.
In
`@Resources/Locale/ru-RU/_prototypes/_scp/entities/objects/weapons/guns/rifles/rifles.ftl`:
- Around line 5-6: The Russian description for ent-WeaponRifleAK103 (.desc) has
a self-referential mistake ("замены ... АК-103"); update the text to reference
the intended replaced model (e.g., АК-74М or АКМ). Edit the value of
ent-WeaponRifleAK103 .desc to say that the АК-103 was developed on the basis of
АК-74М to replace the classic Kalashnikov (or АКМ) in 7,62 caliber, ensuring the
replaced model name is correct and consistent.
In `@Resources/Prototypes/_Scp/Entities/Clothing/Masks/chaos.yml`:
- Around line 9-13: Поменять устаревшее поле slots на новое layers в описании
HideLayerClothing: в файле, где используется тип HideLayerClothing (экземпляр
компонента HideLayerClothingComponent), заменить список slots на словарь layers,
ключи — имена слоёв HumanoidVisualLayers (например Hair, Snout), значения —
флаги слотов SlotFlags (например MASK), и оставить hideOnToggle как есть; т.е.
обновить все места использования HideLayerClothing/HideLayerClothingComponent,
где указано slots, на формат layers: { Hair: MASK, Snout: MASK }.
In `@Resources/Prototypes/_Scp/Entities/Clothing/Masks/masks.yml`:
- Around line 21-25: The HideLayerClothing component in masks.yml uses the
deprecated field "slots"; update the component (HideLayerClothing) to use
"layers" instead of "slots" (same values: Hair, Snout) and keep existing
properties like hideOnToggle intact; mirror the same migration you applied in
chaos.yml for ClothingMaskGasChaos so any code or serializers expecting "layers"
receive the renamed field.
In `@Resources/Prototypes/_Scp/Entities/Objects/Weapons/Guns/Rifles/rifles.yml`:
- Around line 130-131: В описании записи с name: AK-103 в поле description есть
логическая ошибка — сказано, что AK-103 "designed to replace the classic
AK-103", т.е. заменяет сам себя; исправьте текст в поле description (в файле
rifles.yml, запись с name "AK-103") чтобы ссылаться на правильную заменяемую
модель (например AK-74M или классические AK-47/AKM) и корректно указать калибр
7.62x39mm, оставив смысл: "Developed on the basis of the AK-74M... designed to
replace the classic AK-47/AKM chambered for the 7.62x39mm cartridge."
🪄 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: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: b39bf7c7-a619-41b5-9f7e-1906083ca8b0
⛔ Files ignored due to path filters (36)
Resources/Textures/_Scp/Clothing/Belts/chaos.rsi/equipped-BELT.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Belts/chaos.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Belts/chaos.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Belts/chaos.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi/equipped-HAND.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi/equipped-HELMET.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaos.rsi/equipped-MASK.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaos.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaos.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaos.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi/equipped-MASK.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi/equipped-OUTERCLOTHING.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi/equipped-OUTERCLOTHING.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi/equipped-FEET.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi/inhand-right.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Uniforms/chaosins.rsi/equipped-INNERCLOTHING.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Uniforms/chaosins.rsi/icon.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Uniforms/chaosins.rsi/inhand-left.pngis excluded by!**/*.pngResources/Textures/_Scp/Clothing/Uniforms/chaosins.rsi/inhand-right.pngis excluded by!**/*.png
📒 Files selected for processing (26)
Resources/Locale/en-US/_prototypes/_scp/catalog/fills/gunlocker/gunlocker.ftlResources/Locale/en-US/_prototypes/_scp/entities/clothing/belts/belts.ftlResources/Locale/en-US/_prototypes/_scp/entities/clothing/outerclothing/armor.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/specific/Chaos.ftlResources/Locale/en-US/_prototypes/_scp/entities/objects/weapons/guns/rifles/rifles.ftlResources/Locale/ru-RU/_prototypes/_scp/catalog/fills/gunlocker/gunlocker.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/clothing/belts/belts.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/clothing/outerclothing/armor.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/specific/Chaos.ftlResources/Locale/ru-RU/_prototypes/_scp/entities/objects/weapons/guns/rifles/rifles.ftlResources/Prototypes/_Scp/Catalog/Fills/GunLocker/gunlocker.ymlResources/Prototypes/_Scp/Catalog/chaos_uplink_catalog.ymlResources/Prototypes/_Scp/Entities/Clothing/Masks/chaos.ymlResources/Prototypes/_Scp/Entities/Clothing/Masks/masks.ymlResources/Prototypes/_Scp/Entities/Clothing/OuterClothing/armor.ymlResources/Prototypes/_Scp/Entities/Objects/Weapons/Guns/Rifles/rifles.ymlResources/Prototypes/_Scp/Roles/Antags/chaos_role.ymlResources/Textures/_Scp/Clothing/Belts/chaos.rsi/meta.jsonResources/Textures/_Scp/Clothing/Hands/Gloves/chaosgloves.rsi/meta.jsonResources/Textures/_Scp/Clothing/Head/Helmets/chaos.rsi/meta.jsonResources/Textures/_Scp/Clothing/Mask/gaschaos.rsi/meta.jsonResources/Textures/_Scp/Clothing/Mask/gaschaosins.rsi/meta.jsonResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_heavyvest.rsi/meta.jsonResources/Textures/_Scp/Clothing/OuterClothing/Armor/chaos_vest.rsi/meta.jsonResources/Textures/_Scp/Clothing/Shoes/Boots/chaosboots.rsi/meta.jsonResources/migration.yml
coderabbitai
Bot
added
🗺️ Карты 🗺️
and removed
📦 YAML | Прототип 📦
🧊 Нет C# 🧊
🖌️ Спрайты 🖌️
📚 Изменения: Локализация 📚
labels
Collaborator
|
Вырежи SWAT броню и немного повысь резисты у тяжёлой брони ПХ |
coderabbitai
Bot
added
🪟 Интерфейс 🪟
📦 YAML | Прототип 📦
🧊 Нет C# 🧊
🖌️ Спрайты 🖌️
📚 Изменения: Локализация 📚
and removed
🗺️ Карты 🗺️
labels
Contributor
Author
@WardexOfficial Сделал |
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 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/_Scp/Entities/Clothing/OuterClothing/armor.yml`:
- Around line 14-18: Текущее изменение подняло коэффициенты урона для усиленной
брони до 0.7, что уменьшает резисты по сравнению с ожидаемыми 0.6; в файле
armor.yml откорректируй поля Blunt, Slash, Heat и Caustic (и при необходимости
Piercing если должен отличаться) обратно на 0.6, чтобы соответствовать цели PR
по повышению сопротивлений тяжёлой брони (проверь и обнови значения в секции,
содержащей эти ключи).
🪄 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: Path: .coderabbit.yaml
Review profile: ASSERTIVE
Plan: Pro
Run ID: fc3321d0-8f1c-489e-8442-336e4cafb5dc
📒 Files selected for processing (2)
Resources/Prototypes/_Scp/Catalog/chaos_uplink_catalog.ymlResources/Prototypes/_Scp/Entities/Clothing/OuterClothing/armor.yml
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.
Краткое описание | Short description
Повышение цены снаряги в аплинке пх, переименование АК-74М в АК-103. Добавление броника для ПХ и респрайт их же снаряги. Также по просьбе вардекса обновил обновил челнок Повстанцев и их базу.
Changelog
🆑 MrZero1984
Summary by CodeRabbit
New Features
Localization
Assets
Maps
Migration