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.

Sign up for GitHub

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

Jump to bottom

Draft: Energy cores #57

Closed
wants to merge 22 commits into from
Closed

Draft: Energy cores #57

wants to merge 22 commits into from

Conversation

aristophanivan
Copy link
Contributor

@aristophanivan aristophanivan commented Aug 19, 2024 •
edited
Loading

Ядра Темного
Пишем-пишем-пишем ядра.
Функции:

  1. источник энергии
  2. гравген
  3. гироскоп
    Приколы:
  4. для работы требуется газ в зависимости от ядра
  5. может сломаться
  6. будет чиниться сваркой
  7. крутые анимации)))

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 19, 2024 •
edited
Loading

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

Resources/Textures/Stories/Objects/Specific/EnergyCores/key_of_sphere.rsi

State Old New Status
key_of_sphere_gold Added
key_of_sphere_gray Added
key_of_sphere_rnd Added
key_of_sphere_sindi Added
nt_label Added
rnd_label Added
synd_label Added
yelllow_label Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spblue/spblue.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spblue/spblue_big.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spblue/spblue_mini.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sphere/sphere.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sphere/sphere_big.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sphere/sphere_mini.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spred/spred.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spred/spred_big.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/spred/spred_mini.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sprnd/sprnd.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
die Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sprnd/sprnd_big.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Resources/Textures/Stories/Structures/Machines/EnergyCores/sprnd/sprnd_mini.rsi

State Old New Status
corpus Added
corpus_metal Added
corpus_wires-1 Added
corpus_wires-2 Added
corpus_wires-3 Added
corpus_wires-4 Added
crutch Added
disabling Added
enabling Added
fly Added
sphere_off Added

Edit: diff updated after 1f103e4

@doublechest0
Copy link
Contributor

Перенеси текстуры в Stories папку

@aristophanivan
Copy link
Contributor Author

Перенеси текстуры в Stories папку

Как вернусь домой и домапплю карту на заявку.

doublechest0
doublechest0 requested changes Aug 22, 2024
View reviewed changes
Copy link
Contributor

@doublechest0 doublechest0 left a comment

Choose a reason for hiding this comment

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

Использование ключей, которое есть сомнительно и лучше использовать доступы. Думаю, весь клиентский код можно заменить https://docs.spacestation14.com/en/ss14-by-example/making-a-sprite-dynamic.html.

Код системы это ужас, поэтому позже напишу, что нужно исправить.

Resources/Prototypes/dark_tags.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Перенеси теги, который реально используются в файл с тегами в Stories папке прототипов.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ок

Resources/Prototypes/Entities/Objects/Specific/EnergyCores/energycorekey.yml Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Перенести в Stories папку прототипов.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ок

Resources/Textures/Stories/Structures/Machines/EnergyCores/key_of_sphere.rsi/meta.json Outdated
Copy link
Contributor

@doublechest0 doublechest0 Aug 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Ключи не структуры. Перенести все их текстуры в папку с предметами.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ну это окей

Content.Client/Power/EnergyCores/EnergyCoreVisualsSystem.cs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Используй: https://docs.spacestation14.com/en/ss14-by-example/making-a-sprite-dynamic.html
Чтобы не писать клиентский код.

Content.Shared/Power/EnergyCores/EnergyCoreComponent.cs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Разделить компонент по функционалу, если уместно.
Убрать клиентские EnablingLenght и тд. (Перенеся в клиентский EnergyCoreVisualsComponent, если не получится используя https://docs.spacestation14.com/en/ss14-by-example/making-a-sprite-dynamic.html , избавится от клиентского кода)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

А что с EnablingLenght не так? Типа эта фигня указывает на то, сколько длится анимация, чтоб ее вовремя переключить. Это учитывая то, что у каждого ядра разная длина анимации.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ошибся с EnablingLenght.

Перенеси логику нагрева и охлаждения газами в другой компонент.

Content.Server/Gravity/GravityGeneratorComponent.cs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Вместо работы с компонентом, используй GravityGeneratorSystem, которая имеет к нему доступ.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Смотри, там дело в том, что для работы GravityGenerator требует в системе везде того, что ядро будет запитано Apc проводами, а я замышлял то, чтоб даже без Apc проводов гравитация работала.

Content.Server/Power/EnergyCores/EnergyCoreSystem.cs Outdated
if (_timing.CurTime > _nextTickCore)
{
EnergyCoreTick();
_nextTickCore += TimeSpan.FromSeconds(1);
Copy link
Contributor

Choose a reason for hiding this comment

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

Хардкод одной секунды

Content.Server/Power/EnergyCores/EnergyCoreSystem.cs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Это полный *******. Это настолько плохо написано, что, пожалуй, напишу об ошибках позже.

Content.Server/Power/EnergyCores/EnergyCoreKeyComponent.cs Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Заменить ключи ядер на обычный доступ, как у ящиков или считывать доступ айди карты, которую вставят в ядро. (Айди карта может быть условным ключем с его текстуркой и названием)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Заказчик хотел ключи, ничего, как говорится, не знаю.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ключи могут использовать доступы под капотом, вместо написания такой непрактичной системы.

space-stories Outdated
Copy link
Contributor

Choose a reason for hiding this comment

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

Зачем?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Что зачем?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

А, это. Без понятия, что оно тут делает.
Ща удалю.

@doublechest0
Copy link
Contributor

Еще перенеси код в Stories папку.

@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@aristophanivan aristophanivan changed the title Energy cores Draft: Energy cores Sep 3, 2024
@aristophanivan aristophanivan marked this pull request as draft September 3, 2024 05:21
@aristophanivan
Copy link
Contributor Author

Проект временно заморожен.

@aristophanivan
Copy link
Contributor Author

Отозвано.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doublechest0 doublechest0 doublechest0 requested changes

Assignees

@aristophanivan aristophanivan

Labels
Changes: Map Changes: Sprites Changes: UI Merge Conflict
Projects
No open projects
🔌 Разработка
Status: Планы
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aristophanivan @doublechest0