forked from ekrixi-14/ekrixi
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Basic wounds functionality * Wounds examination * remove height bar * remove this too * Treatment code * Wounds work all fine and dandy * Tool quality checker * Singleton wounds * Change tools * Split treatment paths from struct to class * Wound thresholds and damage specifiers * Buff surgical tools * Wounds are done * Buff VIE * fix tests??
- Loading branch information
1 parent
324069a
commit 7b59a3d
Showing
20 changed files
with
845 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| namespace Content.Server._FTL.Wounds; | ||
|
|
||
| [RegisterComponent] | ||
| public sealed partial class WoundThresholdComponent : Component | ||
| { | ||
| [DataField("thresholds")] | ||
| public List<WoundThreshold> Thresholds = new(); | ||
|
|
||
| public float TimeSinceLastUpdate = 0; | ||
| } | ||
|
|
||
| [DataDefinition] | ||
| public partial record struct WoundThreshold | ||
| { | ||
| [DataField, ViewVariables] public string Wound; | ||
| [DataField, ViewVariables] public string DamageType; | ||
| [DataField, ViewVariables] public float Probability; | ||
| [DataField, ViewVariables] public float Threshold; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,223 @@ | ||
| using Content.Server.DoAfter; | ||
| using Content.Server.Popups; | ||
| using Content.Server.Tools; | ||
| using Content.Shared._FTL.Wounds; | ||
| using Content.Shared.Damage; | ||
| using Content.Shared.DoAfter; | ||
| using Content.Shared.Popups; | ||
| using Content.Shared.Tools; | ||
| using Content.Shared.Tools.Components; | ||
| using Content.Shared.Verbs; | ||
| using Robust.Server.GameObjects; | ||
| using Robust.Shared.Player; | ||
| using Robust.Shared.Prototypes; | ||
| using Robust.Shared.Random; | ||
| using Robust.Shared.Serialization; | ||
|
|
||
| namespace Content.Server._FTL.Wounds; | ||
|
|
||
| /// <summary> | ||
| /// This handles the treating of wounds. | ||
| /// </summary> | ||
| /// <remarks> | ||
| /// This is a shitty work around because putting this code in shared doesn't let me delete the entities. | ||
| /// </remarks> | ||
| public sealed class WoundTreatmentSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly IPrototypeManager _prototypeManager = default!; | ||
| [Dependency] private readonly DamageableSystem _damageableSystem = default!; | ||
| [Dependency] private readonly SharedWoundsSystem _woundsSystem = default!; | ||
| [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; | ||
| [Dependency] private readonly AudioSystem _audioSystem = default!; | ||
| [Dependency] private readonly PopupSystem _popupSystem = default!; | ||
| [Dependency] private readonly IEntityManager _entMan = default!; | ||
| [Dependency] private readonly IRobustRandom _random = default!; | ||
|
|
||
| /// <inheritdoc/> | ||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<WoundsHolderComponent, GetVerbsEvent<AlternativeVerb>>(AddTreatVerb); | ||
| SubscribeLocalEvent<WoundsHolderComponent, WoundTreatmentDoAfterEvent>(OnDoAfter); | ||
| } | ||
|
|
||
| private void OnDoAfter(EntityUid uid, WoundsHolderComponent component, WoundTreatmentDoAfterEvent args) | ||
| { | ||
| if (args.Cancelled) | ||
| return; | ||
|
|
||
| var currentWoundEntity = _entMan.GetEntity(args.Entity); | ||
| var user = args.Args.User; | ||
| var woundHolder = _entMan.GetEntity(args.WoundHolder); | ||
|
|
||
| if (args.Handled) | ||
| return; | ||
|
|
||
| if (!TryComp<DamageableComponent>(woundHolder, out var damageable)) | ||
| return; | ||
|
|
||
| var currentWound = EnsureComp<WoundComponent>(currentWoundEntity); | ||
|
|
||
| // If the current treatment path is more than the treatment paths available | ||
| // We know the last treatment path is performed, so remove the wound | ||
| if (currentWound.CurrentTreatmentPath < currentWound.TreatmentPaths.Count) | ||
| { | ||
| var currentPath = currentWound.TreatmentPaths[currentWound.CurrentTreatmentPath]; | ||
| if ((currentWound.CurrentTreatmentPath - 1) > 0) | ||
| { | ||
| var prevPath = currentWound.TreatmentPaths[currentWound.CurrentTreatmentPath - 1]; | ||
| prevPath.OnTreatmentEnd(_entMan); | ||
| } | ||
|
|
||
| var endedMsgUser = Loc.GetString(currentPath.EndedMessage); | ||
| var endedMsgOther = Loc.GetString(currentPath.EndedMessage + "-other", ("target", woundHolder)); | ||
|
|
||
| // Actually increment it here since we're finished | ||
| currentWound.CurrentTreatmentPath += 1; | ||
| Dirty(currentWoundEntity, currentWound); | ||
|
|
||
| if (currentWound.CurrentTreatmentPath < currentWound.TreatmentPaths.Count) | ||
| { | ||
| _popupSystem.PopupEntity(endedMsgUser, woundHolder, user); | ||
| _popupSystem.PopupEntity(endedMsgOther, woundHolder, Filter.PvsExcept(user), true); | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| _popupSystem.PopupEntity(Loc.GetString("popup-wound-cured", ("target", uid), ("woundName", MetaData(currentWoundEntity).EntityName)), uid); | ||
| QueueDel(currentWoundEntity); | ||
| _damageableSystem.DamageChanged(uid, damageable); | ||
| } | ||
|
|
||
| public override void Update(float frameTime) | ||
| { | ||
| base.Update(frameTime); | ||
|
|
||
| var query = EntityQueryEnumerator<WoundThresholdComponent, WoundsHolderComponent, DamageableComponent>(); | ||
| while (query.MoveNext(out var entity, out var thresholdComponent, out var woundsHolderComponent, out var damageableComponent)) | ||
| { | ||
| thresholdComponent.TimeSinceLastUpdate += frameTime; | ||
|
|
||
| if (thresholdComponent.TimeSinceLastUpdate < 5) | ||
| continue; // run this every 5 seconds | ||
|
|
||
| thresholdComponent.TimeSinceLastUpdate = 0; | ||
|
|
||
| foreach (var threshold in thresholdComponent.Thresholds) | ||
| { | ||
| if (!damageableComponent.Damage.DamageDict.TryGetValue(threshold.DamageType, out var damageAmount)) | ||
| continue; | ||
|
|
||
| if (damageAmount < threshold.Threshold) | ||
| continue; | ||
|
|
||
| if (!_random.Prob(threshold.Probability)) | ||
| continue; | ||
|
|
||
| _woundsSystem.TryAddWound(threshold.Wound, entity, woundsHolderComponent); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void AddTreatVerb(EntityUid uid, WoundsHolderComponent component, GetVerbsEvent<AlternativeVerb> args) | ||
| { | ||
| if (!args.CanInteract) | ||
| return; | ||
|
|
||
| if (component.Wounds.ContainedEntities.Count <= 0) | ||
| return; // why show a treat menu when theres nothing to treat | ||
|
|
||
| for (var i = 0; i < component.Wounds.ContainedEntities.Count; i++) | ||
| { | ||
| var wound = component.Wounds.ContainedEntities[i]; | ||
|
|
||
| if (!TryComp<WoundComponent>(wound, out _)) | ||
| return; | ||
|
|
||
| var meta = MetaData(wound); | ||
|
|
||
| var i1 = i; | ||
| args.Verbs.Add(new AlternativeVerb | ||
| { | ||
| Text = $"{meta.EntityName}", | ||
| Act = () => | ||
| { | ||
| component.CurrentWoundTreating = i1; | ||
| }, | ||
| Disabled = i == component.CurrentWoundTreating, | ||
| Category = VerbCategory.SelectWound | ||
| }); | ||
| } | ||
|
|
||
| // Hamlet? From Don't Starve Hamlet (DLC?) | ||
| // gardeners are RUINING ss14 | ||
| // i do not want to hear it... EVER | ||
| // -flare | ||
|
|
||
| // Get the currently selected wound | ||
| var currentWoundEntity = component.Wounds.ContainedEntities[component.CurrentWoundTreating]; | ||
| if (!TryComp<WoundComponent>(currentWoundEntity, out var currentWound)) | ||
| return; // If it doesnt have a wound comp wtf is it doing here??? | ||
|
|
||
| // Get the current treatment path | ||
| var currentPath = currentWound.TreatmentPaths[currentWound.CurrentTreatmentPath]; | ||
|
|
||
| if (args.Hands == null) | ||
| { | ||
| _popupSystem.PopupClient(Loc.GetString("popup-wound-need-hand"), uid, args.User); | ||
| return; // you need hands | ||
| } | ||
|
|
||
| if (args.Hands.ActiveHand == null) | ||
| { | ||
| _popupSystem.PopupClient(Loc.GetString("popup-wound-need-hand"), uid, args.User); | ||
| return; // you need A hand at least | ||
| } | ||
|
|
||
| var quality = _prototypeManager.Index<ToolQualityPrototype>(currentPath.ToolQuality.Id); | ||
|
|
||
| args.Verbs.Add(new AlternativeVerb | ||
| { | ||
| Text = currentPath.GetVerbText(currentWound), | ||
| Act = () => | ||
| { | ||
| var currentlyHeld = args.Hands?.ActiveHand?.HeldEntity; | ||
| if (!currentlyHeld.HasValue) | ||
| return; | ||
| if (!currentPath.TreatmentCheck(_entMan, _entMan.GetNetEntity(currentlyHeld.Value))) | ||
| { | ||
| _popupSystem.PopupEntity(Loc.GetString("popup-wound-need-item", ("item", Loc.GetString(quality.Name))), uid); | ||
| return; | ||
| } | ||
| var tool = EnsureComp<ToolComponent>(currentlyHeld.Value); | ||
| _audioSystem.PlayPvs(currentWound.TreatmentPaths[currentWound.CurrentTreatmentPath].TreatmentSound, uid); | ||
| var startedMsgUser = Loc.GetString(currentPath.BeganMessage); | ||
| var startedMsgOther = Loc.GetString(currentPath.BeganMessage + "-other", ("target", args.User)); | ||
| _popupSystem.PopupEntity(startedMsgUser, uid, args.User); | ||
| _popupSystem.PopupEntity(startedMsgOther, uid, Filter.PvsExcept(args.User), true); | ||
| var ev = new WoundTreatmentDoAfterEvent( | ||
| _entMan.GetNetEntity(currentWoundEntity), | ||
| _entMan.GetNetEntity(uid) | ||
| ); | ||
| _doAfterSystem.TryStartDoAfter(new DoAfterArgs(_entMan, args.User, TimeSpan.FromSeconds(currentPath.TreatmentLength * tool.SpeedModifier), ev, uid) | ||
| { | ||
| BreakOnHandChange = true, | ||
| BreakOnDamage = true, | ||
| BreakOnWeightlessMove = true, | ||
| //BreakOnTargetMove = true, // idk why upstream doesnt allow this | ||
| BreakOnUserMove = true, | ||
| NeedHand = true | ||
| }); | ||
| } | ||
| }); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.