-
Notifications
You must be signed in to change notification settings - Fork 154
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
Changes from 7 commits
9d5895f
ab73f2b
cb8a595
dedc1e6
f44c4cd
98ee3ce
68e2f5d
a8d9c72
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
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).", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "default" | ||
}, | ||
{ | ||
"name": "centcom" | ||
}, | ||
{ | ||
"name": "admin" | ||
}, | ||
|
@@ -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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💡 Codebase verification Обнаружены несоответствия в переименованиях ID-карт В файле
Необходимо обновить следующие прототипы для соответствия новым именам состояний:
🔗 Analysis chainПроверьте согласованность переименований Произведены значительные изменения в именах состояний:
Необходимо убедиться, что все сущности и прототипы, использующие эти состояния, также обновлены. 🏁 Scripts executedThe 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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💡 Codebase verification Обнаружено несоответствие между метаданными и файлами спрайтов В meta.json указано Необходимо:
🔗 Analysis chainПроверьте корректность направлений спрайтов Добавление атрибута 🏁 Scripts executedThe 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
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💡 Codebase verification Обнаружены проблемы с реализацией новых ID-карт
Необходимо:
🔗 Analysis chainПроверьте новые состояния Добавлены новые состояния:
Убедитесь, что:
🏁 Scripts executedThe 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" | ||
|
@@ -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" | ||
} | ||
] | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Необходимо сохранить информацию о лицензии и авторских правах
Текущее изменение некорректно с точки зрения лицензии CC-BY-SA-3.0, которая требует указания авторства оригинальных работ. Даже при полном респрайте необходимо сохранять информацию об оригинальных авторах, так как новые спрайты являются производной работой.
Предлагаемые исправления:
• Файл уже содержит правильную лицензию (
"license": "CC-BY-SA-3.0"
), но требуется корректное указание авторства в соответствии с условиями этой лицензии.🔗 Analysis chain
Необходимо сохранить историю авторства
Текущее изменение удаляет информацию об оригинальных авторах спрайтов. Даже при полном респрайте, рекомендуется сохранить ссылку на оригинальные работы, от которых произошли изменения.
Предлагаемое исправление:
Let me verify the copyright attribution history by checking the git history and related files.
Let me check the content of these license files and README to understand the project's attribution requirements.
Let me fix the command to properly search for copyright information in RSI files.
Let me check the specific RSI file content to understand the previous copyright information.
🏁 Scripts executed
The following scripts were executed for the analysis:
Error: No shell scripts found
Script:
Length of output: 144
Script:
Length of output: 1448
Script:
Length of output: 65641
Script:
Length of output: 6034