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

EntityEffectConditions changed to be inclusive of min/max (#36289)

Browse Source 
* soo hungry going back for more lipolicide

* too much lipolicide.....

* fixes

* it moved

* typo

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
This commit is contained in:
āda
2025-07-30 01:44:46 -05:00
committed by GitHub
parent 2f64e105d4
commit f6475bd264
4 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/EntityEffects/EntityEffectSystem.cs
View File

@@ -133,7 +133,7 @@ public sealed class EntityEffectSystem : EntitySystem
args.Result = false; args.Result = false;
if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp)) if (TryComp(args.Args.TargetEntity, out TemperatureComponent? temp))
{ {
if (temp.CurrentTemperature > args.Condition.Min && temp.CurrentTemperature < args.Condition.Max) if (temp.CurrentTemperature >= args.Condition.Min && temp.CurrentTemperature <= args.Condition.Max)
args.Result = true; args.Result = true;
} }
} }

11
Content.Shared/EntityEffects/EffectConditions/SolutionTemperature.cs
View File

@@ -13,17 +13,14 @@ public sealed partial class SolutionTemperature : EntityEffectCondition
[DataField] [DataField]
public float Max = float.PositiveInfinity; public float Max = float.PositiveInfinity;
public override bool Condition(EntityEffectBaseArgs args) public override bool Condition(EntityEffectBaseArgs args)
{ {
if (args is EntityEffectReagentArgs reagentArgs) if (args is EntityEffectReagentArgs reagentArgs)
{ {
if (reagentArgs.Source == null) return reagentArgs?.Source != null &&
return false; reagentArgs.Source.Temperature >= Min &&
if (reagentArgs.Source.Temperature < Min) reagentArgs.Source.Temperature <= Max;
return false;
if (reagentArgs.Source.Temperature > Max)
return false;
return true;
} }
// TODO: Someone needs to figure out how to do this for non-reagent effects. // TODO: Someone needs to figure out how to do this for non-reagent effects.

3
Content.Shared/EntityEffects/EffectConditions/TotalDamage.cs
View File

@@ -18,8 +18,7 @@ public sealed partial class TotalDamage : EntityEffectCondition
if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage)) if (args.EntityManager.TryGetComponent(args.TargetEntity, out DamageableComponent? damage))
{ {
var total = damage.TotalDamage; var total = damage.TotalDamage;
if (total > Min && total < Max) return total >= Min && total <= Max;
return true;
} }
return false; return false;

3
Content.Shared/EntityEffects/EffectConditions/TotalHunger.cs
View File

@@ -18,8 +18,7 @@ public sealed partial class Hunger : EntityEffectCondition
if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger)) if (args.EntityManager.TryGetComponent(args.TargetEntity, out HungerComponent? hunger))
{ {
var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger); var total = args.EntityManager.System<HungerSystem>().GetHunger(hunger);
if (total > Min && total < Max) return total >= Min && total <= Max;
return true;
} }
return false; return false;