fix broken recipes

RE-SS3D · Dec 7, 2024 · 8c7be7d · 8c7be7d
1 parent 4b2396e
commit 8c7be7d
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/Assets/Content/Data/Recipes/SteelGirderRecipe.asset b/Assets/Content/Data/Recipes/SteelGirderRecipe.asset
@@ -92,7 +92,7 @@ MonoBehaviour:
       _new: {fileID: 0}
     _conditions:
     - {fileID: 11400000, guid: 22f5cb218c973ef4291a27c11ca43fe9, type: 2}
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelGirder
     _to: SteelGirderWithMetalSheet
     _modifyResult: 0
@@ -102,7 +102,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 0
+    _craftingInteractionType: 1
     _from: SteelGirderWithMetalSheet
     _to: SteelWall
     _modifyResult: 0
@@ -114,7 +114,7 @@ MonoBehaviour:
         _value: 1
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelGirder
     _to: SteelGirderWithGlassSheet
     _modifyResult: 0
@@ -124,7 +124,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 0
+    _craftingInteractionType: 1
     _from: SteelGirderWithGlassSheet
     _to: SteelWindow
     _modifyResult: 0
@@ -136,7 +136,7 @@ MonoBehaviour:
         _value: 1
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelGirder
     _to: ReinforcedSteelGirderWithStruts
     _modifyResult: 0
@@ -148,7 +148,7 @@ MonoBehaviour:
         _value: 1
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: ReinforcedSteelGirderWithStruts
     _to: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
     _modifyResult: 0
@@ -158,7 +158,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 0
+    _craftingInteractionType: 2
     _from: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
     _to: ReinforcedWall
     _modifyResult: 0
@@ -170,7 +170,7 @@ MonoBehaviour:
         _value: 1
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: ReinforcedSteelGirderWithStruts
     _to: ReinforcedSteelGirderWithBoltedReinforcedGlassSheets
     _modifyResult: 0
@@ -180,7 +180,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 0
+    _craftingInteractionType: 2
     _from: ReinforcedSteelGirderWithBoltedReinforcedGlassSheets
     _to: ReinforcedWindow
     _modifyResult: 0
@@ -190,7 +190,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 5
+    _craftingInteractionType: 6
     _from: ReinforcedWall
     _to: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
     _modifyResult: 0
@@ -200,7 +200,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 4
+    _craftingInteractionType: 5
     _from: ReinforcedSteelGirderWithBoltedReinforcedMetalSheets
     _to: ReinforcedSteelGirderWithBoltedMetalSheets
     _modifyResult: 0
@@ -210,7 +210,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 2
     _from: ReinforcedSteelGirderWithBoltedMetalSheets
     _to: ReinforcedSteelGirderWithStruts
     _modifyResult: 0
@@ -230,7 +230,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 1
+    _craftingInteractionType: 2
     _from: SteelGirder
     _to: SteelGirderUnbolted
     _modifyResult: 0
@@ -240,7 +240,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelGirderWithMetalSheet
     _to: SteelGirder
     _modifyResult: 0
@@ -252,7 +252,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelGirderWithGlassSheet
     _to: SteelGirder
     _modifyResult: 0
@@ -264,7 +264,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 4
+    _craftingInteractionType: 5
     _from: ReinforcedSteelGirderWithBoltedReinforcedGlassSheets
     _to: ReinforcedSteelGirderWithBoltedGlassSheets
     _modifyResult: 0
@@ -274,7 +274,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: ReinforcedSteelGirderWithBoltedGlassSheets
     _to: ReinforcedSteelGirderWithStruts
     _modifyResult: 0
@@ -286,7 +286,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 2
+    _craftingInteractionType: 3
     _from: ReinforcedSteelGirderWithStruts
     _to: ReinforcedSteelGirder
     _modifyResult: 0

diff --git a/Assets/Content/Data/Recipes/SteelGirderUnboltedRecipe.asset b/Assets/Content/Data/Recipes/SteelGirderUnboltedRecipe.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 0
+    _craftingInteractionType: 1
     _from: SteelGirderUnbolted
     _to: SteelSheet
     _modifyResult: 0

diff --git a/Assets/Content/Data/Recipes/SteelSheetRecipe.asset b/Assets/Content/Data/Recipes/SteelSheetRecipe.asset
@@ -39,7 +39,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelSheet
     _to: SteelRod
     _modifyResult: 0
@@ -51,7 +51,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelSheet
     _to: SteelGirderUnbolted
     _modifyResult: 0
@@ -61,7 +61,7 @@ MonoBehaviour:
       _list: []
       _new: {fileID: 0}
     _conditions: []
-    _craftingInteractionType: 3
+    _craftingInteractionType: 4
     _from: SteelSheet
     _to: FloorTile
     _modifyResult: 0

diff --git a/Assets/Content/WorldObjects/Items/Functional/Tools/Engineering/Wrench.prefab b/Assets/Content/WorldObjects/Items/Functional/Tools/Engineering/Wrench.prefab
@@ -283,7 +283,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1dd866b0631d05441982a4824740ff8d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  type: 1
+  type: 2
 --- !u!114 &7555427621416321058
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs b/Assets/Scripts/SS3D/Systems/Inventory/Interactions/PickupInteraction.cs
@@ -66,7 +66,7 @@ public override bool CanInteract(InteractionEvent interactionEvent)
                 }
 
                 // check that our hand is empty
-                if (!hand.IsEmpty() && hand.ItemInHand != item)
+                if (!hand.IsEmpty())
                 {
                     return false;
                 }