ECS damageable (#4529)
* ECS and damage Data * Comments and newlines * Added Comments * Make TryChangeDamageEvent immutable * Remove SetAllDamage event Use public SetAllDamage function instead * Undo destructible mistakes That was some shit code. * Rename DamageData to DamageSpecifier And misc small edits misc * Cache trigger prototypes. * Renaming destructible classes & functions * Revert "Cache trigger prototypes." This reverts commit 86bae15ba6616884dba75f552dfdfbe2d1fb6586. * Replace prototypes with prototype IDs. * Split damage.yml into individual files * move get/handle component state to system * Update HealthChange doc * Make godmode call Dirty() on damageable component * Add Initialize() to fix damage test * Make non-static * uncache resistance set prototype and trim DamageableComponentState * Remove unnecessary Dirty() calls during initialization * RemoveTryChangeDamageEvent * revert Dirty() * Fix MobState relying on DamageableComponent.Dirty() * Fix DisposalUnit Tests. These were previously failing, but because the async was not await-ed, this never raised the exception. After I fixed MobState component, this exception stopped happening and instead the assertions started being tested & failing * Disposal test 2: electric boogaloo * Fix typos/mistakes also add comments and fix spacing. * Use Uids instead of IEntity * fix merge * Comments, a merge issue, and making some damage ignore resistances * Extend DamageSpecifier and use it for DamageableComponent * fix master merge * Fix Disposal unit test. Again. Snapgrids were removed in master * Execute Exectute
This commit is contained in:
@@ -16,25 +16,24 @@ namespace Content.Shared.MedicalScanner
|
||||
public class MedicalScannerBoundUserInterfaceState : BoundUserInterfaceState
|
||||
{
|
||||
public readonly EntityUid? Entity;
|
||||
public readonly Dictionary<string, int> DamagePerSupportedGroupID;
|
||||
public readonly Dictionary<string, int> DamagePerTypeID;
|
||||
public readonly IReadOnlyDictionary<string, int> DamagePerGroup;
|
||||
public readonly IReadOnlyDictionary<string, int> DamagePerType;
|
||||
public readonly bool IsScanned;
|
||||
|
||||
public MedicalScannerBoundUserInterfaceState(
|
||||
EntityUid? entity,
|
||||
Dictionary<string, int> damagePerSupportedGroupID,
|
||||
Dictionary<string, int> damagePerTypeID,
|
||||
DamageableComponent? damageable,
|
||||
bool isScanned)
|
||||
{
|
||||
Entity = entity;
|
||||
DamagePerSupportedGroupID = damagePerSupportedGroupID;
|
||||
DamagePerTypeID = damagePerTypeID;
|
||||
DamagePerGroup = damageable?.DamagePerGroup ?? new();
|
||||
DamagePerType = damageable?.Damage?.DamageDict ?? new();
|
||||
IsScanned = isScanned;
|
||||
}
|
||||
|
||||
public bool HasDamage()
|
||||
{
|
||||
return DamagePerSupportedGroupID.Count > 0 || DamagePerTypeID.Count > 0;
|
||||
return DamagePerType.Count > 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user