Skip to content

Commit 21247fb

Browse files
authoredOct 9, 2023
cleanup: remove TargetingDoll-related code (space-wizards#20866)
1 parent 367c251 commit 21247fb

File tree

9 files changed

+1
-147
lines changed

9 files changed

+1
-147
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ PublishScripts/
162162
# NuGet v3's project.json files produces more ignoreable files
163163
*.nuget.props
164164
*.nuget.targets
165+
.nuget/
165166

166167
# Microsoft Azure Build Output
167168
csx/

‎Content.Client/CombatMode/CombatModeSystem.cs

-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Content.Client.Hands.Systems;
22
using Content.Shared.CCVar;
33
using Content.Shared.CombatMode;
4-
using Content.Shared.Targeting;
54
using Robust.Client.Graphics;
65
using Robust.Client.Input;
76
using Robust.Client.Player;
@@ -44,11 +43,6 @@ public override void Shutdown()
4443
base.Shutdown();
4544
}
4645

47-
private void OnTargetingZoneChanged(TargetingZone obj)
48-
{
49-
EntityManager.RaisePredictiveEvent(new CombatModeSystemMessages.SetTargetZoneMessage(obj));
50-
}
51-
5246
public bool IsInCombatMode()
5347
{
5448
var entity = _playerManager.LocalPlayer?.ControlledEntity;
@@ -65,12 +59,6 @@ public override void SetInCombatMode(EntityUid entity, bool value, CombatModeCom
6559
UpdateHud(entity);
6660
}
6761

68-
public override void SetActiveZone(EntityUid entity, TargetingZone zone, CombatModeComponent? component = null)
69-
{
70-
base.SetActiveZone(entity, zone, component);
71-
UpdateHud(entity);
72-
}
73-
7462
private void UpdateHud(EntityUid entity)
7563
{
7664
if (entity != _playerManager.LocalPlayer?.ControlledEntity || !Timing.IsFirstTimePredicted)

‎Content.Client/Stylesheets/StyleNano.cs

-24
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Content.Client.Examine;
55
using Content.Client.PDA;
66
using Content.Client.Resources;
7-
using Content.Client.Targeting.UI;
87
using Content.Client.UserInterface.Controls;
98
using Content.Client.UserInterface.Controls.FancyTree;
109
using Content.Client.Verbs.UI;
@@ -1148,29 +1147,6 @@ public StyleNano(IResourceCache resCache) : base(resCache)
11481147
new StyleProperty(Label.StylePropertyFont, notoSansDisplayBold14),
11491148
}),
11501149

1151-
// Targeting doll
1152-
1153-
new StyleRule(
1154-
new SelectorElement(typeof(TextureButton), new[] {TargetingDoll.StyleClassTargetDollZone}, null,
1155-
new[] {TextureButton.StylePseudoClassNormal}), new[]
1156-
{
1157-
new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorDefault),
1158-
}),
1159-
1160-
new StyleRule(
1161-
new SelectorElement(typeof(TextureButton), new[] {TargetingDoll.StyleClassTargetDollZone}, null,
1162-
new[] {TextureButton.StylePseudoClassHover}), new[]
1163-
{
1164-
new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorHovered),
1165-
}),
1166-
1167-
new StyleRule(
1168-
new SelectorElement(typeof(TextureButton), new[] {TargetingDoll.StyleClassTargetDollZone}, null,
1169-
new[] {TextureButton.StylePseudoClassPressed}), new[]
1170-
{
1171-
new StyleProperty(Control.StylePropertyModulateSelf, ButtonColorPressed),
1172-
}),
1173-
11741150
// NanoHeading
11751151

11761152
new StyleRule(

‎Content.Client/Targeting/UI/TargetingDoll.xaml

-8
This file was deleted.

‎Content.Client/Targeting/UI/TargetingDoll.xaml.cs

-44
This file was deleted.

‎Content.Shared/CombatMode/CombatModeComponent.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using Content.Shared.MouseRotator;
22
using Content.Shared.Movement.Components;
3-
using Content.Shared.Targeting;
43
using Robust.Shared.Audio;
54
using Robust.Shared.GameStates;
65
using Robust.Shared.Prototypes;
@@ -49,8 +48,5 @@ public sealed partial class CombatModeComponent : Component
4948
/// </summary>
5049
[DataField, AutoNetworkedField]
5150
public bool ToggleMouseRotator = true;
52-
53-
[ViewVariables(VVAccess.ReadWrite), DataField("activeZone"), AutoNetworkedField]
54-
public TargetingZone ActiveZone;
5551
}
5652
}

‎Content.Shared/CombatMode/Events/CombatModeSystemMessages.cs

-19
This file was deleted.

‎Content.Shared/CombatMode/SharedCombatModeSystem.cs

-10
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using Content.Shared.MouseRotator;
33
using Content.Shared.Movement.Components;
44
using Content.Shared.Popups;
5-
using Content.Shared.Targeting;
65
using Robust.Shared.Network;
76
using Robust.Shared.Timing;
87

@@ -89,15 +88,6 @@ public virtual void SetInCombatMode(EntityUid entity, bool value, CombatModeComp
8988
SetMouseRotatorComponents(entity, value);
9089
}
9190

92-
public virtual void SetActiveZone(EntityUid entity, TargetingZone zone,
93-
CombatModeComponent? component = null)
94-
{
95-
if (!Resolve(entity, ref component))
96-
return;
97-
98-
component.ActiveZone = zone;
99-
}
100-
10191
private void SetMouseRotatorComponents(EntityUid uid, bool value)
10292
{
10393
if (value)

‎Content.Shared/Targeting/TargetingZone.cs

-26
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.