Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Transform sting nerf (#269)

Browse Source 
* - add: 10 minutes of suffering.

* - fix: No monkey evolution.

* - fix: Remove Absorb on rejuvenate.

* - tweak: Less thick armor.

* - fix: Transfer uncloneable on transform.
This commit is contained in:
Aviu00
2024-04-04 22:45:03 +09:00
committed by GitHub
parent 4938553945
commit e3ee4a8d3b
6 changed files with 116 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
Content.Server/Changeling/ChangelingSystem.Abilities.cs
View File

@@ -424,7 +424,19 @@ public sealed partial class ChangelingSystem
_pullingSystem.TryStopPull(pullable);
}
TransformPerson(target, humanData);
var oldData = CompOrNull<TransformStungComponent>(target)?.OriginalHumanoidData;
var transformed = TransformPerson(target, humanData);
if (transformed != null)
{
oldData ??= GetHumanoidData(target);
if (oldData != null)
{
var transformStung = EnsureComp<TransformStungComponent>(transformed.Value);
transformStung.OriginalHumanoidData = oldData.Value;
}
}
_ui.CloseUi(bui, actorComponent.PlayerSession);
@@ -889,19 +901,9 @@ public sealed partial class ChangelingSystem
private void CopyHumanoidData(EntityUid uid, EntityUid target, ChangelingComponent component)
{
if (!TryComp<MetaDataComponent>(target, out var targetMeta))
return;
var data = GetHumanoidData(target, component);
if (!TryComp<HumanoidAppearanceComponent>(target, out var targetAppearance))
return;
if (!TryComp<DnaComponent>(target, out var targetDna))
return;
if (!TryPrototype(target, out var prototype, targetMeta))
return;
if (component.AbsorbedEntities.ContainsKey(targetDna.DNA))
if (data == null)
return;
/*if (component.AbsorbedEntities.Count == 7)
@@ -909,6 +911,28 @@ public sealed partial class ChangelingSystem
component.AbsorbedEntities.Remove(component.AbsorbedEntities.ElementAt(2).Key);
}*/
component.AbsorbedEntities.Add(data.Value.Dna, data.Value);
Dirty(uid, component);
}
public HumanoidData? GetHumanoidData(EntityUid target, ChangelingComponent? absorberComponent = null)
{
if (!TryComp<MetaDataComponent>(target, out var targetMeta))
return null;
if (!TryComp<HumanoidAppearanceComponent>(target, out var targetAppearance))
return null;
if (!TryComp<DnaComponent>(target, out var targetDna))
return null;
if (!TryPrototype(target, out var prototype, targetMeta))
return null;
if (absorberComponent != null && absorberComponent.AbsorbedEntities.ContainsKey(targetDna.DNA))
return null;
var appearance = _serializationManager.CreateCopy(targetAppearance, notNullableOverride: true);
var meta = _serializationManager.CreateCopy(targetMeta, notNullableOverride: true);
@@ -916,16 +940,14 @@ public sealed partial class ChangelingSystem
? Loc.GetString("changeling-unknown-creature")
: meta.EntityName;
component.AbsorbedEntities.Add(targetDna.DNA, new HumanoidData
return new HumanoidData
{
EntityPrototype = prototype,
MetaDataComponent = meta,
AppearanceComponent = appearance,
Name = name,
Dna = targetDna.DNA
});
Dirty(uid, component);
};
}
/// <summary>
@@ -935,7 +957,7 @@ public sealed partial class ChangelingSystem
/// <param name="transformData">Transform data</param>
/// <param name="humanoidOverride">Override first check on HumanoidAppearanceComponent</param>
/// <returns>Id of the transformed entity</returns>
private EntityUid? TransformPerson(EntityUid target, HumanoidData transformData, bool humanoidOverride = false)
public EntityUid? TransformPerson(EntityUid target, HumanoidData transformData, bool humanoidOverride = false)
{
if (!HasComp<HumanoidAppearanceComponent>(target) && !humanoidOverride)
return null;
@@ -1005,6 +1027,9 @@ public sealed partial class ChangelingSystem
if (HasComp<AbsorbedComponent>(from))
EnsureComp<AbsorbedComponent>(to);
if (HasComp<UncloneableComponent>(from))
EnsureComp<UncloneableComponent>(to);
if (HasComp<BibleUserComponent>(from))
EnsureComp<BibleUserComponent>(to);