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

[Tweak] Better Icons #168

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

PuroSlavKing
Copy link
Member

@PuroSlavKing PuroSlavKing commented Dec 17, 2024

Описание PR

Крутой решейд всех иконок ролей и статуса и замена иконки НЕИЗВЕСТНО на крутое неизвестно.
Эскадрон имеет свою личную иконку роли.
Ассистент теперь ассистент, а не пассажир.
Так же исправлены иконки розыска, теперь они нормально сочетаются с иконками работы и находятся на своём месте.


Медиа

Список

V1
image

V2 (актуальная)
image


Изменения

Copy link
Contributor

coderabbitai bot commented Dec 17, 2024

Обзор изменений

Walkthrough

Этот набор изменений включает обновления в нескольких файлах проекта, затрагивающих идентификационные карты, иконки профессий и метаданные ресурсов. Были добавлены новые сущности ID-карт, такие как AgentIDCard, NukieAgentIDCard и CentcomIDCardDeathsquad, переименованы некоторые существующие карты, и обновлены иконки профессий. Также были внесены изменения в метаданные файлов ресурсов с добавлением новых атрибуций.

Changes

Файл Изменения
Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml - Добавлены новые ID-карты: AgentIDCard, NukieAgentIDCard, CentcomIDCardDeathsquad
- Переименованы карты: LawyerIDCardAttorneyIDCard, BrigmedicIDCardCorpsmanIDCard
Resources/Prototypes/StatusEffects/job.yml - Обновлена иконка JobIconUnknown
- Добавлены комментарии для JobIconChaplain и JobIconLawyer
Resources/Textures/**/meta.json - Обновлены поля авторских прав в нескольких файлах
- Добавлены новые атрибуции разработчиков
Resources/Prototypes/_White/StatusEffects/job.yml - Добавлена новая иконка статуса: JobIconDeathSquad
Resources/Prototypes/StatusEffects/security.yml - Обновлены свойства offset и locationPreference для SecurityIcon

Suggested labels

Changes: Localization

Suggested reviewers

  • Remuchi

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

github-actions bot commented Dec 17, 2024

RSI Diff Bot; head commit 5795537 merging into e638f32
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi

State Old New Status
Chaplain Modified
ChiefJustice Modified
Clerk Modified
Lawyer Modified
MedicalBorg Modified
Prosecutor Modified
nyanoGladiator Modified
nyanoMailCarrier Modified
nyanoMantis Modified
nyanoMartialArtist Modified
nyanoPrisonGuard Modified

Resources/Textures/Interface/Misc/health_icons.rsi

State Old New Status
Dead Modified
Fine Modified
Rotting Modified

Resources/Textures/Interface/Misc/job_icons.rsi

State Old New Status
AtmosphericTechnician Modified
Bartender Modified
Borg Modified
Botanist Modified
Boxer Modified
Brigmedic Modified
Captain Modified
CargoTechnician Modified
Chaplain Modified
Chef Modified
Chemist Modified
ChiefEngineer Modified
ChiefMedicalOfficer Modified
Clown Modified
Detective Modified
Geneticist Modified
HeadOfPersonnel Modified
HeadOfSecurity Modified
HeadRevolutionary Modified
InitialInfected Modified
Janitor Modified
Lawyer Modified
Librarian Modified
Maid Modified
MedicalDoctor Modified
MedicalIntern Modified
Mime Modified
MindShield Modified
Musician Modified
Nanotrasen Modified
NoId Modified
Paramedic Modified
Passenger Modified
Prisoner Modified
Psychologist Modified
QuarterMaster Modified
Reporter Modified
ResearchAssistant Modified
ResearchDirector Modified
Revolutionary Modified
Roboticist Modified
Scientist Modified
SecurityCadet Modified
SecurityOfficer Modified
SeniorEngineer Modified
SeniorOfficer Modified
SeniorPhysician Modified
SeniorResearcher Modified
ServiceWorker Modified
ShaftMiner Modified
StationEngineer Modified
Syndicate Modified
TechnicalAssistant Modified
Unknown Modified
Virologist Modified
Visitor Modified
Warden Modified
Zombie Modified
Zookeeper Modified

Resources/Textures/Interface/Misc/security_icons.rsi

State Old New Status
hud_discharged Modified
hud_incarcerated Modified
hud_paroled Modified
hud_suspected Modified
hud_wanted Modified

Resources/Textures/_White/Interface/Misc/job_icons.rsi

