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

[Port] StepTriggerGroup From WhiteDream #929

Merged
merged 4 commits into from
Sep 19, 2024

Conversation

VMSolidus
Copy link
Member

@VMSolidus VMSolidus commented Sep 18, 2024

Description

This is a port of WWhiteDreamProject/wwdpublic#53 from White Dream. This PR improves the StepTriggerImmune component by making it operate on a more granular Blacklist system, such that StepTriggerImmune entities can further clarify via prototypes which kinds of floor traps they are immune to, such as landmines/mousetraps, and not have blanket immunity to everything. Because it turns out things like Lava and Soap also were caught by the immunity, when really we just wanted Harpies & Felinids to not trigger landmines.

Media

Описание

Необходимо настроить модификатор урона, чтобы IPC не получали урон от осколков стекла.

Иммунитет StepTriggerImmuneComponent доработан. Теперь имеются несколько типов (types): Lava - тип тайла, наступив на который появляется урон. Это собственно лава и LiquidPlasma Landmine - мины. Chasm - дырка в карте, куда можно провалиться Mousetrap - Мышеловка SlipTile - Все, что должно подскальзывать игроков, имеющее размер тайла SlipEntity - Все, что должно подскальзывать игроков, имеющее развер энтити. Разделено для баланса. Самые ловки могут игнорировать мелкие предметы (энтити), т.е. уворачиваться от них. Но большие по площади вещи (тайлы по типу разлитой воды, бананиума) просчитываются отдельно.

Изменения

  • Улучшить StepTriggerSystem (Immune)
  • Добавлены типы триггера. - Lava Landmine Shard Chasm Mousetrap SlipTile SlipEntity
  • Исправить осколки у IPC
  • Исправить отсутствие урона от лавы и падение в дыры у фелинидов и гарпий.

🆑 Hell_Cat

  • Feature: StepTriggerSystem is improved | Улучшена StepTriggerSystem
  • fix: IPC: Immunity for shards and SpiderWeb | Иммунитет осколкам.
  • fix: Felinid | Фелиниды : Immunity for Shard Landmine Mousetrap SlipEntities | Иммунитет для осколков, жидкости, мин, мышеловок, мыла и бананов.
  • fix: Harpy | Гарпия : Immunity for Shards Landmine Mousetrap | Иммунитет для осколков, жидкости, мин и мышеловок.
  • fix: Mice | Мыши : Don't blow up on landmines | Мыши не подрываются на минах.

Changelog

🆑 Hell_Cat
Feature: StepTriggerSystem has been improved with new StepTriggerGroups. Additionally, the StepTriggerImmune component now allows declaring for specific StepTriggerGroups for a given entity to be immune to. Some examples may be, Felinids, Mice, and Harpies being unable to set off Landmines.

HellCatten and others added 2 commits September 17, 2024 20:06
…mple-Station#53)

* Ipc modifier added

* StepTriggerGroup prototype and change in system.

* fix change chemistry_effects.yml

* types added in trigger/immunity

* comments/clean

* minor fix

* another small fix

* proto id / mouse landmine fix

* CleanCode optimization + fixes

* final

* fix
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: YML Changes any yml files labels Sep 18, 2024
Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

diona need glass immunity (and slip but they already got (noslips).

infact, should noslip shoses just have also whitelists?

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/Player/ipc.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Mobs/Species/harpy.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Tiles/chasm.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Tiles/lava.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Tiles/liquid_plasma.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Traits/skills.yml Outdated Show resolved Hide resolved
@VMSolidus
Copy link
Member Author

diona need glass immunity (and slip but they already got (noslips).

infact, should noslip shoses just have also whitelists?

Noslip is its own separate thing, and Diona have it. Also Diona have ShoesRequiredStepTriggerImmune so they don't care about glass.

@FoxxoTrystan FoxxoTrystan added Size: 3-Medium For medium issues/PRs Priority: 3-Medium Needs to be resolved at some point Type: Port Brings something to here from another codebase labels Sep 18, 2024
Co-authored-by: FoxxoTrystan <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@FoxxoTrystan
Copy link
Member

Also that is some cursed CL

@VMSolidus
Copy link
Member Author

Also that is some cursed CL

Yep lol. But when porting from another codebase, we are supposed to preserve the original CL. I kinda like how they do it with bilingual changes. :)

@FoxxoTrystan
Copy link
Member

its funny and i understood it so, okay!
just dont forget diona

@DEATHB4DEFEAT
Copy link
Member

Do the CL as is normally done

Copy link
Member

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Not stale, please provide this to Dionas.
Before they had a special component or tag, witcth may got removed with the time, but again they are wood, sshould not be affected by glass.

- type: StepTriggerImmune
    whitelist:
      types:
      - Shard

@VMSolidus
Copy link
Member Author

Not stale, please provide this to Dionas. Before they had a special component or tag, witcth may got removed with the time, but again they are wood, sshould not be affected by glass.

- type: StepTriggerImmune
    whitelist:
      types:
      - Shard

Done

@VMSolidus VMSolidus merged commit dee5a40 into Simple-Station:master Sep 19, 2024
12 checks passed
SimpleStation14 added a commit that referenced this pull request Sep 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: YML Changes any yml files Priority: 3-Medium Needs to be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Review Someone please review this Type: Port Brings something to here from another codebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants