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

Magic types, magic clothing (#539)

Browse Source 
* magic types + auto magic spell description

* manacost calculation event

* manacost ffect clothing

* Update orbs.yml

* magic type not required
This commit is contained in:
Ed
2024-11-06 08:44:03 +03:00
committed by GitHub
parent b5df675187
commit a9bdab0705
29 changed files with 339 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs
View File

@@ -1,3 +1,4 @@
using System.Text;
using Content.Shared._CP14.MagicEnergy;
using Content.Shared._CP14.MagicEnergy.Components;
using Content.Shared._CP14.MagicSpell.Components;
@@ -8,6 +9,7 @@ using Content.Shared.Hands.Components;
using Content.Shared.Popups;
using Content.Shared.Speech.Muting;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
namespace Content.Shared._CP14.MagicSpell;
@@ -22,11 +24,14 @@ public partial class CP14SharedMagicSystem : EntitySystem
[Dependency] private readonly SharedCP14MagicEnergySystem _magicEnergy = default!;
[Dependency] private readonly SharedPopupSystem _popup = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly MetaDataSystem _meta = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<CP14MagicEffectComponent, MapInitEvent>(OnMagicEffectInit);
SubscribeLocalEvent<CP14MagicEffectComponent, CP14BeforeCastMagicEffectEvent>(OnBeforeCastMagicEffect);
SubscribeLocalEvent<CP14DelayedInstantActionEvent>(OnInstantAction);
@@ -43,22 +48,48 @@ public partial class CP14SharedMagicSystem : EntitySystem
SubscribeLocalEvent<CP14MagicEffectComponent, CP14AfterCastMagicEffectEvent>(OnAfterCastMagicEffect);
}
private void OnMagicEffectInit(Entity<CP14MagicEffectComponent> ent, ref MapInitEvent args)
{
var meta = MetaData(ent);
var sb = new StringBuilder();
sb.Append(meta.EntityDescription);
sb.Append($"\n\n {Loc.GetString("cp14-magic-manacost")}: [color=#5da9e8]{ent.Comp.ManaCost}[/color]");
if (_proto.TryIndex(ent.Comp.MagicType, out var indexedMagic))
{
sb.Append($"\n {Loc.GetString("cp14-magic-magic-type")}: [color={indexedMagic.Color.ToHex()}]{Loc.GetString(indexedMagic.Name)}[/color]");
}
_meta.SetEntityDescription(ent, sb.ToString());
}
private void OnBeforeCastMagicEffect(Entity<CP14MagicEffectComponent> ent, ref CP14BeforeCastMagicEffectEvent args)
{
if (!TryComp<CP14MagicEnergyContainerComponent>(args.Performer, out var magicContainer))
if (!TryComp<CP14MagicEnergyContainerComponent>(args.Caster, out var magicContainer))
{
args.Cancel();
return;
}
if (!_magicEnergy.HasEnergy(args.Performer, ent.Comp.ManaCost, magicContainer, ent.Comp.Safe))
var manaCost = ent.Comp.ManaCost;
if (ent.Comp.CanModifyManacost)
{
var manaEv = new CP14CalculateManacostEvent(args.Caster, ent.Comp.ManaCost, ent.Comp.MagicType);
RaiseLocalEvent(args.Caster, manaEv);
manaCost = manaEv.GetManacost();
}
if (!_magicEnergy.HasEnergy(args.Caster, manaCost, magicContainer, ent.Comp.Safe))
{
args.PushReason(Loc.GetString("cp14-magic-spell-not-enough-mana"));
args.Cancel();
}
else if(!_magicEnergy.HasEnergy(args.Performer, ent.Comp.ManaCost, magicContainer, true) && _net.IsServer)
else if(!_magicEnergy.HasEnergy(args.Caster, manaCost, magicContainer, true) && _net.IsServer)
{
_popup.PopupEntity(Loc.GetString("cp14-magic-spell-not-enough-mana-cast-warning-"+_random.Next(5)), args.Performer, args.Performer, PopupType.SmallCaution);
_popup.PopupEntity(Loc.GetString("cp14-magic-spell-not-enough-mana-cast-warning-"+_random.Next(5)), args.Caster, args.Caster, PopupType.SmallCaution);
}
}
@@ -119,7 +150,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
BreakOnDamage = delayedEffect.BreakOnDamage,
Hidden = delayedEffect.Hidden,
BlockDuplicate = true,
DistanceThreshold = 100f,
DistanceThreshold = 100f
};
_doAfter.TryStartDoAfter(doAfterEventArgs);
@@ -137,7 +168,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
private void OnDelayedEntityWorldTargetDoAfter(Entity<CP14MagicEffectComponent> ent,
ref CP14DelayedEntityWorldTargetActionDoAfterEvent args)
{
var endEv = new CP14EndCastMagicEffectEvent{Performer = args.User};
var endEv = new CP14EndCastMagicEffectEvent(args.User);
RaiseLocalEvent(ent, ref endEv);
if (args.Cancelled || !_net.IsServer)
@@ -154,13 +185,13 @@ public partial class CP14SharedMagicSystem : EntitySystem
effect.Effect(EntityManager, effectArgs);
}
var ev = new CP14AfterCastMagicEffectEvent {Performer = args.User};
var ev = new CP14AfterCastMagicEffectEvent(args.User);
RaiseLocalEvent(ent, ref ev);
}
private void OnDelayedInstantActionDoAfter(Entity<CP14MagicEffectComponent> ent, ref CP14DelayedInstantActionDoAfterEvent args)
{
var endEv = new CP14EndCastMagicEffectEvent{Performer = args.User};
var endEv = new CP14EndCastMagicEffectEvent(args.User);
RaiseLocalEvent(ent, ref endEv);
if (args.Cancelled || !_net.IsServer)
@@ -171,13 +202,13 @@ public partial class CP14SharedMagicSystem : EntitySystem
effect.Effect(EntityManager, new CP14SpellEffectBaseArgs(args.User, args.User, Transform(args.User).Coordinates));
}
var ev = new CP14AfterCastMagicEffectEvent {Performer = args.User};
var ev = new CP14AfterCastMagicEffectEvent(args.User);
RaiseLocalEvent(ent, ref ev);
}
private void OnSomaticAspectBeforeCast(Entity<CP14MagicEffectSomaticAspectComponent> ent, ref CP14BeforeCastMagicEffectEvent args)
{
if (TryComp<HandsComponent>(args.Performer, out var hands) || hands is not null)
if (TryComp<HandsComponent>(args.Caster, out var hands) || hands is not null)
{
var freeHand = 0;
foreach (var hand in hands.Hands)
@@ -194,7 +225,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
private void OnVerbalAspectBeforeCast(Entity<CP14MagicEffectVerbalAspectComponent> ent, ref CP14BeforeCastMagicEffectEvent args)
{
if (HasComp<MutedComponent>(args.Performer))
if (HasComp<MutedComponent>(args.Caster))
{
args.PushReason(Loc.GetString("cp14-magic-spell-need-verbal-component"));
args.Cancel();
@@ -205,7 +236,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
{
var ev = new CP14VerbalAspectSpeechEvent
{
Performer = args.Performer,
Performer = args.Caster,
Speech = ent.Comp.StartSpeech,
};
RaiseLocalEvent(ent, ref ev);
@@ -220,7 +251,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
var ev = new CP14VerbalAspectSpeechEvent
{
Performer = args.Performer,
Performer = args.Caster,
Speech = ent.Comp.EndSpeech,
};
RaiseLocalEvent(ent, ref ev);
@@ -228,10 +259,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
private bool TryCastSpell(EntityUid spell, EntityUid performer)
{
var ev = new CP14BeforeCastMagicEffectEvent
{
Performer = performer,
};
var ev = new CP14BeforeCastMagicEffectEvent(performer);
RaiseLocalEvent(spell, ref ev);
if (ev.Reason != string.Empty && _net.IsServer)
{
@@ -240,10 +268,7 @@ public partial class CP14SharedMagicSystem : EntitySystem
if (!ev.Cancelled)
{
var evStart = new CP14StartCastMagicEffectEvent()
{
Performer = performer,
};
var evStart = new CP14StartCastMagicEffectEvent(performer);
RaiseLocalEvent(spell, ref evStart);
}
return !ev.Cancelled;
@@ -254,9 +279,19 @@ public partial class CP14SharedMagicSystem : EntitySystem
if (_net.IsClient)
return;
if (!HasComp<CP14MagicEnergyContainerComponent>(args.Performer))
if (!HasComp<CP14MagicEnergyContainerComponent>(args.Caster))
return;
_magicEnergy.TryConsumeEnergy(args.Performer.Value, ent.Comp.ManaCost, safe: ent.Comp.Safe);
var manaCost = ent.Comp.ManaCost;
if (ent.Comp.CanModifyManacost)
{
var manaEv = new CP14CalculateManacostEvent(args.Caster.Value, ent.Comp.ManaCost, ent.Comp.MagicType);
RaiseLocalEvent(args.Caster.Value, manaEv);
manaCost = manaEv.GetManacost();
}
_magicEnergy.TryConsumeEnergy(args.Caster.Value, manaCost, safe: ent.Comp.Safe);
}
}