Entity effects ECS refactor (#40580)
* LOCKED THE FUCK IN * Forgot this little fella * Crying * All entity effects ported, needs cleanup still * Commit * HEHEHEHAW * Shelve for now * fixe * Big * First big chunk of changes * Big if true * Commit * IT BUILDS!!! * Fix LINTER fails * Cleanup * Scale working, cut down on some evil code * Delete old Entity Effects * Accidentally breaking shit by fixing bugs * Fix a bunch of effects not working * Fix reagent thresholds * Update damage * Wait don't change the gas metabolisms A * Cleanup * more fixes * Eh * Misc fixes and jank * Remove two things, add bullshit, change condition to inverted * Remove unused "Shared" system structure * Namespace fix * merge conflicts/cleanup * More fixes * Guidebook text begins * Shelve * Push * More shit to push * Fix * Fix merg conflicts * BLOOD FOR THE BLOOD GOD!!! * Mild cleanup and lists * Fix localization and comments * Shuffle localization around a bit. * All done? * Nearly everything * Is this the end? * Whoops forgot to remove that TODO * Get rid of some warnings for good measure... * It's done * Should make those virtual in case we want to override them tbqh... * Update Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> * Fix test fails real * Add to codeowners * Documentation to everything * Forgot to push whoops * Standardize Condition names * Fix up metabolism a little as a treat * review * add IsServer checks --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
4d316ae553
commit
4059c29ebc
@@ -0,0 +1,59 @@
|
||||
using Content.Shared.Chemistry.Components.SolutionManager;
|
||||
using Content.Shared.Chemistry.EntitySystems;
|
||||
using Content.Shared.Chemistry.Reagent;
|
||||
using Robust.Shared.Prototypes;
|
||||
|
||||
namespace Content.Shared.EntityEffects.Effects.Solution;
|
||||
|
||||
// TODO: This should be removed and changed to an "AbsorbentSolutionComponent"
|
||||
/// <summary>
|
||||
/// Creates a reagent in a specified solution owned by this entity.
|
||||
/// Quantity is modified by scale.
|
||||
/// </summary>
|
||||
/// <inheritdoc cref="EntityEffectSystem{T,TEffect}"/>
|
||||
public sealed class AddReagentToSolutionEntityEffectSystem : EntityEffectSystem<SolutionContainerManagerComponent, AddReagentToSolution>
|
||||
{
|
||||
[Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!;
|
||||
|
||||
protected override void Effect(Entity<SolutionContainerManagerComponent> entity, ref EntityEffectEvent<AddReagentToSolution> args)
|
||||
{
|
||||
var solution = args.Effect.Solution;
|
||||
var reagent = args.Effect.Reagent;
|
||||
|
||||
if (!_solutionContainer.TryGetSolution((entity, entity), solution, out var solutionContainer))
|
||||
return;
|
||||
|
||||
_solutionContainer.TryAddReagent(solutionContainer.Value, reagent, args.Scale * args.Effect.StrengthModifier);
|
||||
}
|
||||
}
|
||||
|
||||
/// <inheritdoc cref="EntityEffect"/>
|
||||
public sealed partial class AddReagentToSolution : EntityEffectBase<AddReagentToSolution>
|
||||
{
|
||||
/// <summary>
|
||||
/// Prototype of the reagent we're adding.
|
||||
/// </summary>
|
||||
[DataField(required: true)]
|
||||
public ProtoId<ReagentPrototype> Reagent;
|
||||
|
||||
///<summary>
|
||||
/// Solution we're looking for
|
||||
/// </summary>
|
||||
[DataField(required: true)]
|
||||
public string? Solution = "reagents";
|
||||
|
||||
///<summary>
|
||||
/// A modifier for how much reagent we're creating.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public float StrengthModifier = 1.0f;
|
||||
|
||||
public override string? EntityEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
|
||||
{
|
||||
return prototype.Resolve(Reagent, out ReagentPrototype? proto)
|
||||
? Loc.GetString("entity-effect-guidebook-add-to-solution-reaction",
|
||||
("chance", Probability),
|
||||
("reagent", proto.LocalizedName))
|
||||
: null;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user