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

Респрайт большинства ID-карт. #993

Merged
merged 8 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@
components:
- type: Sprite
layers:
- state: default
- state: silver
- sprite: Backmen/Objects/Misc/id_cards.rsi
state: idblueshield
- type: PresetIdCard
Expand Down
Binary file modified Resources/Textures/Backmen/Objects/Misc/id_cards.rsi/default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Backmen/Objects/Misc/id_cards.rsi/idstudent.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), @Vordenburg",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic resprited by catbg(Discord), @Vordenburg",
"size": {
"x": 32,
"y": 32
Expand All @@ -19,6 +19,9 @@
{
"name": "default"
},
{
"name": "silver"
},
{
"name": "black"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/admin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/centcom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/default.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/ert_commander.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/ert_engineer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/ert_janitor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/ert_medic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/ert_security.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/gold.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idadmin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idbartender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idbotanist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idboxer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idbrigmedic.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcaptain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcargotechnician.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcentcom.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idchaplain.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idchemist.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idchiefengineer.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idclown.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcook.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idcurator.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/iddetective.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idheadofsecurity.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-sci.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idjanitor.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idmedicaldoctor.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idmime.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idmusician.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idparamedic.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idpassenger.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idpilot.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idprisoner.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idpsychologist.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idquartermaster.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idreporter.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idroboticist.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idscientist.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idseniorengineer.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idseniorofficer.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idseniorphysician.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idshaftminer.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idvisitor.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idwarden.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/idzookeeper.png
190 changes: 95 additions & 95 deletions Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e idcluwne made by brainfood1183 (github) for ss14, idbrigmedic made by PuroSlavKing (Github), pirate made by brainfood1183 (github), idadmin made by Arimah (github), idvisitor by IProduceWidgets (Github), idintern-service by spanky-spanky (Github)",
"copyright": "Resprited ALL by CatBackGround(GitHub) & fizzoghoster(Discord).",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "default"
},
{
"name": "centcom"
},
{
"name": "admin"
},
Expand All @@ -35,136 +29,154 @@
"name": "ert_security"
},
{
"name": "gold"
"name": "idcentcom"
},
{
"name": "idpassenger"
"name": "idgeneticist"
},
{
"name": "idatmospherictechnician"
"name": "idlawyer"
},
{
"name": "idbartender"
"name": "idunknown"
Comment on lines +32 to +41
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

Обнаружены несоответствия в переименованиях ID-карт

В файле Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml найдены следующие несоответствия:

  • Состояние gold всё ещё используется в нескольких ID-картах (IDSFO, ERTLeaderIDCard)
  • Состояние idpassenger используется в AgentIDCard
  • Состояние idatmospherictechnician используется в AtmosIDCard

Необходимо обновить следующие прототипы для соответствия новым именам состояний:

  • IDSFO (заменить gold на новое состояние)
  • ERTLeaderIDCard (заменить gold на новое состояние)
  • AgentIDCard (обновить idpassenger на idgeneticist)
  • AtmosIDCard (обновить idatmospherictechnician на idlawyer)
🔗 Analysis chain

Проверьте согласованность переименований

Произведены значительные изменения в именах состояний:

  • goldidcentcom
  • idpassengeridgeneticist
  • idatmospherictechnicianidlawyer
  • Добавлено idunknown

Необходимо убедиться, что все сущности и прототипы, использующие эти состояния, также обновлены.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Поиск использования старых имен состояний
echo "Поиск использования старых имен..."
rg -l "gold|idpassenger|idatmospherictechnician" Resources/Prototypes/

echo "Поиск использования новых имен..."
rg -l "idcentcom|idgeneticist|idlawyer|idunknown" Resources/Prototypes/

Length of output: 5253


Script:

#!/bin/bash
# Проверим конкретные файлы с ID-картами на предмет несоответствий
echo "Содержимое файла _Backmen/Entities/Objects/Misc/identification_cards.yml:"
cat "Resources/Prototypes/_Backmen/Entities/Objects/Misc/identification_cards.yml"

echo -e "\nСодержимое файла Entities/Objects/Misc/identification_cards.yml:"
cat "Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml"

Length of output: 28675

},
{
"name": "idbotanist"
"name": "idadmin"
},
{
"name": "idboxer"
"name": "orange"
},
{
"name": "idcaptain"
"name": "pirate"
},
{
"name": "idcargotechnician"
"name": "prisoner_001"
},
{
"name": "idcentcom"
"name": "prisoner_002"
},
{
"name": "idchaplain"
"name": "prisoner_003"
},
{
"name": "idchemist"
"name": "prisoner_004"
},
{
"name": "idchiefengineer"
"name": "prisoner_005"
},
{
"name": "idchiefmedicalofficer"
"name": "prisoner_006"
},
{
"name": "idclown"
"name": "prisoner_007"
},
{
"name": "idcook"
"name": "idcluwne"
},
{
"name": "idcurator"
"name": "idseniorengineer"
},
{
"name": "iddetective"
"name": "idseniorresearcher"
},
{
"name": "idgeneticist"
"name": "idseniorphysician"
},
{
"name": "idheadofpersonnel"
"name": "idseniorofficer"
},
{
"name": "idheadofsecurity"
"name": "gold-inhand-left",
"directions": 4
},
{
"name": "idbrigmedic"
"name": "gold-inhand-right",
"directions": 4
},
{
"name": "idjanitor"
"name": "default-inhand-left",
"directions": 4
},
{
"name": "idlawyer"
"name": "default-inhand-right",
"directions": 4
},
{
"name": "idiaa"
"name": "silver-inhand-left",
"directions": 4
},
{
"name": "idmedicaldoctor"
"name": "silver-inhand-right",
"directions": 4
},
{
"name": "idmime"
"name": "orange-inhand-left",
"directions": 4
},
{
"name": "idparamedic"
"name": "orange-inhand-right",
"directions": 4
},
{
"name": "idpsychologist"
"name": "blue-inhand-left",
"directions": 4
},
{
"name": "idreporter"
"name": "blue-inhand-right",
"directions": 4
},
{
"name": "idprisoner"
"name": "green-inhand-left",
"directions": 4
},
{
"name": "idquartermaster"
"name": "green-inhand-right",
"directions": 4
Comment on lines +89 to +134
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 указано "directions": 4 для спрайтов в руках, что подразумевает наличие 4 направлений (0-3) для каждого спрайта. Однако фактически присутствуют только базовые спрайты без нумерации направлений (например, blue-inhand-left.png вместо ожидаемых blue-inhand-left.0.png, blue-inhand-left.1.png и т.д.).

Необходимо:

  • Либо создать спрайты для всех 4 направлений
  • Либо изменить значение directions на 1 в meta.json, если анимация для разных направлений не требуется
🔗 Analysis chain

Проверьте корректность направлений спрайтов

Добавление атрибута directions: 4 для спрайтов в руках - правильное решение. Однако нужно убедиться, что все необходимые спрайты присутствуют в текстурах.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия всех необходимых спрайтов
for direction in {0..3}; do
  for hand in left right; do
    for type in gold default silver orange blue green; do
      echo "Проверка: $type-inhand-$hand.$direction.png"
      test -f "Resources/Textures/Objects/Misc/id_cards.rsi/$type-inhand-$hand.$direction.png"
    done
  done
done

Length of output: 10407


Script:

#!/bin/bash
# Проверяем наличие файлов спрайтов с помощью ls, чтобы увидеть, какие файлы существуют
ls -la Resources/Textures/Objects/Misc/id_cards.rsi/*-inhand-*.png

Length of output: 2224

},
{
"name": "idresearchdirector"
"name": "default"
},
{
"name": "idroboticist"
"name": "silver"
},
{
"name": "idscientist"
"name": "gold"
},
{
"name": "idsecurityofficer"
"name": "centcom"
},
{
"name": "idshaftminer"
"name": "idchiefengineer"
},
{
"name": "idstationengineer"
"name": "idcaptain"
},
{
"name": "idunknown"
"name": "idheadofsecurity"
},
{
"name": "idvirologist"
"name": "idclown"
},
{
"name": "idvisitor"
"name": "syndie"
},
{
"name": "idwarden"
"name": "idchiefmedicalofficer"
},
{
"name": "idmusician"
"name": "idcook"
},
{
"name": "idzookeeper"
"name": "idcurator"
},
{
"name": "idintern-sci"
"name": "iddetective"
},
{
"name": "idheadofpersonnel"
},
{
"name": "idiaa"
Comment on lines +173 to +179
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

Обнаружены проблемы с реализацией новых ID-карт

  • Спрайты idheadofpersonnel.png и idiaa.png отсутствуют в RSI директории, хотя состояния определены в meta.json
  • Прототипы для карт существуют:
    • idheadofpersonnel в Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
    • idiaa в Resources/Prototypes/_Backmen/Roles/Jobs/CentCom/centcom_official.yml, centcom_admiral.yml и Resources/Prototypes/Corvax/Entities/Objects/Misc/identification_cards.yml
  • Локализация для "Head of Personnel" присутствует в обоих языках (en-US и ru-RU), но отсутствует полная локализация для "Internal Affairs Agent"

Необходимо:

  1. Добавить отсутствующие спрайты для состояний idheadofpersonnel и idiaa
  2. Добавить недостающие строки локализации для должности Internal Affairs Agent
🔗 Analysis chain

Проверьте новые состояния

Добавлены новые состояния:

  • idheadofpersonnel
  • idiaa

Убедитесь, что:

  1. Спрайты для этих состояний присутствуют в RSI
  2. Прототипы для новых ID-карт созданы
  3. Локализация для новых должностей добавлена
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Проверка наличия необходимых файлов и записей
echo "Проверка спрайтов..."
test -f "Resources/Textures/Objects/Misc/id_cards.rsi/idheadofpersonnel.png"
test -f "Resources/Textures/Objects/Misc/id_cards.rsi/idiaa.png"

echo "Проверка прототипов..."
rg "idheadofpersonnel|idiaa" Resources/Prototypes/

echo "Проверка локализации..."
rg "head-of-personnel|internal-affairs-agent" Resources/Locale/

Length of output: 1127

},
{
"name": "idintern-cadet"
Expand All @@ -173,112 +185,100 @@
"name": "idintern-med"
},
{
"name": "idintern-service"
"name": "idintern-sci"
},
{
"name": "idintern-tech"
"name": "idintern-service"
},
{
"name": "idadmin"
"name": "idintern-tech"
},
{
"name": "orange"
"name": "idjanitor"
},
{
"name": "pirate"
"name": "idmedicaldoctor"
},
{
"name": "prisoner_001"
"name": "idmime"
},
{
"name": "prisoner_002"
"name": "idmusician"
},
{
"name": "prisoner_003"
"name": "idparamedic"
},
{
"name": "prisoner_004"
"name": "idpassenger"
},
{
"name": "prisoner_005"
"name": "idpilot"
},
{
"name": "prisoner_006"
"name": "idprisoner"
},
{
"name": "prisoner_007"
"name": "idpsychologist"
},
{
"name": "silver"
"name": "idquartermaster"
},
{
"name": "syndie"
"name": "idreporter"
},
{
"name": "idcluwne"
"name": "idresearchdirector"
},
{
"name": "idseniorengineer"
"name": "idroboticist"
},
{
"name": "idseniorresearcher"
"name": "idscientist"
},
{
"name": "idseniorphysician"
"name": "idsecurityofficer"
},
{
"name": "idseniorofficer"
"name": "idshaftminer"
},
{
"name": "idpilot"
"name": "idstationengineer"
},
{
"name": "gold-inhand-left",
"directions": 4
"name": "idvisitor"
},
{
"name": "gold-inhand-right",
"directions": 4
"name": "idwarden"
},
{
"name": "default-inhand-left",
"directions": 4
"name": "idzookeeper"
},
{
"name": "default-inhand-right",
"directions": 4
"name": "idatmospherictechnician"
},
{
"name": "silver-inhand-left",
"directions": 4
"name": "idbartender"
},
{
"name": "silver-inhand-right",
"directions": 4
"name": "idbotanist"
},
{
"name": "orange-inhand-left",
"directions": 4
"name": "idboxer"
},
{
"name": "orange-inhand-right",
"directions": 4
"name": "idbrigmedic"
},
{
"name": "blue-inhand-left",
"directions": 4
"name": "idcargotechnician"
},
{
"name": "blue-inhand-right",
"directions": 4
"name": "idchaplain"
},
{
"name": "green-inhand-left",
"directions": 4
"name": "idchemist"
},
{
"name": "green-inhand-right",
"directions": 4
"name": "idvirologist"
}
]
}
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/orange.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/silver.png
Binary file modified Resources/Textures/Objects/Misc/id_cards.rsi/syndie.png
Loading