Bodysystem and damagesystem rework (#1544)
* Things and stuff with grids, unfinished w/ code debug changes.
* Updated submodule and also lost some progress cause I fucked it up xd
* First unfinished draft of the BodySystem. Doesn't compile.
* More changes to make it compile, but still just a framework. Doesn't do anything at the moment.
* Many cleanup changes.
* Revert "Merge branch 'master' of https://github.com/GlassEclipse/space-station-14 into body_system"
This reverts commit ddd4aebbc76cf2a0b7b102f72b93d55a0816c88c, reversing
changes made to 12d0dd752706bdda8879393bd8191a1199a0c978.
* Commit human.yml
* Updated a lot of things to be more classy, more progress overall, etc. etc.
* Latest update with many changes
* Minor changes
* Fixed Travis build bug
* Adds first draft of Body Scanner console, apparently I also forgot to tie Mechanisms into body parts so now a heart just sits in the Torso like a good boy :)
* Commit rest of stuff
* Latest changes
* Latest changes again
* 14 naked cowboys
* Yay!
* Latest changes (probably doesnt compile)
* Surgery!!!!!!!!!~1116y
* Cleaned some stuff up
* More cleanup
* Refactoring of code. Basic surgery path now done.
* Removed readme, has been added to HackMD
* Fixes typo (and thus test errors)
* WIP changes, committing so I can pull latest master changes
* Still working on that god awful merge
* Latest changes
* Latest changes!!
* Beginning of refactor to BoundUserInterface
* Surgery!
* Latest changes - fixes pr change requests and random fixes
* oops
* Fixes bodypart recursion
* Beginning of work on revamping the damage system.
* More latest changes
* Latest changes
* Finished merge
* Commit before removing old healthcode
* Almost done with removing speciescomponent...
* It compiles!!!
* yahoo more work
* Fixes to make it work
* Merge conflict fixes
* Deleting species visualizer was a mistake
* IDE warnings are VERBOTEN
* makes the server not kill itself on startup, some cleanup (#1)
* Namespaces, comments and exception fixes
* Fix conveyor and conveyor switch serialization
SS14 in reactive when
* Move damage, acts and body to shared
Damage cleanup
Comment cleanup
* Rename SpeciesComponent to RotationComponent and cleanup
Damage cleanup
Comment cleanup
* Fix nullable warnings
* Address old reviews
Fix off welder suicide damage type, deathmatch and suspicion
* Fix new test fail with units being able to accept items when unpowered
* Remove RotationComponent, change references to IBodyManagerComponent
* Add a bloodstream to humans
* More cleanups
* Add body conduits, connections, connectors substances and valves
* Revert "Add body conduits, connections, connectors substances and valves"
This reverts commit 9ab0b50e6b15fe98852d7b0836c0cdbf4bd76d20.
* Implement the heart mechanism behavior with the circulatory network
* Added network property to mechanism behaviors
* Changed human organ sprites and added missing ones
* Fix tests
* Add individual body part sprite rendering
* Fix error where dropped mechanisms are not initialized
* Implement client/server body damage
* Make DamageContainer take care of raising events
* Reimplement medical scanner with the new body system
* Improve the medical scanner ui
* Merge conflict fixes
* Fix crash when colliding with something
* Fix microwave suicides and eyes sprite rendering
* Fix nullable reference error
* Fix up surgery client side
* Fix missing using from merge conflict
* Add breathing
*inhale
* Merge conflict fixes
* Fix accumulatedframetime being reset to 0 instead of decreased by the threshold
https://github.com/space-wizards/space-station-14/pull/1617
* Use and add to the new AtmosHelpers
* Fix feet
* Add proper coloring to dropped body parts
* Fix Urist's lungs being too strong
* Merge conflict fixes
* Merge conflict fixes
* Merge conflict fixes
Co-authored-by: GlassEclipse <tsymall5@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2020-08-17 01:42:42 +02:00
|
|
|
|
using Content.Server.GameObjects.Components.Body.Digestive;
|
|
|
|
|
|
using Content.Server.GameObjects.Components.Chemistry;
|
2020-07-23 01:42:09 +02:00
|
|
|
|
using Content.Server.GameObjects.Components.Fluids;
|
2020-08-13 14:40:27 +02:00
|
|
|
|
using Content.Server.GameObjects.EntitySystems;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
using Content.Shared.Audio;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Content.Shared.Chemistry;
|
|
|
|
|
|
using Content.Shared.GameObjects.Components.Nutrition;
|
2020-08-01 17:37:12 +02:00
|
|
|
|
using Content.Shared.GameObjects.EntitySystems;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Content.Shared.Interfaces;
|
2020-07-18 22:51:56 -07:00
|
|
|
|
using Content.Shared.Interfaces.GameObjects.Components;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Robust.Server.GameObjects;
|
2020-04-22 04:23:12 +10:00
|
|
|
|
using Robust.Server.GameObjects.EntitySystems;
|
2020-05-22 16:23:18 -05:00
|
|
|
|
using Robust.Shared.Audio;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Robust.Shared.GameObjects;
|
2020-05-31 12:47:46 -05:00
|
|
|
|
using Robust.Shared.GameObjects.Systems;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Robust.Shared.Interfaces.GameObjects;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
using Robust.Shared.Interfaces.Random;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Robust.Shared.IoC;
|
|
|
|
|
|
using Robust.Shared.Localization;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
using Robust.Shared.Prototypes;
|
|
|
|
|
|
using Robust.Shared.Random;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
using Robust.Shared.Serialization;
|
2020-05-23 02:27:31 -07:00
|
|
|
|
using Robust.Shared.Utility;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
using Robust.Shared.ViewVariables;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
|
|
|
|
|
|
namespace Content.Server.GameObjects.Components.Nutrition
|
|
|
|
|
|
{
|
|
|
|
|
|
[RegisterComponent]
|
2020-05-29 15:50:23 -05:00
|
|
|
|
[ComponentReference(typeof(IAfterInteract))]
|
2020-08-01 17:37:12 +02:00
|
|
|
|
public class DrinkComponent : Component, IUse, IAfterInteract, ISolutionChange, IExamine, ILand
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-08-24 14:10:28 +02:00
|
|
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
|
|
|
|
[Dependency] private readonly IRobustRandom _random = default!;
|
|
|
|
|
|
|
2019-11-12 08:20:03 +11:00
|
|
|
|
public override string Name => "Drink";
|
2020-05-29 15:50:23 -05:00
|
|
|
|
|
2019-11-12 08:20:03 +11:00
|
|
|
|
[ViewVariables]
|
2020-09-09 18:32:31 -04:00
|
|
|
|
private SolutionContainerComponent _contents;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
[ViewVariables]
|
|
|
|
|
|
private string _useSound;
|
|
|
|
|
|
[ViewVariables]
|
2020-05-29 15:50:23 -05:00
|
|
|
|
private bool _defaultToOpened;
|
2020-09-08 13:30:22 +02:00
|
|
|
|
[ViewVariables(VVAccess.ReadWrite)]
|
2020-05-29 15:50:23 -05:00
|
|
|
|
public ReagentUnit TransferAmount { get; private set; } = ReagentUnit.New(2);
|
2020-09-08 13:30:22 +02:00
|
|
|
|
[ViewVariables(VVAccess.ReadWrite)]
|
2020-08-22 20:03:24 +10:00
|
|
|
|
public bool Opened { get; protected set; }
|
2020-05-29 15:50:23 -05:00
|
|
|
|
[ViewVariables]
|
|
|
|
|
|
public bool Empty => _contents.CurrentVolume.Float() <= 0;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
private AppearanceComponent _appearanceComponent;
|
|
|
|
|
|
private string _soundCollection;
|
2020-07-23 01:42:09 +02:00
|
|
|
|
private bool _pressurized;
|
|
|
|
|
|
private string _burstSound;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
|
|
|
|
|
|
public override void ExposeData(ObjectSerializer serializer)
|
|
|
|
|
|
{
|
|
|
|
|
|
base.ExposeData(serializer);
|
2020-07-07 13:19:00 -04:00
|
|
|
|
serializer.DataField(ref _useSound, "useSound", "/Audio/Items/drink.ogg");
|
2020-09-09 18:32:31 -04:00
|
|
|
|
serializer.DataField(ref _defaultToOpened, "isOpen", false); // For things like cups of coffee.
|
|
|
|
|
|
serializer.DataField(ref _soundCollection, "openSounds", "canOpenSounds");
|
|
|
|
|
|
serializer.DataField(ref _pressurized, "pressurized", false);
|
2020-07-23 01:42:09 +02:00
|
|
|
|
serializer.DataField(ref _burstSound, "burstSound", "/Audio/Effects/flash_bang.ogg");
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
public override void Initialize()
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-05-29 15:50:23 -05:00
|
|
|
|
base.Initialize();
|
|
|
|
|
|
Owner.TryGetComponent(out _appearanceComponent);
|
2020-09-09 18:32:31 -04:00
|
|
|
|
|
|
|
|
|
|
if (!Owner.TryGetComponent(out _contents))
|
2020-05-29 15:50:23 -05:00
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
_contents = Owner.AddComponent<SolutionContainerComponent>();
|
2020-05-29 15:50:23 -05:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:32:31 -04:00
|
|
|
|
_contents.Capabilities = SolutionContainerCaps.AddTo | SolutionContainerCaps.RemoveFrom;
|
2020-07-23 01:42:09 +02:00
|
|
|
|
Opened = _defaultToOpened;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
UpdateAppearance();
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
void ISolutionChange.SolutionChanged(SolutionChangeEventArgs eventArgs)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-05-29 15:50:23 -05:00
|
|
|
|
UpdateAppearance();
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
private void UpdateAppearance()
|
|
|
|
|
|
{
|
|
|
|
|
|
_appearanceComponent?.SetData(SharedFoodComponent.FoodVisuals.Visual, _contents.CurrentVolume.Float());
|
|
|
|
|
|
}
|
2020-09-09 18:32:31 -04:00
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
bool IUse.UseEntity(UseEntityEventArgs args)
|
|
|
|
|
|
{
|
2020-07-23 01:42:09 +02:00
|
|
|
|
if (!Opened)
|
2020-05-29 15:50:23 -05:00
|
|
|
|
{
|
|
|
|
|
|
//Do the opening stuff like playing the sounds.
|
|
|
|
|
|
var soundCollection = _prototypeManager.Index<SoundCollectionPrototype>(_soundCollection);
|
|
|
|
|
|
var file = _random.Pick(soundCollection.PickFiles);
|
2020-05-31 12:47:46 -05:00
|
|
|
|
|
2020-06-07 08:55:15 -05:00
|
|
|
|
EntitySystem.Get<AudioSystem>().PlayFromEntity(file, args.User, AudioParams.Default);
|
2020-07-23 01:42:09 +02:00
|
|
|
|
Opened = true;
|
2020-05-29 15:50:23 -05:00
|
|
|
|
return false;
|
|
|
|
|
|
}
|
2020-09-09 18:32:31 -04:00
|
|
|
|
|
|
|
|
|
|
if (_contents.CurrentVolume.Float() <= 0)
|
|
|
|
|
|
{
|
|
|
|
|
|
args.User.PopupMessage(Loc.GetString("{0:theName} is empty!", Owner));
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
return TryUseDrink(args.User);
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
//Force feeding a drink to someone.
|
2020-05-23 17:23:25 +02:00
|
|
|
|
void IAfterInteract.AfterInteract(AfterInteractEventArgs eventArgs)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
TryUseDrink(eventArgs.Target, forced: true);
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-31 19:29:06 +01:00
|
|
|
|
public void Examine(FormattedMessage message, bool inDetailsRange)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-05-31 19:29:06 +01:00
|
|
|
|
if (!Opened || !inDetailsRange)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
|
|
|
|
|
return;
|
|
|
|
|
|
}
|
2020-05-29 15:50:23 -05:00
|
|
|
|
var color = Empty ? "gray" : "yellow";
|
|
|
|
|
|
var openedText = Loc.GetString(Empty ? "Empty" : "Opened");
|
|
|
|
|
|
message.AddMarkup(Loc.GetString("[color={0}]{1}[/color]", color, openedText));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:32:31 -04:00
|
|
|
|
private bool TryUseDrink(IEntity target, bool forced = false)
|
2020-05-29 15:50:23 -05:00
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
if (target == null || !_contents.CanRemoveSolutions)
|
2020-05-29 15:50:23 -05:00
|
|
|
|
{
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
2019-11-12 08:20:03 +11:00
|
|
|
|
|
2020-07-23 01:42:09 +02:00
|
|
|
|
if (!Opened)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
target.PopupMessage(Loc.GetString("Open {0:theName} first!", Owner));
|
2020-07-03 16:26:13 -05:00
|
|
|
|
return false;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
if (_contents.CurrentVolume.Float() <= 0)
|
2019-11-12 08:20:03 +11:00
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
if (!forced)
|
|
|
|
|
|
{
|
|
|
|
|
|
target.PopupMessage(Loc.GetString("{0:theName} is empty!", Owner));
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
return false;
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
2020-05-29 15:50:23 -05:00
|
|
|
|
|
|
|
|
|
|
if (!target.TryGetComponent(out StomachComponent stomachComponent))
|
|
|
|
|
|
{
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
var transferAmount = ReagentUnit.Min(TransferAmount, _contents.CurrentVolume);
|
|
|
|
|
|
var split = _contents.SplitSolution(transferAmount);
|
2020-09-09 18:32:31 -04:00
|
|
|
|
|
2020-05-29 15:50:23 -05:00
|
|
|
|
if (stomachComponent.TryTransferSolution(split))
|
|
|
|
|
|
{
|
2020-09-09 18:32:31 -04:00
|
|
|
|
if (_useSound == null)
|
|
|
|
|
|
{
|
|
|
|
|
|
return false;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-06-07 08:55:15 -05:00
|
|
|
|
EntitySystem.Get<AudioSystem>().PlayFromEntity(_useSound, target, AudioParams.Default.WithVolume(-2f));
|
2020-09-01 12:34:53 +02:00
|
|
|
|
target.PopupMessage(Loc.GetString("Slurp"));
|
2020-05-29 15:50:23 -05:00
|
|
|
|
UpdateAppearance();
|
|
|
|
|
|
return true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-09-09 18:32:31 -04:00
|
|
|
|
// Stomach was full or can't handle whatever solution we have.
|
2020-05-29 15:50:23 -05:00
|
|
|
|
_contents.TryAddSolution(split);
|
2020-09-09 18:32:31 -04:00
|
|
|
|
target.PopupMessage(Loc.GetString("You've had enough {0:theName}!", Owner));
|
2020-05-29 15:50:23 -05:00
|
|
|
|
return false;
|
2020-01-28 20:07:02 -05:00
|
|
|
|
}
|
2020-07-23 01:42:09 +02:00
|
|
|
|
|
|
|
|
|
|
void ILand.Land(LandEventArgs eventArgs)
|
|
|
|
|
|
{
|
|
|
|
|
|
if (_pressurized &&
|
|
|
|
|
|
!Opened &&
|
|
|
|
|
|
_random.Prob(0.25f) &&
|
2020-09-09 18:32:31 -04:00
|
|
|
|
Owner.TryGetComponent(out SolutionContainerComponent component))
|
2020-07-23 01:42:09 +02:00
|
|
|
|
{
|
|
|
|
|
|
Opened = true;
|
|
|
|
|
|
|
|
|
|
|
|
var solution = component.SplitSolution(component.CurrentVolume);
|
2020-09-02 01:16:25 +02:00
|
|
|
|
solution.SpillAt(Owner, "PuddleSmear");
|
2020-07-23 01:42:09 +02:00
|
|
|
|
|
|
|
|
|
|
EntitySystem.Get<AudioSystem>().PlayFromEntity(_burstSound, Owner,
|
|
|
|
|
|
AudioParams.Default.WithVolume(-4));
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2019-11-12 08:20:03 +11:00
|
|
|
|
}
|
|
|
|
|
|
}
|