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

Новые турели #17

Closed
wants to merge 4 commits into from
Closed

Conversation

fe-ed
Copy link
Contributor

@fe-ed fe-ed commented Jul 15, 2024

Основные изменения

На данный момент полностью меняет визуал турелей, механику улучшения, звуковое сопровождение и их баланс. Добавляет механику near_lock, не позволяющий ставить одинаковые объекты слишком близко друг к другу (например, турели).

https://discord.com/channels/1235677154084126861/1262468579912319027/1262783158311456841
https://discord.com/channels/1235677154084126861/1262468579912319027/1263171384075620374
https://discord.com/channels/1235677154084126861/1262468579912319027/1263172058209325117

[!!!] На данный момент не добавлены в вендор.

Как это улучшит игру

Много красивых турелей, более разнообразные механики. Турели больше не продаются в коробках. Турели больше нельзя настакивать около друг-друга. Инженеры всегда получают бесплатную турель.

Ченджлог

:cl:
add: Добавил новые турели.
del: Удалил старые турели и коробки.
balance: Инженеры получают 1 бесплатную турель.
soundadd: Новое звуковое сопровождение у турелей.
imageadd: Полный респрайт всех турелей/их магазинов.
/:cl:

@fe-ed fe-ed marked this pull request as draft July 15, 2024 15:37
@fe-ed fe-ed added Balance Изменение важных игровых механик. Feature Добавление новых механик и прочего. Sound Изменение или добавление музыки. Sprites Любые изменения спрайтов. labels Jul 15, 2024
@fe-ed fe-ed requested a review from Tatarla July 17, 2024 16:58
@fe-ed fe-ed marked this pull request as ready for review July 17, 2024 16:58
@Tatarla Tatarla requested review from homexp13 and Helg2 July 17, 2024 17:16
Copy link
Collaborator

@homexp13 homexp13 left a comment

Choose a reason for hiding this comment

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

гойда

return
user.balloon_alert(user, "You start deploying...")
if(CHECK_BITFIELD(item_to_deploy?.near_lock, TRUE))
Copy link
Collaborator

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.

Бывает

@@ -132,7 +132,8 @@ GLOBAL_DATUM_INIT(welding_sparks_prepdoor, /mutable_appearance, mutable_appearan

var/active = FALSE


///If TRUE you cant deploy item next to another deployable in 5x5 tile radius.
var/near_lock
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
var/near_lock
var/near_lock = FALSE

Почему бы не сделать так?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Оно разве не null? Какой смысл?

continue
if(ismob(AM))
continue
if(!(AM.allow_pass_flags & (gun.ammo_datum_type::flags_ammo_behavior & AMMO_ENERGY ? (PASS_GLASS|PASS_PROJECTILE) : PASS_PROJECTILE) && !(AM.type in ignored_terrains))) //todo:accurately populate ignored_terrains
Copy link
Collaborator

Choose a reason for hiding this comment

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

Зачем тут ::?

Copy link
Collaborator

Choose a reason for hiding this comment

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

это за место initial если не ошибаюсь (код офовский)

@Tatarla Tatarla requested a review from Helg2 July 20, 2024 07:36
@Helg2 Helg2 added the Merge Conflict ПР конфликтует с базовой веткой label Jul 29, 2024
@Tatarla Tatarla marked this pull request as draft July 29, 2024 19:12
@Helg2 Helg2 added the Stale Автор ушёл на завод. label Aug 16, 2024
@fe-ed
Copy link
Contributor Author

fe-ed commented Aug 21, 2024

Я не вернусь на проект, буду рад если эти старания кто-то перехватит. Пишите в Дискорд по вопросам: @fe_ed

@fe-ed fe-ed closed this Aug 21, 2024
Tatarla pushed a commit that referenced this pull request Aug 22, 2024
* Resprites 571, adds 2 new sentry types. (#15183)

* Sentry fix and code improvements (#15404)

* Подтягивем код

* Солянка + переводы

* meh

* Update code/modules/projectiles/guns/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/guns/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/reqs/supplypacks.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/reqs/supplypacks.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* fid moment

* doc

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/reqs/supplypacks.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/reqs/supplypacks.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* Update code/modules/projectiles/sentries.dm

Co-authored-by: Helg2 <[email protected]>
Signed-off-by: homexp13 <[email protected]>

* set_on <--

* icons

* cannot fit into

---------

Signed-off-by: homexp13 <[email protected]>
Co-authored-by: Pariah919 <[email protected]>
Co-authored-by: Lumipharon <[email protected]>
Co-authored-by: Feedod <[email protected]>
Co-authored-by: Helg2 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Изменение важных игровых механик. Feature Добавление новых механик и прочего. Merge Conflict ПР конфликтует с базовой веткой Sound Изменение или добавление музыки. Sprites Любые изменения спрайтов. Stale Автор ушёл на завод.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants