Remove TableParts, fix SmoothTile destruction bug (#918)
This commit is contained in:
@@ -81,6 +81,9 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
|
|||||||
base.Startup();
|
base.Startup();
|
||||||
|
|
||||||
SnapGrid.OnPositionChanged += SnapGridOnPositionChanged;
|
SnapGrid.OnPositionChanged += SnapGridOnPositionChanged;
|
||||||
|
// ensures lastposition initial value is populated on spawn. Just calling
|
||||||
|
// the hook here would cause a dirty event to fire needlessly
|
||||||
|
_lastPosition = (Owner.Transform.GridID, SnapGrid.Position);
|
||||||
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner,null, SnapGrid.Offset, Mode));
|
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, new IconSmoothDirtyEvent(Owner,null, SnapGrid.Offset, Mode));
|
||||||
if (Mode == IconSmoothingMode.Corners)
|
if (Mode == IconSmoothingMode.Corners)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,8 +28,9 @@
|
|||||||
- type: Damageable
|
- type: Damageable
|
||||||
- type: Destructible
|
- type: Destructible
|
||||||
thresholdvalue: 50
|
thresholdvalue: 50
|
||||||
spawnondestroy: TableParts
|
spawnondestroy: SteelSheet1
|
||||||
|
|
||||||
|
# TODO: drop wood instead of steel when destroyed when that's added
|
||||||
- type: entity
|
- type: entity
|
||||||
id: TableWood
|
id: TableWood
|
||||||
parent: Table
|
parent: Table
|
||||||
@@ -41,4 +42,4 @@
|
|||||||
- type: Damageable
|
- type: Damageable
|
||||||
- type: Destructible
|
- type: Destructible
|
||||||
thresholdvalue: 50
|
thresholdvalue: 50
|
||||||
spawnondestroy: TableParts
|
spawnondestroy: SteelSheet1
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
- type: entity
|
|
||||||
name: Table Parts
|
|
||||||
parent: BaseItem
|
|
||||||
id: TableParts
|
|
||||||
description: Parts of a table.
|
|
||||||
components:
|
|
||||||
- type: Sprite
|
|
||||||
sprite: Objects/Parts/table_parts.rsi
|
|
||||||
state: icon
|
|
||||||
|
|
||||||
- type: Icon
|
|
||||||
sprite: Objects/Parts/table_parts.rsi
|
|
||||||
state: icon
|
|
||||||
|
|
||||||
- type: Item
|
|
||||||
Size: 25
|
|
||||||
sprite: Objects/Parts/table_parts.rsi
|
|
||||||
Reference in New Issue
Block a user