Make guidebooks specify both damage types and groups (#18510)
* Make guidebooks specify both damage types and groups * slothhhhhhhhhh i was in vc you didn't have to leave revIIEEEEWWWWWWW
This commit is contained in:
@@ -2,6 +2,7 @@ using System.Linq;
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Content.Shared.Chemistry.Reagent;
|
using Content.Shared.Chemistry.Reagent;
|
||||||
using Content.Shared.Damage;
|
using Content.Shared.Damage;
|
||||||
|
using Content.Shared.Damage.Prototypes;
|
||||||
using Content.Shared.FixedPoint;
|
using Content.Shared.FixedPoint;
|
||||||
using Content.Shared.Localizations;
|
using Content.Shared.Localizations;
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
@@ -28,22 +29,65 @@ namespace Content.Server.Chemistry.ReagentEffects
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
[JsonPropertyName("scaleByQuantity")]
|
[JsonPropertyName("scaleByQuantity")]
|
||||||
[DataField("scaleByQuantity")]
|
[DataField("scaleByQuantity")]
|
||||||
public bool ScaleByQuantity = false;
|
public bool ScaleByQuantity;
|
||||||
|
|
||||||
[DataField("ignoreResistances")]
|
[DataField("ignoreResistances")]
|
||||||
[JsonPropertyName("ignoreResistances")]
|
[JsonPropertyName("ignoreResistances")]
|
||||||
public bool IgnoreResistances = true;
|
public bool IgnoreResistances = true;
|
||||||
|
|
||||||
protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
|
protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
|
||||||
{
|
{
|
||||||
var damages = new List<string>();
|
var damages = new List<string>();
|
||||||
var heals = false;
|
var heals = false;
|
||||||
var deals = false;
|
var deals = false;
|
||||||
|
|
||||||
// TODO: This should be smarter. Namely, not showing a damage type as being in a group unless every damage type in the group is present and equal in value.
|
var damageSpec = new DamageSpecifier(Damage);
|
||||||
foreach (var (kind, amount) in Damage.GetDamagePerGroup())
|
|
||||||
|
foreach (var group in prototype.EnumeratePrototypes<DamageGroupPrototype>())
|
||||||
{
|
{
|
||||||
var sign = MathF.Sign(amount.Float());
|
if (!damageSpec.TryGetDamageInGroup(group, out var amount))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var relevantTypes = damageSpec.DamageDict
|
||||||
|
.Where(x => x.Value != FixedPoint2.Zero && group.DamageTypes.Contains(x.Key)).ToList();
|
||||||
|
|
||||||
|
if (relevantTypes.Count != group.DamageTypes.Count)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var sum = FixedPoint2.Zero;
|
||||||
|
foreach (var type in group.DamageTypes)
|
||||||
|
{
|
||||||
|
sum += damageSpec.DamageDict.GetValueOrDefault(type);
|
||||||
|
}
|
||||||
|
|
||||||
|
// if the total sum of all the types equal the damage amount,
|
||||||
|
// assume that they're evenly distributed.
|
||||||
|
if (sum != amount)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var sign = FixedPoint2.Sign(amount);
|
||||||
|
|
||||||
|
if (sign < 0)
|
||||||
|
heals = true;
|
||||||
|
if (sign > 0)
|
||||||
|
deals = true;
|
||||||
|
|
||||||
|
damages.Add(
|
||||||
|
Loc.GetString("health-change-display",
|
||||||
|
("kind", group.ID),
|
||||||
|
("amount", MathF.Abs(amount.Float())),
|
||||||
|
("deltasign", sign)
|
||||||
|
));
|
||||||
|
|
||||||
|
foreach (var type in group.DamageTypes)
|
||||||
|
{
|
||||||
|
damageSpec.DamageDict.Remove(type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var (kind, amount) in damageSpec.DamageDict)
|
||||||
|
{
|
||||||
|
var sign = FixedPoint2.Sign(amount);
|
||||||
|
|
||||||
if (sign < 0)
|
if (sign < 0)
|
||||||
heals = true;
|
heals = true;
|
||||||
@@ -71,7 +115,7 @@ namespace Content.Server.Chemistry.ReagentEffects
|
|||||||
var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
|
var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
|
||||||
scale *= args.Scale;
|
scale *= args.Scale;
|
||||||
|
|
||||||
EntitySystem.Get<DamageableSystem>().TryChangeDamage(args.SolutionEntity, Damage * scale, IgnoreResistances);
|
args.EntityManager.System<DamageableSystem>().TryChangeDamage(args.SolutionEntity, Damage * scale, IgnoreResistances);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -199,6 +199,21 @@ namespace Content.Shared.FixedPoint
|
|||||||
return a > b ? a : b;
|
return a > b ? a : b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static int Sign(FixedPoint2 value)
|
||||||
|
{
|
||||||
|
if (value < Zero)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value > Zero)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
public static FixedPoint2 Abs(FixedPoint2 a)
|
public static FixedPoint2 Abs(FixedPoint2 a)
|
||||||
{
|
{
|
||||||
return FixedPoint2.New(Math.Abs(a.Value));
|
return FixedPoint2.New(Math.Abs(a.Value));
|
||||||
|
|||||||
Reference in New Issue
Block a user