Fix unknown component errors and duplicate damageable references (#1778)

This commit is contained in:
DrSmugleaf
2020-08-18 16:41:35 +02:00
committed by GitHub
parent 04bc20c365
commit 8ea9e4cd90
10 changed files with 2 additions and 18 deletions

View File

@@ -157,6 +157,7 @@
"DamageOnHighSpeedImpact", "DamageOnHighSpeedImpact",
"Barotrauma", "Barotrauma",
"MobStateManager", "MobStateManager",
"Metabolism",
}; };
} }
} }

View File

@@ -17,6 +17,7 @@ namespace Content.Shared.GameObjects.Components.Damage
/// Component that allows attached entities to take damage. /// Component that allows attached entities to take damage.
/// This basic version never dies (thus can take an indefinite amount of damage). /// This basic version never dies (thus can take an indefinite amount of damage).
/// </summary> /// </summary>
[RegisterComponent]
[ComponentReference(typeof(IDamageableComponent))] [ComponentReference(typeof(IDamageableComponent))]
public class DamageableComponent : Component, IDamageableComponent public class DamageableComponent : Component, IDamageableComponent
{ {

View File

@@ -13,7 +13,6 @@
- type: Collidable - type: Collidable
- type: Clickable - type: Clickable
- type: InteractionOutline - type: InteractionOutline
- type: Damageable
- type: Destructible - type: Destructible
maxHP: 100 maxHP: 100
- type: Physics - type: Physics

View File

@@ -8,7 +8,6 @@
- type: Collidable - type: Collidable
shapes: shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
- type: Damageable
- type: Destructible - type: Destructible
thresholdvalue: 5 thresholdvalue: 5
- type: Sprite - type: Sprite

View File

@@ -13,7 +13,6 @@
- type: SnapGrid - type: SnapGrid
offset: Center offset: Center
- type: Anchorable - type: Anchorable
- type: Damageable
- type: Breakable - type: Breakable
- type: Rotatable - type: Rotatable

View File

@@ -39,14 +39,10 @@
layer: layer:
- Opaque - Opaque
- MobImpassable - MobImpassable
- type: Species
Template: Human
HeatResistance: 50
- type: BodyManager - type: BodyManager
BaseTemplate: bodyTemplate.Humanoid BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman BasePreset: bodyPreset.BasicHuman
- type: HeatResistance - type: HeatResistance
- type: Damageable
- type: CombatMode - type: CombatMode
- type: Teleportable - type: Teleportable
- type: Stunnable - type: Stunnable

View File

@@ -34,14 +34,10 @@
layer: layer:
- Opaque - Opaque
- MobImpassable - MobImpassable
- type: Species
Template: Human
HeatResistance: 323
- type: BodyManager - type: BodyManager
BaseTemplate: bodyTemplate.Humanoid BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman BasePreset: bodyPreset.BasicHuman
- type: HeatResistance - type: HeatResistance
- type: Damageable
- type: CombatMode - type: CombatMode
- type: Teleportable - type: Teleportable
- type: Stunnable - type: Stunnable

View File

@@ -31,14 +31,10 @@
layer: layer:
- Opaque - Opaque
- MobImpassable - MobImpassable
- type: Species
Template: Human
HeatResistance: 50
- type: BodyManager - type: BodyManager
BaseTemplate: bodyTemplate.Humanoid BaseTemplate: bodyTemplate.Humanoid
BasePreset: bodyPreset.BasicHuman BasePreset: bodyPreset.BasicHuman
- type: HeatResistance - type: HeatResistance
- type: Damageable
- type: CombatMode - type: CombatMode
- type: Teleportable - type: Teleportable
- type: Stunnable - type: Stunnable
@@ -64,7 +60,6 @@
drawdepth: Mobs drawdepth: Mobs
suffix: AI suffix: AI
components: components:
- type: Damageable
- type: Sprite - type: Sprite
drawdepth: Mobs drawdepth: Mobs
sprite: Mobs/Pets/corgi.rsi sprite: Mobs/Pets/corgi.rsi

View File

@@ -258,7 +258,6 @@
baseTemplate: bodyTemplate.Humanoid baseTemplate: bodyTemplate.Humanoid
basePreset: bodyPreset.BasicHuman basePreset: bodyPreset.BasicHuman
- type: MobStateManager - type: MobStateManager
- type: Damageable
- type: Appearance - type: Appearance
visuals: visuals:
- type: RotationVisualizer - type: RotationVisualizer

View File

@@ -106,7 +106,6 @@
devastationRange: 25 devastationRange: 25
heavyImpactRange: 25 heavyImpactRange: 25
flashRange: 50 flashRange: 50
- type: Damageable
- type: Destructible - type: Destructible
thresholdvalue: 50 thresholdvalue: 50
- type: Appearance - type: Appearance