tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Refactor Damage to use Protoypes (#4262)"

Browse Source 
This reverts commit 20bf5739a9.
This commit is contained in:
Silver
2021-08-24 00:50:39 -06:00
committed by Silver
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/Medical/Components/MedicalScannerComponent.cs
View File

@@ -99,18 +99,8 @@ namespace Content.Server.Medical.Components
private static readonly MedicalScannerBoundUserInterfaceState EmptyUIState =
new(
null,
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
new Dictionary<DamageClass, int>(),
new Dictionary<DamageType, int>(),
=======
new Dictionary<string, int>(),
new Dictionary<string, int>(),
>>>>>>> Refactor damageablecomponent update (#4406)
=======
new Dictionary<string, int>(),
new Dictionary<string, int>(),
>>>>>>> refactor-damageablecomponent
false);
private MedicalScannerBoundUserInterfaceState GetUserInterfaceState()
@@ -131,24 +121,12 @@ namespace Content.Server.Medical.Components
return EmptyUIState;
}
<<<<<<< HEAD
<<<<<<< refs/remotes/origin/master
var classes = new Dictionary<DamageClass, int>(damageable.DamageClasses);
var types = new Dictionary<DamageType, int>(damageable.DamageTypes);
=======
// Get dictionaries of damage, by fully supported damage groups and types
var groups = new Dictionary<string, int>(damageable.GetDamagePerFullySupportedGroupIDs);
var types = new Dictionary<string, int>(damageable.GetDamagePerTypeIDs);
>>>>>>> Refactor damageablecomponent update (#4406)
=======
// Get dictionaries of damage, by fully supported damage groups and types
var groups = new Dictionary<string, int>(damageable.GetDamagePerFullySupportedGroupIDs);
var types = new Dictionary<string, int>(damageable.GetDamagePerTypeIDs);
>>>>>>> refactor-damageablecomponent
if (_bodyContainer.ContainedEntity?.Uid == null)
{
return new MedicalScannerBoundUserInterfaceState(body.Uid, groups, types, true);
return new MedicalScannerBoundUserInterfaceState(body.Uid, classes, types, true);
}
var cloningSystem = EntitySystem.Get<CloningSystem>();
@@ -156,7 +134,7 @@ namespace Content.Server.Medical.Components
mindComponent.Mind != null &&
cloningSystem.HasDnaScan(mindComponent.Mind);
return new MedicalScannerBoundUserInterfaceState(body.Uid, groups, types, scanned);
return new MedicalScannerBoundUserInterfaceState(body.Uid, classes, types, scanned);
}
private void UpdateUserInterface()