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

Magic vision nerf (#1697)

Browse Source 
* Update ShowHealthBarsComponent.cs

* mana split now can destroy mana trace

* delete aura examine

* Add aura confusion status effect and concealment reagent

Introduces the Confused Aura status effect, which causes entities to leave randomized magical aura imprints. Adds the CP14HideMagicAuraStatusEffectComponent, new localization strings, alert, and reagent (Aura concealment solution) that applies the effect. Updates magic vision logic to support the new effect, and adds related icons and prototype definitions.

* vampire market

* easy vampire clothing craft

* obscure magic trace
This commit is contained in:
Red
2025-08-23 15:03:33 +03:00
committed by GitHub
parent 5699b4a7a0
commit 9bda0c85e2
30 changed files with 258 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
Content.Shared/_CP14/MagicVision/CP14SharedMagicVisionSystem.cs
View File

@@ -1,7 +1,10 @@
using System.Linq;
using System.Text;
using Content.Shared._CP14.AuraDNA;
using Content.Shared._CP14.MagicVision.Components;
using Content.Shared.Actions;
using Content.Shared.Examine;
using Content.Shared.StatusEffectNew;
using Robust.Shared.Map;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
@@ -15,6 +18,7 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly MetaDataSystem _meta = default!;
[Dependency] private readonly INetManager _net = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffects = default!;
public readonly EntProtoId MagicTraceProto = "CP14MagicVisionMarker";
@@ -23,15 +27,6 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
base.Initialize();
SubscribeLocalEvent<CP14MagicVisionMarkerComponent, ExaminedEvent>(OnExamined);
SubscribeLocalEvent<CP14AuraImprintComponent, ExaminedEvent>(OnAuraHolderExamine);
}
private void OnAuraHolderExamine(Entity<CP14AuraImprintComponent> ent, ref ExaminedEvent args)
{
if (!HasComp<CP14MagicVisionComponent>(args.Examiner))
return;
args.PushMarkup($"{Loc.GetString("cp14-magic-vision-aura")} {ent.Comp.Imprint}");
}
protected virtual void OnExamined(Entity<CP14MagicVisionMarkerComponent> ent, ref ExaminedEvent args)
@@ -39,16 +34,85 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
var sb = new StringBuilder();
var timePassed = _timing.CurTime - ent.Comp.SpawnTime;
sb.Append($"{Loc.GetString("cp14-magic-vision-timed-past")} {timePassed.Minutes}:{(timePassed.Seconds < 10 ? "0" : "")}{timePassed.Seconds}\n");
var timeRemaining = ent.Comp.EndTime - _timing.CurTime;
var totalDuration = ent.Comp.EndTime - ent.Comp.SpawnTime;
if (ent.Comp.AuraImprint is not null)
sb.Append($"{Loc.GetString("cp14-magic-vision-timed-past")} {timePassed.Minutes}:{timePassed.Seconds:D2}\n");
if (string.IsNullOrEmpty(ent.Comp.AuraImprint))
{
sb.Append($"{Loc.GetString("cp14-magic-vision-aura")} {ent.Comp.AuraImprint}");
args.AddMarkup(sb.ToString());
return;
}
var imprint = ent.Comp.AuraImprint;
// Try to extract the content between [color=...] and [/color]
var startTag = imprint.IndexOf(']') + 1;
var endTag = imprint.LastIndexOf('[');
if (startTag <= 0 || endTag <= startTag)
{
sb.Append($"{Loc.GetString("cp14-magic-vision-aura")} {imprint}");
args.AddMarkup(sb.ToString());
return;
}
var content = imprint[startTag..endTag];
var obscuredContent = new StringBuilder(content.Length);
// Progress goes from 0 (fresh) to 1 (completely faded)
var progress = Math.Clamp(1.0 - (timeRemaining.TotalSeconds / totalDuration.TotalSeconds), 0.0, 1.0);
// Number of characters to obscure
var charsToObscure = (int)Math.Round(content.Length * progress);
// Deterministic pseudo-random based on content + entity id
var hash = (content + ent.Owner.Id).GetHashCode();
var obscuredCount = 0;
for (var i = 0; i < content.Length; i++)
{
// Pick bits from hash + index to ensure distribution
var mask = ((hash >> (i % 32)) ^ i) & 1;
var shouldObscure = obscuredCount < charsToObscure && mask == 1;
obscuredContent.Append(shouldObscure ? '~' : content[i]);
if (shouldObscure)
obscuredCount++;
}
// If we still didn't obscure enough (due to unlucky bit pattern), obscure remaining from the start
while (obscuredCount < charsToObscure && obscuredCount < obscuredContent.Length)
{
for (var i = 0; i < obscuredContent.Length && obscuredCount < charsToObscure; i++)
{
if (obscuredContent[i] != '~')
{
obscuredContent[i] = '~';
obscuredCount++;
}
}
}
var obscuredImprint = imprint.Substring(0, startTag) + obscuredContent + imprint.Substring(endTag);
sb.Append($"{Loc.GetString("cp14-magic-vision-aura")} {obscuredImprint}");
args.AddMarkup(sb.ToString());
}
public string? GetAuraImprint(Entity<CP14AuraImprintComponent?> ent)
{
if (!Resolve(ent, ref ent.Comp))
return null;
if (_statusEffects.TryEffectsWithComp<CP14HideMagicAuraStatusEffectComponent>(ent, out var hideComps))
{
return hideComps.First().Comp1.Imprint;
}
return ent.Comp.Imprint;
}
/// <summary>
/// Creates an invisible “magical trace” entity that can be seen with magical vision.
/// </summary>
@@ -58,7 +122,12 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
/// <param name="duration">Duration of the magical trace</param>
/// <param name="target">Optional: The direction in which this trace “faces.” When studying the trace,
/// this direction can be seen in order to understand, for example, in which direction the spell was used.</param>
public void SpawnMagicVision(EntityCoordinates position, SpriteSpecifier? icon, string description, TimeSpan duration, EntityUid? aura = null, EntityCoordinates? target = null)
public void SpawnMagicTrace(EntityCoordinates position,
SpriteSpecifier? icon,
string description,
TimeSpan duration,
EntityUid? aura = null,
EntityCoordinates? target = null)
{
if (_net.IsClient)
return;
@@ -71,10 +140,8 @@ public abstract class CP14SharedMagicVisionSystem : EntitySystem
markerComp.TargetCoordinates = target;
markerComp.Icon = icon;
if (aura is not null && TryComp<CP14AuraImprintComponent>(aura, out var auraImprint))
{
markerComp.AuraImprint = auraImprint.Imprint;
}
if (aura is not null)
markerComp.AuraImprint = GetAuraImprint(aura.Value);
_meta.SetEntityDescription(ent, description);