juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn ReagentEffects into generic EntityEffects (#28168)

Browse Source 
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
This commit is contained in:
SlamBamActionman
2024-06-30 05:43:43 +02:00
committed by GitHub
parent 250109f0b4
commit b9fa941ca6
127 changed files with 2199 additions and 1978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/GuideGenerator/ChemistryJsonGenerator.cs
View File

@@ -5,6 +5,7 @@ using System.Text.Json.Serialization;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Damage;
using Content.Shared.EntityEffects;
using Content.Shared.FixedPoint;
using Robust.Shared.Prototypes;
@@ -40,8 +41,8 @@ public sealed class ChemistryJsonGenerator
WriteIndented = true,
Converters =
{
new UniversalJsonConverter<ReagentEffect>(),
new UniversalJsonConverter<ReagentEffectCondition>(),
new UniversalJsonConverter<EntityEffect>(),
new UniversalJsonConverter<EntityEffectCondition>(),
new UniversalJsonConverter<ReagentEffectsEntry>(),
new UniversalJsonConverter<DamageSpecifier>(),
new FixedPointJsonConverter()

4
Content.Server/GuideGenerator/ReactionJsonGenerator.cs
View File

@@ -2,7 +2,7 @@ using System.IO;
using System.Linq;
using System.Text.Json;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.EntityEffects;
using Robust.Shared.Prototypes;
namespace Content.Server.GuideGenerator;
@@ -24,7 +24,7 @@ public sealed class ReactionJsonGenerator
WriteIndented = true,
Converters =
{
new UniversalJsonConverter<ReagentEffect>(),
new UniversalJsonConverter<EntityEffect>(),
}
};

3
Content.Server/GuideGenerator/ReagentEntry.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Body.Components;
using Content.Shared.Body.Prototypes;
using Content.Shared.Chemistry.Reaction;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.EntityEffects;
using Robust.Shared.Prototypes;
namespace Content.Server.GuideGenerator;
@@ -61,7 +62,7 @@ public sealed class ReactionEntry
public Dictionary<string, float> Products { get; }
[JsonPropertyName("effects")]
public List<ReagentEffect> Effects { get; }
public List<EntityEffect> Effects { get; }
public ReactionEntry(ReactionPrototype proto)
{