IconSmooth additional smoothing keys (#35790)
* additionalKeys * Update lava.yml * Update Content.Client/IconSmoothing/IconSmoothComponent.cs --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
parent
e16720fe0a
commit
b48900f99a
|
|
@ -26,6 +26,12 @@ namespace Content.Client.IconSmoothing
|
|||
[ViewVariables(VVAccess.ReadWrite), DataField("key")]
|
||||
public string? SmoothKey { get; private set; }
|
||||
|
||||
/// <summary>
|
||||
/// Additional keys to smooth with.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public List<string> AdditionalKeys = new();
|
||||
|
||||
/// <summary>
|
||||
/// Prepended to the RSI state.
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -376,7 +376,8 @@ namespace Content.Client.IconSmoothing
|
|||
while (candidates.MoveNext(out var entity))
|
||||
{
|
||||
if (smoothQuery.TryGetComponent(entity, out var other) &&
|
||||
other.SmoothKey == smooth.SmoothKey &&
|
||||
other.SmoothKey != null &&
|
||||
(other.SmoothKey == smooth.SmoothKey || smooth.AdditionalKeys.Contains(other.SmoothKey)) &&
|
||||
other.Enabled)
|
||||
{
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
acts: [ "Destruction" ]
|
||||
|
||||
- type: IconSmooth
|
||||
key: bricks
|
||||
key: walls
|
||||
base: brick
|
||||
|
||||
- type: entity
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@
|
|||
state: full
|
||||
- type: IconSmooth
|
||||
key: chasm
|
||||
additionalKeys:
|
||||
- walls
|
||||
base: chasm
|
||||
- type: Physics
|
||||
bodyType: Static
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
state: full
|
||||
- type: IconSmooth
|
||||
key: floor
|
||||
additionalKeys:
|
||||
- walls
|
||||
base: lava
|
||||
- type: Physics
|
||||
bodyType: Static
|
||||
|
|
|
|||
Loading…
Reference in New Issue