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 Robust.Shared.GameObjects;
|
2020-04-18 13:46:35 +02:00
|
|
|
|
using Robust.Shared.Serialization;
|
|
|
|
|
|
using Robust.Shared.ViewVariables;
|
2020-02-22 23:37:56 +00:00
|
|
|
|
|
2020-06-24 02:21:20 +02:00
|
|
|
|
namespace Content.Shared.GameObjects.Components.Movement
|
2020-02-22 23:37:56 +00:00
|
|
|
|
{
|
|
|
|
|
|
[RegisterComponent]
|
|
|
|
|
|
public class MovementSpeedModifierComponent : Component
|
|
|
|
|
|
{
|
2020-04-18 13:46:35 +02:00
|
|
|
|
public const float DefaultBaseWalkSpeed = 4.0f;
|
|
|
|
|
|
public const float DefaultBaseSprintSpeed = 7.0f;
|
|
|
|
|
|
|
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
|
|
|
|
|
2020-02-22 23:37:56 +00:00
|
|
|
|
public override string Name => "MovementSpeedModifier";
|
|
|
|
|
|
|
|
|
|
|
|
private float _cachedWalkSpeedModifier = 1.0f;
|
2020-04-18 13:46:35 +02:00
|
|
|
|
[ViewVariables]
|
2020-02-22 23:37:56 +00:00
|
|
|
|
public float WalkSpeedModifier
|
|
|
|
|
|
{
|
|
|
|
|
|
get
|
|
|
|
|
|
{
|
|
|
|
|
|
RecalculateMovementSpeedModifiers();
|
|
|
|
|
|
return _cachedWalkSpeedModifier;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
private float _cachedSprintSpeedModifier;
|
2020-04-18 13:46:35 +02:00
|
|
|
|
[ViewVariables]
|
2020-02-22 23:37:56 +00:00
|
|
|
|
public float SprintSpeedModifier
|
|
|
|
|
|
{
|
|
|
|
|
|
get
|
|
|
|
|
|
{
|
|
|
|
|
|
RecalculateMovementSpeedModifiers();
|
|
|
|
|
|
return _cachedSprintSpeedModifier;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-04-18 13:46:35 +02:00
|
|
|
|
[ViewVariables(VVAccess.ReadWrite)]
|
|
|
|
|
|
public float BaseWalkSpeed { get; set; }
|
|
|
|
|
|
[ViewVariables(VVAccess.ReadWrite)]
|
|
|
|
|
|
public float BaseSprintSpeed { get; set; }
|
|
|
|
|
|
|
|
|
|
|
|
[ViewVariables]
|
|
|
|
|
|
public float CurrentWalkSpeed => WalkSpeedModifier * BaseWalkSpeed;
|
|
|
|
|
|
[ViewVariables]
|
|
|
|
|
|
public float CurrentSprintSpeed => SprintSpeedModifier * BaseSprintSpeed;
|
|
|
|
|
|
|
2020-02-22 23:37:56 +00:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// set to warn us that a component's movespeed modifier has changed
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private bool _movespeedModifiersNeedRefresh = true;
|
|
|
|
|
|
|
|
|
|
|
|
public void RefreshMovementSpeedModifiers()
|
|
|
|
|
|
{
|
|
|
|
|
|
_movespeedModifiersNeedRefresh = true;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-04-18 13:46:35 +02:00
|
|
|
|
public override void ExposeData(ObjectSerializer serializer)
|
|
|
|
|
|
{
|
|
|
|
|
|
base.ExposeData(serializer);
|
|
|
|
|
|
|
|
|
|
|
|
serializer.DataField(this, p => p.BaseWalkSpeed, "baseWalkSpeed", 4);
|
|
|
|
|
|
serializer.DataField(this, p => p.BaseSprintSpeed, "baseSprintSpeed", 7);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-02-22 23:37:56 +00:00
|
|
|
|
/// <summary>
|
|
|
|
|
|
/// Recalculate movement speed with current modifiers, or return early if no change
|
|
|
|
|
|
/// </summary>
|
|
|
|
|
|
private void RecalculateMovementSpeedModifiers()
|
|
|
|
|
|
{
|
|
|
|
|
|
{
|
|
|
|
|
|
if (!_movespeedModifiersNeedRefresh)
|
|
|
|
|
|
return;
|
|
|
|
|
|
var movespeedModifiers = Owner.GetAllComponents<IMoveSpeedModifier>();
|
|
|
|
|
|
float walkSpeedModifier = 1.0f;
|
|
|
|
|
|
float sprintSpeedModifier = 1.0f;
|
|
|
|
|
|
foreach (var component in movespeedModifiers)
|
|
|
|
|
|
{
|
|
|
|
|
|
walkSpeedModifier *= component.WalkSpeedModifier;
|
|
|
|
|
|
sprintSpeedModifier *= component.SprintSpeedModifier;
|
|
|
|
|
|
}
|
|
|
|
|
|
_cachedWalkSpeedModifier = walkSpeedModifier;
|
|
|
|
|
|
_cachedSprintSpeedModifier = sprintSpeedModifier;
|
|
|
|
|
|
}
|
|
|
|
|
|
_movespeedModifiersNeedRefresh = false;
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2020-06-24 02:21:20 +02:00
|
|
|
|
public interface IMoveSpeedModifier
|
2020-02-22 23:37:56 +00:00
|
|
|
|
{
|
|
|
|
|
|
float WalkSpeedModifier { get; }
|
|
|
|
|
|
float SprintSpeedModifier { get; }
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|