Bug fix for deconstructing tiles and lattice with RCDs (#26863)
* Fixed mixed deconstruction times for tiles and lattice * Lattice and power cables can be deconstructed instantly
This commit is contained in:
@@ -175,7 +175,7 @@ public class RCDSystem : EntitySystem
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var deconstructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
|
var deconstructedTile = _mapSystem.GetTileRef(mapGridData.Value.GridUid, mapGridData.Value.Component, mapGridData.Value.Location);
|
||||||
var protoName = deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
|
var protoName = !deconstructedTile.IsSpace() ? _deconstructTileProto : _deconstructLatticeProto;
|
||||||
|
|
||||||
if (_protoManager.TryIndex(protoName, out var deconProto))
|
if (_protoManager.TryIndex(protoName, out var deconProto))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
damageModifierSet: Metallic
|
damageModifierSet: Metallic
|
||||||
- type: RCDDeconstructable
|
- type: RCDDeconstructable
|
||||||
cost: 2
|
cost: 2
|
||||||
delay: 2
|
delay: 0
|
||||||
fx: EffectRCDDeconstruct2
|
fx: EffectRCDConstruct0
|
||||||
- type: Destructible
|
- type: Destructible
|
||||||
thresholds:
|
thresholds:
|
||||||
- trigger:
|
- trigger:
|
||||||
|
|||||||
@@ -45,8 +45,8 @@
|
|||||||
node: power
|
node: power
|
||||||
- type: RCDDeconstructable
|
- type: RCDDeconstructable
|
||||||
cost: 2
|
cost: 2
|
||||||
delay: 2
|
delay: 0
|
||||||
fx: EffectRCDDeconstruct2
|
fx: EffectRCDConstruct0
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: CableBase
|
parent: CableBase
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
name: rcd-component-deconstruct
|
name: rcd-component-deconstruct
|
||||||
mode: Deconstruct
|
mode: Deconstruct
|
||||||
cost: 2
|
cost: 2
|
||||||
delay: 1
|
delay: 0
|
||||||
rotation: Camera
|
rotation: Camera
|
||||||
fx: EffectRCDDeconstruct2
|
fx: EffectRCDConstruct0
|
||||||
|
|
||||||
- type: rcd
|
- type: rcd
|
||||||
id: DeconstructTile # Hidden prototype - do not add to RCDs
|
id: DeconstructTile # Hidden prototype - do not add to RCDs
|
||||||
|
|||||||
Reference in New Issue
Block a user