Damage rework (#2525)
* Make damage work through messages and events, make destructible not inherit ruinable or reference damageable * Copy sound logic to destructible component for now * Fix typo * Fix prototype error * Remove breakable component damageable reference * Remove breakable construction reference * Remove ruinable component * Move thresholds to individual components and away from damageable * Add threshold property to damageable component code * Add thresholds to destructible component, add states to damageable, remove damage container, fix up mob states * Being alive isn't normal * Fix not reading the id * Merge fixes * YAML fixes * Grammar moment * Remove unnecessary dependency * Update thresholds doc * Change naming of thresholds to states in MobStateComponent * Being alive is once again normal * Make DamageState a byte * Bring out classes structs and enums from DestructibleComponent * Add test for destructible thresholds * Merge fixes * More merge fixes and fix rejuvenate test * Remove IMobState.IsConscious * More merge fixes someone please god review this shit already * Fix rejuvenate test * Update outdated destructible in YAML * Fix repeatedly entering the current state * Fix repeatedly entering the current state, add Threshold.TriggersOnce and expand test * Update saltern
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#nullable enable
|
||||
using Content.Server.Mobs;
|
||||
using Content.Server.Objectives.Interfaces;
|
||||
using Content.Shared.GameObjects.Components.Damage;
|
||||
using Content.Shared.GameObjects.Components.Mobs.State;
|
||||
using JetBrains.Annotations;
|
||||
using Robust.Shared.Localization;
|
||||
using Robust.Shared.Utility;
|
||||
@@ -24,11 +24,12 @@ namespace Content.Server.Objectives.Conditions
|
||||
|
||||
public SpriteSpecifier Icon => new SpriteSpecifier.Rsi(new ResourcePath("Objects/Misc/skub.rsi"), "icon"); //didn't know what else would have been a good icon for staying alive
|
||||
|
||||
public float Progress => _mind?.OwnedEntity != null &&
|
||||
_mind.OwnedEntity.TryGetComponent<IDamageableComponent>(out var damageableComponent) &&
|
||||
damageableComponent.CurrentState == DamageState.Dead
|
||||
? 0f
|
||||
: 1f;
|
||||
public float Progress => _mind?
|
||||
.OwnedEntity?
|
||||
.GetComponentOrNull<IMobStateComponent>()?
|
||||
.IsDead() ?? false
|
||||
? 0f
|
||||
: 1f;
|
||||
|
||||
public float Difficulty => 1f;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user