Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Need to merge this

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-03-25 11:16:57 +01:00
parent 42814fcfe7
commit 705aeceba6
7 changed files with 104 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
View File

@@ -1,4 +1,5 @@
using Content.Client.UserInterface;
using System;
using Content.Client.UserInterface;
using Content.Shared.GameObjects.Components.Mobs;
using Robust.Client.GameObjects;
using Robust.Client.Player;
@@ -6,7 +7,6 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.ViewVariables;
namespace Content.Client.GameObjects.Components.Mobs
{
@@ -15,29 +15,25 @@ namespace Content.Client.GameObjects.Components.Mobs
{
#pragma warning disable 649
[Dependency] private readonly IPlayerManager _playerManager;
#pragma warning restore 649
[ViewVariables(VVAccess.ReadWrite)]
public bool IsInCombatMode { get; private set; }
[ViewVariables(VVAccess.ReadWrite)]
public TargetingZone ActiveZone { get; private set; }
#pragma warning disable 649
[Dependency] private readonly IGameHud _gameHud;
#pragma warning restore 649
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
public override bool IsInCombatMode
{
base.HandleComponentState(curState, nextState);
if (!(curState is CombatModeComponentState state))
return;
IsInCombatMode = state.IsInCombatMode;
ActiveZone = state.TargetingZone;
if (Owner == _playerManager.LocalPlayer.ControlledEntity)
get => base.IsInCombatMode;
set
{
base.IsInCombatMode = value;
UpdateHud();
}
}
public override TargetingZone ActiveZone
{
get => base.ActiveZone;
set
{
base.ActiveZone = value;
UpdateHud();
}
}
@@ -61,6 +57,11 @@ namespace Content.Client.GameObjects.Components.Mobs
private void UpdateHud()
{
if (Owner != _playerManager.LocalPlayer.ControlledEntity)
{
return;
}
_gameHud.CombatModeActive = IsInCombatMode;
_gameHud.TargetingZone = ActiveZone;
}

28
Content.Client/GameObjects/EntitySystems/CombatModeSystem.cs
View File

@@ -2,15 +2,16 @@ using Content.Client.GameObjects.Components.Mobs;
using Content.Client.UserInterface;
using Content.Client.Utility;
using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.EntitySystemMessages;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Input;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.GameObjects.EntitySystems;
using Robust.Client.Graphics.Drawing;
using Robust.Client.Graphics.Overlays;
using Robust.Client.Interfaces.Graphics.Overlays;
using Robust.Client.Interfaces.Input;
using Robust.Client.Player;
using Robust.Shared.GameObjects.Systems;
using Robust.Shared.Input;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
@@ -19,7 +20,8 @@ using static Content.Client.StaticIoC;
namespace Content.Client.GameObjects.EntitySystems
{
public sealed class CombatModeSystem : EntitySystem
[UsedImplicitly]
public sealed class CombatModeSystem : SharedCombatModeSystem
{
private const float AttackTimeThreshold = 0.15f;
@@ -44,10 +46,24 @@ namespace Content.Client.GameObjects.EntitySystems
_inputSystem = EntitySystemManager.GetEntitySystem<InputSystem>();
_inputSystem.BindMap.BindFunction(ContentKeyFunctions.UseOrAttack, new InputHandler(this));
_inputSystem.BindMap.BindFunction(ContentKeyFunctions.ToggleCombatMode,
InputCmdHandler.FromDelegate(CombatModeToggled, handle: false));
_overlayManager.AddOverlay(new CombatModeOverlay(this));
}
private void CombatModeToggled(ICommonSession session)
{
var player = IoCManager.Resolve<IPlayerManager>().LocalPlayer;
if (player.ControlledEntity == null ||
!player.ControlledEntity.TryGetComponent(out CombatModeComponent combatModeComponent))
{
return;
}
combatModeComponent.IsInCombatMode = !combatModeComponent.IsInCombatMode;
}
public override void Shutdown()
{
base.Shutdown();
@@ -68,12 +84,12 @@ namespace Content.Client.GameObjects.EntitySystems
private void OnTargetingZoneChanged(TargetingZone obj)
{
RaiseNetworkEvent(new CombatModeSystemMessages.SetTargetZoneMessage(obj));
EntityManager.RaisePredictiveEvent(new SetTargetZoneMessage(obj));
}
private void OnCombatModeChanged(bool obj)
{
RaiseNetworkEvent(new CombatModeSystemMessages.SetCombatModeActiveMessage(obj));
EntityManager.RaisePredictiveEvent(new SetCombatModeActiveMessage(obj));
// Just in case.
UseOrAttackIsDown = false;