Merge pull request #611 from fospas/revert_Advanced_Prying

revert advanced prying
fospas · Nov 22, 2024 · fa4a153 · fa4a153
2 parents 6dd1217 + 2a9e55f
commit fa4a153
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 39 deletions.
diff --git a/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs b/Content.IntegrationTests/Tests/DoAfter/DoAfterCancellationTests.cs
@@ -67,14 +67,6 @@ public async Task CancelTilePry()
         await SetTile(Floor);
         await InteractUsing(Pry, awaitDoAfters: false);
 
-        // BACKMEN EDIT START
-        if (!ActiveDoAfters.Any())
-        {
-            await AssertTile(Plating);
-            return;
-        }
-        // BACKMEN EDIT END
-
         await CancelDoAfters();
         await AssertTile(Floor);
 
@@ -89,9 +81,6 @@ public async Task CancelRepeatedTilePry()
         await InteractUsing(Pry, awaitDoAfters: false);
         await RunTicks(1);
 
-        if (!ActiveDoAfters.Any()) // BACKMEN EDIT
-            return;
-
         Assert.That(ActiveDoAfters.Count(), Is.EqualTo(1));
         await AssertTile(Floor);
 

diff --git a/Content.Shared/Prying/Components/PryingComponent.cs b/Content.Shared/Prying/Components/PryingComponent.cs
@@ -87,7 +87,6 @@ public record struct GetPryTimeModifierEvent
     public readonly EntityUid User;
     public float PryTimeModifier = 1.0f;
     public float BaseTime = 5.0f;
-    public float Neglect = 5f; // BACKMEN EDIT
 
     public GetPryTimeModifierEvent(EntityUid user)
     {

diff --git a/Content.Shared/Prying/Systems/PryingSystem.cs b/Content.Shared/Prying/Systems/PryingSystem.cs
@@ -136,12 +136,7 @@ private bool StartPry(EntityUid target, EntityUid user, EntityUid? tool, float t
         RaiseLocalEvent(target, ref modEv);
 
         // BACKMEN EDIT START
-        var time = modEv.BaseTime * modEv.PryTimeModifier / toolModifier;
-
-        if (time <= modEv.Neglect)
-            time = 0;
-
-        var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(time), new DoorPryDoAfterEvent(), target, target, tool) // WD EDIT END
+        var doAfterArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(modEv.BaseTime * modEv.PryTimeModifier / toolModifier), new DoorPryDoAfterEvent(), target, target, tool)
         {
             BreakOnDamage = true,
             BreakOnMove = true,
@@ -176,7 +171,7 @@ private void OnDoAfter(EntityUid uid, DoorComponent door, DoorPryDoAfterEvent ar
         }
 
 
-        if (args.Used != null && comp != null && door.State is not DoorState.Closing and not DoorState.Opening) // BACKMEN EDIT
+        if (args.Used != null && comp != null)
         {
             _audioSystem.PlayPredicted(comp.UseSound, args.Used.Value, args.User);
         }

diff --git a/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs b/Content.Shared/Tools/Components/ToolTileCompatibleComponent.cs
@@ -18,7 +18,7 @@ public sealed partial class ToolTileCompatibleComponent : Component
     /// The time it takes to modify the tile.
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan Delay = TimeSpan.FromSeconds(0); // BACKMEN EDIT
+    public TimeSpan Delay = TimeSpan.FromSeconds(1);
 
     /// <summary>
     /// Whether or not the tile being modified must be unobstructed

diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl
@@ -32,9 +32,4 @@ tool-quality-rolling-name = Rolling
 tool-quality-rolling-tool-name = Rolling Pin
 
 tool-quality-digging-name = Digging
-tool-quality-digging-tool-name = Shovel
-
-# White Dream
-tool-quality-advanced-prying-name = Advanced Prying
-tool-quality-advanced-prying-tool-name = Axe
-# White Dream
+tool-quality-digging-tool-name = Shovel
diff --git a/Resources/Locale/ru-RU/backmen/tools/tool-qualities.ftl b/Resources/Locale/ru-RU/backmen/tools/tool-qualities.ftl
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -41,7 +41,6 @@
   - type: Tool
     qualities:
       - Prying
-      - AdvancedPrying # White Dream
   - type: ToolTileCompatible
   - type: Prying
   - type: UseDelay

diff --git a/Resources/Prototypes/Tiles/plating.yml b/Resources/Prototypes/Tiles/plating.yml
@@ -4,7 +4,6 @@
   sprite: /Textures/Tiles/plating.png
   baseTurf: Lattice
   isSubfloor: true
-  deconstructTools: [ AdvancedPrying ] # White Dream
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -21,7 +20,6 @@
   - 1.0
   baseTurf: Lattice
   isSubfloor: true
-  deconstructTools: [ AdvancedPrying ] # White Dream
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3
@@ -33,7 +31,6 @@
   sprite: /Textures/Tiles/plating_burnt.png
   baseTurf: Lattice
   isSubfloor: true
-  deconstructTools: [ AdvancedPrying ] # White Dream
   footstepSounds:
     collection: FootstepPlating
   friction: 0.3

diff --git a/Resources/Prototypes/_Backmen/tool_qualities.yml b/Resources/Prototypes/_Backmen/tool_qualities.yml
@@ -4,10 +4,3 @@
   toolName: tool-quality-none-tool-name
   spawn: KitchenKnife
   icon: { sprite: Objects/Weapons/Melee/kitchen_knife.rsi, state: icon }
-
-- type: tool
-  id: AdvancedPrying
-  name: tool-quality-advanced-prying-name
-  toolName: tool-quality-advanced-prying-tool-name
-  spawn: FireAxe
-  icon: { sprite: Objects/Weapons/Melee/fireaxe.rsi, state: icon }