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

фиксы и апстрим #147

Merged
merged 10 commits into from
Sep 16, 2024
Merged

фиксы и апстрим #147

merged 10 commits into from
Sep 16, 2024

Conversation

Evgencheg
Copy link
Member

@Evgencheg Evgencheg commented Sep 15, 2024

апстрим

Peptide90 and others added 5 commits September 14, 2024 16:06
Ported from Nuclear14 by request of @OldDanceJacket as they wanted the
weather blocking markers. Tought you may as well get the rest of the
stuff for rad markers and invisible walls too. Useful for planets.

---------

Signed-off-by: Peptide90 <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
Co-authored-by: DEATHB4DEFEAT <[email protected]>
@github-actions github-actions bot added Изменения: Документация Изменяет какие-либо файлы .xml Изменения: Локализация Изменяет какие-либо файлы .ftl Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Изменения: YML Изменяет какие-либо файлы .yml labels Sep 15, 2024
Copy link
Contributor

github-actions bot commented Sep 15, 2024

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

Resources/Textures/Interface/Actions/flight.rsi

State Old New Status
flight_off Added
flight_on Added

Resources/Textures/Markers/environment.rsi

State Old New Status
base-blue Added
base-green Added
base-red Added
fire Added
rad Added
wall Added
weather Added

Edit: diff updated after 9a22fd0

@Evgencheg Evgencheg added Статус: Требуется изменения Ожидание выполнения требований к изменениям разработчиков СВЯТЫЕ УГОДНИКИ Для чего-то очень крутого или супер глобального или базы данных... Статус: Не мержить НЕ МЕРЖИТЬ! Приоритет: 1-Максимальный РЕШИТЬ НЕМЕДЛЕННО! Размер: 1-Огромный Для очень больших ПР'ов/баг репортов labels Sep 15, 2024
@github-actions github-actions bot removed the СВЯТЫЕ УГОДНИКИ Для чего-то очень крутого или супер глобального или базы данных... label Sep 15, 2024
gluesniffler and others added 3 commits September 16, 2024 00:41
# Description

This PR adds a generic system which gives an entity the ability to fly.
Optionally increasing their speed in exchange for a continuous stamina
drain, which can, and **will** stamcrit them if left unchecked.

---

# Technical Details?

We normally dont have this section but I'd like to outline the changes
since I messed with quite a few systems:

- Introduces a `FlightComponent` which can be added to any entity in
YML, needs to be tied to an action with an event of type
`ToggleFlightEvent` This component holds properties for:
- Toggling animations on and off, either at the entity level or the
layer level.
    - Altering shader animation properties
- Altering speed, stamina drain, sounds played, delay between sounds,
etc etc.
- Adds a `FlyingVisualizerSystem` that can take a given `AnimationKey`
which points to a shader, and optionally can apply it to either the
entire sprite, or a given layer.
- Adds a check in `SharedGravitySystem` for making the entity weightless
when it has the `FlightComponent` and is flying.
- Adds a check in `SharedCuffableSystem` to disable cuffing when the
target has the `FlightComponent` and is flying.
- Introduces a new field in the `StaminaComponent` which serves as a
dictionary for persistent drains, with the key being the source (UID) of
where it came from. The drains can also indicate if they should apply
the stamina slowdown or not (relevant for both this PR, and for an
eventual sprinting PR)

---


<details><summary><h1>Media</h1></summary>
<p>

[![Flight
Demo](https://i.ytimg.com/vi/Wndv9hYaZ_s/maxresdefault.jpg)](https://youtu.be/Wndv9hYaZ_s
"Flight Demo")
</p>
</details>

---

# Changelog

:cl: Mocho
- add: Harpies are now able to fly on station for limited periods of
time, moving faster at the cost of stamina.

---------

Signed-off-by: gluesniffler <[email protected]>
Co-authored-by: VMSolidus <[email protected]>
@github-actions github-actions bot added Изменения: Звуки Изменяет какие-либо файлы .ogg Изменения: C# Изменяет какие-либо файлы .cs labels Sep 16, 2024
@Evgencheg Evgencheg removed the Статус: Не мержить НЕ МЕРЖИТЬ! label Sep 16, 2024
@Evgencheg Evgencheg merged commit 0ff10b2 into Lost-Paradise-Project:master Sep 16, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Изменения: C# Изменяет какие-либо файлы .cs Изменения: YML Изменяет какие-либо файлы .yml Изменения: Документация Изменяет какие-либо файлы .xml Изменения: Звуки Изменяет какие-либо файлы .ogg Изменения: Локализация Изменяет какие-либо файлы .ftl Изменения: Спрайт Изменяет какие-либо файлы .json/.png в текстурах Приоритет: 1-Максимальный РЕШИТЬ НЕМЕДЛЕННО! Размер: 1-Огромный Для очень больших ПР'ов/баг репортов Статус: Требуется изменения Ожидание выполнения требований к изменениям разработчиков
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants