Add Buckling (#1155)
* Create BuckleableComponent.cs * Add strap component and keybind to buckle targeted entity * Remove buckle keybind, turn it into a verb * Add moving and attaching the buckled entity to the strap * Fix reality collapsing when clicking on a buckled entity * Add strap position to buckle a mob in the standing or down position * Add new default strap position that makes no change to the mob's standing state * Add Strap component to office chairs and stools * Add Strap component to the pilot chair * Add buckled status effect icon * Add status effect click behaviour * Add buckling and unbuckling sounds * Change Buckle verb to only appear when an entity can be currently buckled * Rotate buckled entity in the direction of the seat * Disable entity rotation when buckled * Fix buckle rotation on beds * Buckling now finds the closest strap to the buckleable entity * Fix rotation when unbuckling an entity * Move buckle verb to StrapComponent * Added buckled entity unbuckle verb, range and interaction checks * Add checks for currently occupied straps * Add unbuckling entity if its respective strap component is removed * Add Clickable, InteractionOutline and Collidable components to bed * Add rotation property to strap component * Rename Buckleable to Buckle * Add Buckle and Strap sizes to buckle multiple entities in the same strap * Remove out of range popup message from strap verb GetData * Move BuckledTo setter logic to its methods * Fix Strap BuckledEntities being public * Fix not updating status when Buckle component is removed * Change BuckleComponent.BuckledTo to be of type StrapComponent * Fix NRE when unbuckling * Add buckle perspective messages * Fix not equals comparison in strap verb * Add added check to Strap TryAdd * Change buckle.ogg and unbuckle.ogg from stereo to mono * Remove -2f volume on buckle and unbuckle sounds * Add summary to Strap TryAdd and Remove methods * Make buckled entities unable to fall * Fix default strap position not rotating the buckled entity * Add downing after unbuckling an entity if it is knocked down * Prevent an entity from buckling onto itself Fixes stack overflow error * Disable recursive buckling * Add buckling onto straps by clicking them with an empty hand * Add recursive buckle check to the trybuckle method as well * Fix being able to click on a different strap to unbuckle from the current one * Merge TryUnbuckle and ForceUnbuckle with a force argument * Remove explicit unimplemented status effect clicking cases * Add documentation to EffectBlockerSystem and ActionBlockerSystem
This commit is contained in:
@@ -3,6 +3,7 @@ using System.Linq;
|
||||
using Content.Client.UserInterface;
|
||||
using Content.Client.Utility;
|
||||
using Content.Shared.GameObjects.Components.Mobs;
|
||||
using Content.Shared.Input;
|
||||
using Robust.Client.GameObjects;
|
||||
using Robust.Client.Interfaces.ResourceManagement;
|
||||
using Robust.Client.Interfaces.UserInterface;
|
||||
@@ -10,6 +11,7 @@ using Robust.Client.Player;
|
||||
using Robust.Client.UserInterface;
|
||||
using Robust.Client.UserInterface.Controls;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Input;
|
||||
using Robust.Shared.Interfaces.GameObjects;
|
||||
using Robust.Shared.Interfaces.Network;
|
||||
using Robust.Shared.Interfaces.Timing;
|
||||
@@ -94,31 +96,34 @@ namespace Content.Client.GameObjects.Components.Mobs
|
||||
_cooldown.Clear();
|
||||
_ui.VBox.DisposeAllChildren();
|
||||
|
||||
foreach (var (key, statusEffect) in _status.OrderBy(x => (int) x.Key))
|
||||
foreach (var (key, effect) in _status.OrderBy(x => (int) x.Key))
|
||||
{
|
||||
var status = new Control()
|
||||
{
|
||||
Children =
|
||||
{
|
||||
new TextureRect
|
||||
{
|
||||
TextureScale = (2, 2),
|
||||
Texture = _resourceCache.GetTexture(statusEffect.Icon)
|
||||
},
|
||||
}
|
||||
};
|
||||
var texture = _resourceCache.GetTexture(effect.Icon);
|
||||
var status = new StatusControl(key, texture);
|
||||
|
||||
if (statusEffect.Cooldown.HasValue)
|
||||
if (effect.Cooldown.HasValue)
|
||||
{
|
||||
var cooldown = new CooldownGraphic();
|
||||
status.Children.Add(cooldown);
|
||||
_cooldown[key] = cooldown;
|
||||
}
|
||||
|
||||
status.OnPressed += args => StatusPressed(args, status);
|
||||
|
||||
_ui.VBox.AddChild(status);
|
||||
}
|
||||
}
|
||||
|
||||
private void StatusPressed(BaseButton.ButtonEventArgs args, StatusControl status)
|
||||
{
|
||||
if (args.Event.Function != EngineKeyFunctions.UIClick)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
SendNetworkMessage(new ClickStatusMessage(status.Effect));
|
||||
}
|
||||
|
||||
public void RemoveStatusEffect(StatusEffect name)
|
||||
{
|
||||
_status.Remove(name);
|
||||
|
||||
Reference in New Issue
Block a user