-
Notifications
You must be signed in to change notification settings - Fork 339
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into Remove-Declaration-Of-War
- Loading branch information
Showing
215 changed files
with
3,519 additions
and
148 deletions.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs
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,11 @@ | ||
namespace Content.Server.Abilities.Felinid; | ||
|
||
[RegisterComponent] | ||
public sealed partial class CoughingUpHairballComponent : Component | ||
{ | ||
[DataField("accumulator")] | ||
public float Accumulator = 0f; | ||
|
||
[DataField("coughUpTime")] | ||
public TimeSpan CoughUpTime = TimeSpan.FromSeconds(2.15); // length of hairball.ogg | ||
} |
26 changes: 26 additions & 0 deletions
26
Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs
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,26 @@ | ||
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; | ||
using Robust.Shared.Prototypes; | ||
using Content.Shared.Actions; | ||
using Robust.Shared.Utility; | ||
|
||
namespace Content.Server.Abilities.Felinid; | ||
|
||
[RegisterComponent] | ||
public sealed partial class FelinidComponent : Component | ||
{ | ||
/// <summary> | ||
/// The hairball prototype to use. | ||
/// </summary> | ||
[DataField("hairballPrototype", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] | ||
public string HairballPrototype = "Hairball"; | ||
|
||
//[DataField("hairballAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))] | ||
//public string HairballAction = "ActionHairball"; | ||
|
||
[DataField("hairballAction")] | ||
public EntityUid? HairballAction = null; | ||
|
||
public EntityUid? EatActionTarget = null; | ||
|
||
public EntityUid? EatAction = null; | ||
} |
5 changes: 5 additions & 0 deletions
5
Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs
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,5 @@ | ||
namespace Content.Server.Abilities.Felinid; | ||
|
||
[RegisterComponent] | ||
public sealed partial class FelinidFoodComponent : Component | ||
{} |
191 changes: 191 additions & 0 deletions
191
Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs
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,191 @@ | ||
using Content.Shared.Actions; | ||
using Content.Shared.Actions.Events; | ||
using Content.Shared.Audio; | ||
using Content.Shared.StatusEffect; | ||
using Content.Shared.Throwing; | ||
using Content.Shared.Item; | ||
using Content.Shared.Inventory; | ||
using Content.Shared.Hands; | ||
using Content.Shared.IdentityManagement; | ||
using Content.Shared.Nutrition.Components; | ||
using Content.Shared.Nutrition.EntitySystems; | ||
using Content.Server.Body.Components; | ||
using Content.Server.Medical; | ||
using Content.Server.Nutrition.EntitySystems; | ||
using Content.Server.Nutrition.Components; | ||
using Content.Server.Chemistry.EntitySystems; | ||
using Content.Server.Popups; | ||
using Robust.Shared.Audio; | ||
using Robust.Shared.Player; | ||
using Robust.Shared.Random; | ||
using Robust.Shared.Prototypes; | ||
|
||
namespace Content.Server.Abilities.Felinid; | ||
|
||
public sealed partial class FelinidSystem : EntitySystem | ||
{ | ||
|
||
[Dependency] private readonly SharedActionsSystem _actionsSystem = default!; | ||
[Dependency] private readonly HungerSystem _hungerSystem = default!; | ||
[Dependency] private readonly VomitSystem _vomitSystem = default!; | ||
[Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; | ||
[Dependency] private readonly IRobustRandom _robustRandom = default!; | ||
[Dependency] private readonly PopupSystem _popupSystem = default!; | ||
[Dependency] private readonly InventorySystem _inventorySystem = default!; | ||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; | ||
|
||
public override void Initialize() | ||
{ | ||
base.Initialize(); | ||
SubscribeLocalEvent<FelinidComponent, ComponentInit>(OnInit); | ||
SubscribeLocalEvent<FelinidComponent, HairballActionEvent>(OnHairball); | ||
SubscribeLocalEvent<FelinidComponent, EatMouseActionEvent>(OnEatMouse); | ||
SubscribeLocalEvent<FelinidComponent, DidEquipHandEvent>(OnEquipped); | ||
SubscribeLocalEvent<FelinidComponent, DidUnequipHandEvent>(OnUnequipped); | ||
SubscribeLocalEvent<HairballComponent, ThrowDoHitEvent>(OnHairballHit); | ||
SubscribeLocalEvent<HairballComponent, GettingPickedUpAttemptEvent>(OnHairballPickupAttempt); | ||
} | ||
|
||
private Queue<EntityUid> RemQueue = new(); | ||
|
||
public override void Update(float frameTime) | ||
{ | ||
base.Update(frameTime); | ||
foreach (var cat in RemQueue) | ||
{ | ||
RemComp<CoughingUpHairballComponent>(cat); | ||
} | ||
RemQueue.Clear(); | ||
|
||
foreach (var (hairballComp, catComp) in EntityQuery<CoughingUpHairballComponent, FelinidComponent>()) | ||
{ | ||
hairballComp.Accumulator += frameTime; | ||
if (hairballComp.Accumulator < hairballComp.CoughUpTime.TotalSeconds) | ||
continue; | ||
|
||
hairballComp.Accumulator = 0; | ||
SpawnHairball(hairballComp.Owner, catComp); | ||
RemQueue.Enqueue(hairballComp.Owner); | ||
} | ||
} | ||
|
||
private void OnInit(EntityUid uid, FelinidComponent component, ComponentInit args) | ||
{ | ||
if (component.HairballAction != null) | ||
return; | ||
|
||
component.HairballAction = Spawn("ActionHairball"); | ||
_actionsSystem.AddAction(uid, component.HairballAction.Value, uid); | ||
} | ||
|
||
private void OnEquipped(EntityUid uid, FelinidComponent component, DidEquipHandEvent args) | ||
{ | ||
if (!HasComp<FelinidFoodComponent>(args.Equipped)) | ||
return; | ||
|
||
component.EatActionTarget = args.Equipped; | ||
|
||
component.EatAction = Spawn("ActionEatMouse"); | ||
_actionsSystem.AddAction(uid, component.EatAction.Value, null); | ||
} | ||
|
||
private void OnUnequipped(EntityUid uid, FelinidComponent component, DidUnequipHandEvent args) | ||
{ | ||
if (args.Unequipped == component.EatActionTarget) | ||
{ | ||
component.EatActionTarget = null; | ||
if (component.EatAction != null) | ||
_actionsSystem.RemoveAction(uid, component.EatAction.Value); | ||
} | ||
} | ||
|
||
private void OnHairball(EntityUid uid, FelinidComponent component, HairballActionEvent args) | ||
{ | ||
if (_inventorySystem.TryGetSlotEntity(uid, "mask", out var maskUid) && | ||
EntityManager.TryGetComponent<IngestionBlockerComponent>(maskUid, out var blocker) && | ||
blocker.Enabled) | ||
{ | ||
_popupSystem.PopupEntity(Loc.GetString("hairball-mask", ("mask", maskUid)), uid, uid); | ||
return; | ||
} | ||
|
||
_popupSystem.PopupEntity(Loc.GetString("hairball-cough", ("name", Identity.Entity(uid, EntityManager))), uid); | ||
SoundSystem.Play("/Audio/Nyanotrasen/Effects/Species/hairball.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); | ||
|
||
EnsureComp<CoughingUpHairballComponent>(uid); | ||
args.Handled = true; | ||
} | ||
|
||
private void OnEatMouse(EntityUid uid, FelinidComponent component, EatMouseActionEvent args) | ||
{ | ||
if (component.EatActionTarget == null) | ||
return; | ||
|
||
if (!TryComp<HungerComponent>(uid, out var hunger)) | ||
return; | ||
|
||
if (hunger.CurrentThreshold == Shared.Nutrition.Components.HungerThreshold.Overfed) | ||
{ | ||
_popupSystem.PopupEntity(Loc.GetString("food-system-you-cannot-eat-any-more"), uid, uid, Shared.Popups.PopupType.SmallCaution); | ||
return; | ||
} | ||
|
||
if (_inventorySystem.TryGetSlotEntity(uid, "mask", out var maskUid) && | ||
EntityManager.TryGetComponent<IngestionBlockerComponent>(maskUid, out var blocker) && | ||
blocker.Enabled) | ||
{ | ||
_popupSystem.PopupEntity(Loc.GetString("hairball-mask", ("mask", maskUid)), uid, uid, Shared.Popups.PopupType.SmallCaution); | ||
return; | ||
} | ||
|
||
if (component.HairballAction != null) | ||
{ | ||
_actionsSystem.SetCharges(component.HairballAction, 1); // You get the charge back and that's it. Tough. | ||
_actionsSystem.SetEnabled(component.HairballAction, true); | ||
} | ||
Del(component.EatActionTarget.Value); | ||
component.EatActionTarget = null; | ||
|
||
SoundSystem.Play("/Audio/Items/eatfood.ogg", Filter.Pvs(uid), uid, AudioHelpers.WithVariation(0.15f)); | ||
|
||
_hungerSystem.ModifyHunger(uid, 50f, hunger); | ||
|
||
if (component.EatAction != null) | ||
_actionsSystem.RemoveAction(uid, component.EatAction.Value); | ||
} | ||
|
||
private void SpawnHairball(EntityUid uid, FelinidComponent component) | ||
{ | ||
var hairball = EntityManager.SpawnEntity(component.HairballPrototype, Transform(uid).Coordinates); | ||
var hairballComp = Comp<HairballComponent>(hairball); | ||
|
||
if (TryComp<BloodstreamComponent>(uid, out var bloodstream)) | ||
{ | ||
var temp = bloodstream.ChemicalSolution.SplitSolution(20); | ||
|
||
if (_solutionSystem.TryGetSolution(hairball, hairballComp.SolutionName, out var hairballSolution)) | ||
{ | ||
_solutionSystem.TryAddSolution(hairball, hairballSolution, temp); | ||
} | ||
} | ||
} | ||
private void OnHairballHit(EntityUid uid, HairballComponent component, ThrowDoHitEvent args) | ||
{ | ||
if (HasComp<FelinidComponent>(args.Target) || !HasComp<StatusEffectsComponent>(args.Target)) | ||
return; | ||
if (_robustRandom.Prob(0.2f)) | ||
_vomitSystem.Vomit(args.Target); | ||
} | ||
|
||
private void OnHairballPickupAttempt(EntityUid uid, HairballComponent component, GettingPickedUpAttemptEvent args) | ||
{ | ||
if (HasComp<FelinidComponent>(args.User) || !HasComp<StatusEffectsComponent>(args.User)) | ||
return; | ||
|
||
if (_robustRandom.Prob(0.2f)) | ||
{ | ||
_vomitSystem.Vomit(args.User); | ||
args.Cancel(); | ||
} | ||
} | ||
} |
7 changes: 7 additions & 0 deletions
7
Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs
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,7 @@ | ||
namespace Content.Server.Abilities.Felinid; | ||
|
||
[RegisterComponent] | ||
public sealed partial class HairballComponent : Component | ||
{ | ||
public string SolutionName = "hairball"; | ||
} |
15 changes: 15 additions & 0 deletions
15
Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs
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,15 @@ | ||
|
||
namespace Content.Server.Item.PseudoItem; | ||
|
||
/// <summary> | ||
/// For entities that behave like an item under certain conditions, | ||
/// but not under most conditions. | ||
/// </summary> | ||
[RegisterComponent] | ||
public sealed partial class PseudoItemComponent : Component | ||
{ | ||
[DataField("size")] | ||
public int Size = 120; | ||
|
||
public bool Active = false; | ||
} |
Oops, something went wrong.