State Old New Status
DeathSquad Added
Shrambled Added

Edit: diff updated after 5795537

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between e638f32 and 5b1f109.

⛔ Files ignored due to path filters (79)
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/health_icons.rsi/Dead.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/health_icons.rsi/Rotting.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Unknown.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png is excluded by !**/*.png
  • Resources/Textures/_White/Interface/Misc/job_icons.rsi/DeathSquad.png is excluded by !**/*.png
  • Resources/Textures/_White/Interface/Misc/job_icons.rsi/Shrambled.png is excluded by !**/*.png
📒 Files selected for processing (8)
  • Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml (2 hunks)
  • Resources/Prototypes/StatusEffects/job.yml (1 hunks)
  • Resources/Prototypes/_White/StatusEffects/job.yml (1 hunks)
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json (1 hunks)
  • Resources/Textures/Interface/Misc/health_icons.rsi/meta.json (1 hunks)
  • Resources/Textures/Interface/Misc/job_icons.rsi/meta.json (1 hunks)
  • Resources/Textures/Interface/Misc/security_icons.rsi/meta.json (1 hunks)
  • Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json (1 hunks)
✅ Files skipped from review due to trivial changes (5)
  • Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
  • Resources/Textures/Interface/Misc/health_icons.rsi/meta.json
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
  • Resources/Textures/_White/Interface/Misc/job_icons.rsi/meta.json
  • Resources/Textures/Interface/Misc/security_icons.rsi/meta.json
🔇 Additional comments (3)
Resources/Prototypes/_White/StatusEffects/job.yml (1)

14-20: Корректная реализация иконки DeathSquad!

Структура и реализация соответствует существующему шаблону, с правильным указанием пути к спрайту в белой теме.

Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml (2)

815-815: Добавление иконки DeathSquad в ID-карту

Корректное добавление JobIconDeathSquad в компонент IdCard.


895-895: Обновление списка иконок для AgentIDCard

JobIconDeathSquad добавлен в список доступных иконок для карты агента.

✅ Verification successful

Подтверждено добавление иконки JobIconDeathSquad

Проверка показала, что:

  • JobIconDeathSquad корректно определен в Resources/Prototypes/_White/StatusEffects/job.yml
  • Иконка правильно используется в карте Centcom Agent
  • Добавление в список доступных иконок для AgentIDCard является логичным расширением функциональности
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка использования JobIconDeathSquad
rg "JobIconDeathSquad" --type yaml

Length of output: 313


Script:

#!/bin/bash
# Проверяем определение и использование JobIconDeathSquad в контексте
rg "JobIconDeathSquad" -A 5 -B 5

Length of output: 2882

Resources/Prototypes/StatusEffects/job.yml Show resolved Hide resolved
@Purka581
Copy link
Contributor

Честно говоря, выглядит ужасно. Часть иконок едва различимы, тень сделана через простое затемнение с градиентом. Да и смысла эта тень не имеет, если рассматривать эти иконки, как дополненную реальность встроенную в визоры. Ну вот правда, лучше оставить всё как есть, и потом не пытаться отличить повара от священника.

@PuroSlavKing
Copy link
Member Author

Честно говоря, выглядит ужасно. Часть иконок едва различимы, тень сделана через простое затемнение с градиентом. Да и смысла эта тень не имеет, если рассматривать эти иконки, как дополненную реальность встроенную в визоры. Ну вот правда, лучше оставить всё как есть, и потом не пытаться отличить повара от священника.

Ты же супер спрайтер, можешь сделать хоть анимированные иконки всем должностям в стиле голограммы, никто не против

@Purka581
Copy link
Contributor

Ты же супер спрайтер, можешь сделать хоть анимированные иконки всем должностям в стиле голограммы, никто не против

Да я и сам не против, но пока есть более приоритетные дела, так что сделаю не в ближайшие 2 месяца уж точно.

@CrimeMoot
Copy link

Убрать градиент - и неплохо.

Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

на самом деле и правда не вижу смысла в решейде. Затемнять их ради чего? Только видимость снижается

@Remuchi
Copy link
Collaborator

Remuchi commented Dec 22, 2024

image
прямой пример иконки что вообще не видно

@PuroSlavKing PuroSlavKing marked this pull request as draft December 22, 2024 10:50
@PuroSlavKing PuroSlavKing marked this pull request as ready for review December 22, 2024 12:15
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

🧹 Nitpick comments (1)
Resources/Prototypes/StatusEffects/security.yml (1)

4-5: Добавьте документацию об изменениях в интерфейсе

Значительные изменения в расположении UI элементов должны быть задокументированы для:

  • Информирования игроков об изменениях
  • Объяснения причин изменений
  • Облегчения будущих модификаций

Предлагаю добавить более подробные комментарии:

- offset: 2 # WWDP-Edit
- locationPreference: Right # WWDP-Edit
+ offset: 2 # WWDP-Edit: Увеличено для улучшения видимости иконок
+ locationPreference: Right # WWDP-Edit: Перемещено вправо для лучшей организации интерфейса
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 5b1f109 and 5795537.

⛔ Files ignored due to path filters (76)
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Chaplain.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/ChiefJustice.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Clerk.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Lawyer.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/MedicalBorg.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Prosecutor.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoGladiator.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMailCarrier.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMantis.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoMartialArtist.png is excluded by !**/*.png
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/nyanoPrisonGuard.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/health_icons.rsi/Fine.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/AtmosphericTechnician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Borg.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Boxer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Brigmedic.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Captain.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/CargoTechnician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chaplain.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Chemist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ChiefEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ChiefMedicalOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Clown.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Detective.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Geneticist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfPersonnel.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadOfSecurity.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/HeadRevolutionary.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/InitialInfected.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Janitor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Lawyer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Librarian.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Maid.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/MedicalDoctor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Mime.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/MindShield.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Musician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Nanotrasen.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/NoId.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Paramedic.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Passenger.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Prisoner.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Psychologist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/QuarterMaster.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Reporter.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ResearchAssistant.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ResearchDirector.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Revolutionary.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Roboticist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Scientist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SecurityOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorOfficer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorPhysician.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/SeniorResearcher.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/ShaftMiner.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/StationEngineer.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Syndicate.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Virologist.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Visitor.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Warden.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Zombie.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/job_icons.rsi/Zookeeper.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_discharged.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_incarcerated.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_paroled.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_suspected.png is excluded by !**/*.png
  • Resources/Textures/Interface/Misc/security_icons.rsi/hud_wanted.png is excluded by !**/*.png
  • Resources/Textures/_White/Interface/Misc/job_icons.rsi/DeathSquad.png is excluded by !**/*.png
📒 Files selected for processing (2)
  • Resources/Prototypes/StatusEffects/security.yml (1 hunks)
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json (1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json
🔇 Additional comments (1)
Resources/Prototypes/StatusEffects/security.yml (1)

4-5: Проверьте влияние изменений на макет интерфейса

Изменение смещения и расположения иконок может повлиять на:

  • Видимость других элементов интерфейса
  • Взаимодействие с другими статусными иконками
  • Пользовательский опыт для существующих игроков

Рекомендуется:

  1. Протестировать с различными комбинациями статусных эффектов
  2. Проверить отображение на разных разрешениях экрана
✅ Verification successful

Let me generate one more verification to check the offset values before making the final response.


Изменения в расположении иконок безопасны для использования

На основе анализа кодовой базы:

  • Смещение (offset) в 2 единицы не конфликтует с другими статусными иконками
  • Расположение справа (Right) уже используется для других иконок (например, в hunger.yml)
  • Изменения локальны для security.yml и не влияют на наследование другими иконками
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check for potential UI conflicts with other status effects

# Search for other status icons that might conflict
rg "type: statusIcon" --type yaml

# Check for any locationPreference configurations
rg "locationPreference:" --type yaml

Length of output: 7327


Script:

#!/bin/bash
# Check for offset configurations in status icons
rg "offset:" --type yaml

Length of output: 27997

@PuroSlavKing PuroSlavKing requested a review from Remuchi December 22, 2024 12:18
@Skilets
Copy link

Skilets commented Dec 22, 2024

Hello

@PuroSlavKing
Copy link
Member Author

Hello

Hewwo

@Skilets
Copy link

Skilets commented Dec 22, 2024

Я бы служанку переделала бы.

@PuroSlavKing
Copy link
Member Author

Я бы служанку переделала бы.

Как хочешь, можешь скинуть в лс, или сюда

Copy link
Collaborator

@Remuchi Remuchi left a comment

Choose a reason for hiding this comment

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

image
зачем цветовую гамму менять?

@PuroSlavKing
Copy link
Member Author

image
зачем цветовую гамму менять?

Всмысле менять, она такая какая и должна быть, цвет атмосов это голубой, у них это буквально один из основных цветов униформы

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants