more balanced constructing and unscrewing for metal objects (#21051)

* more balanced constructing and unscrewing for metal objects

- computer frame, machine frame, rack and meatspike can be deconstructed while anchored by screwing
- Computer frames now need time to be constructed.
- it now takes a reasonable time to make a meatspike. If you can construct a machine frame in 2.5, surely you can make a meatspike in 2.

* Fixes test

diff --git a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
index 1cf0135d7a7b852be8e989822a6ec955e5cd609d..5412469ac5d6b589205640c60e8e265a236ee2d9 100644 (file)
--- a/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
+++ b/Content.IntegrationTests/Tests/Construction/Interaction/ComputerContruction.cs
@@ -51,7 +51,7 @@ public sealed class ComputerConstruction : InteractionTest
             Screw,
             Pry,
             Wrench,
-            Weld);
+            Screw);
 
         // construction finished, entity no longer exists.
         AssertDeleted();

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
index 688979b7a52c07ebca96bc08cc3a2c9c184b61fa..02e141826cb8f3127425a03724fdfe75bfef7e67 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/meatspike.yml
@@ -13,7 +13,7 @@
           steps:
             - material: Steel
               amount: 15
-              doAfter: 10
+              doAfter: 2
     - node: MeatSpike
       entity: KitchenSpike
       edges:
@@ -22,9 +22,6 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 15
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           steps:
-            - tool: Welding
-              doAfter: 10
+            - tool: Screwing
+              doAfter: 1

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
index 428757e5b91946a33f1adfbc6198811d6f1a288f..214bde3fad33ceb9bfd2ee6018a4f189bfaafb37 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/rack.yml
@@ -22,9 +22,6 @@
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 2
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           steps:
             - tool: Screwing
               doAfter: 1

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
index 6bbbd4f2fff5caabf048aa05e4af1c7d369251d1..4792bb216f3eae1304bc1082ab766d98ecd73a02 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/computer.yml
@@ -11,6 +11,7 @@
           steps:
             - material: Steel
               amount: 5
+              doAfter: 2.5
 
     - node: frameUnsecured
       actions:
@@ -29,16 +30,13 @@
                 state: "id_mod"
 
         - to: start
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1
               amount: 5
             - !type:DeleteEntity {}
           steps:
-            - tool: Welding
+            - tool: Screwing
               doAfter: 2
 
     - node: boardUnsecured

diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
index cfbcaf67672c3984e269dce893334e22e6678979..01d8b4432225a090cfde78386ea4f09a0af87c2c 100644 (file)
--- a/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/machines/machine.yml
@@ -33,9 +33,6 @@
           steps:
             - material: Cable
         - to: start
-          conditions:
-            - !type:EntityAnchored
-              anchored: false
           completed:
             - !type:SpawnPrototype
               prototype: SheetSteel1