Merge remote-tracking branch 'origin/feat/inport-props' into feat/craft-discovery

# Conflicts: # Assets/External/Animated PBR Chest Demo/Materials/WoodChest.mat # Packages/com.distantlands.cozy.core/Content/Integration/Import for BiRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for HDRP.unitypackage.meta # Packages/com.distantlands.cozy.core/Content/Integration/Import for URP.unitypackage.meta
2026-07-25 19:42:26 +02:00
parent 0052b0d98e f47baf957e
commit 78bfdf2828
954 changed files with 999772 additions and 26193 deletions
@@ -13,15 +13,21 @@ MonoBehaviour:
  m_Name: Berries
  m_EditorClassIdentifier: Assembly-CSharp::ItemData
  itemName: Baies
-  icon: {fileID: 0}
+  icon: {fileID: 21300000, guid: 9398011c9ea6ec842a77e302f8d6ee9e, type: 3}
  description: Baies sucrees, un peu de faim et de soif.
  isStackable: 1
  maxStackSize: 20
  itemType: 3
+  maxUses: 0
+  keepWhenDepleted: 0
  harvestType: 0
  toolPower: 1
  healthRestore: 0
  hungerRestore: 5
  thirstRestore: 3
+  cookedResult: {fileID: 0}
+  cookTime: 10
+  isFuel: 0
+  fuelSeconds: 30
  worldPrefab: {fileID: 2848928878313733705, guid: aee821ce97ce54a409d60916304c8311, type: 3}
  handPrefab: {fileID: 0}
@@ -13,15 +13,21 @@ MonoBehaviour:
  m_Name: Fiber
  m_EditorClassIdentifier: Assembly-CSharp::ItemData
  itemName: Fibre
-  icon: {fileID: 0}
+  icon: {fileID: 21300000, guid: b2880368dfa10904991693865e899ceb, type: 3}
  description: Fibre vegetale pour cordes et tissus.
  isStackable: 1
  maxStackSize: 50
  itemType: 0
+  maxUses: 0
+  keepWhenDepleted: 0
  harvestType: 0
  toolPower: 1
  healthRestore: 0
  hungerRestore: 0
  thirstRestore: 0
+  cookedResult: {fileID: 0}
+  cookTime: 10
+  isFuel: 0
+  fuelSeconds: 30
  worldPrefab: {fileID: 2848928878313733705, guid: aee821ce97ce54a409d60916304c8311, type: 3}
  handPrefab: {fileID: 0}
@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f53cff53f28e82d42a1a8d25c52d87f4, type: 3}
+  m_Name: Pioche_en_Bois
+  m_EditorClassIdentifier: Assembly-CSharp::Ashwild.Inventory.ItemData
+  itemName: Pioche en Bois
+  icon: {fileID: 21300000, guid: 68b0d4b1f2a37e14d87abe07301d827d, type: 3}
+  description: Pioche en Bois
+  isStackable: 1
+  maxStackSize: 64
+  itemType: 1
+  maxUses: 0
+  keepWhenDepleted: 0
+  harvestType: 0
+  toolPower: 1
+  healthRestore: 0
+  hungerRestore: 0
+  thirstRestore: 0
+  cookedResult: {fileID: 0}
+  cookTime: 10
+  isFuel: 0
+  fuelSeconds: 30
+  worldPrefab: {fileID: 9032088729056219024, guid: cdeb9c121d922ed459bb03f302f541cf, type: 3}
+  handPrefab: {fileID: 3533270531403527532, guid: cf74ac15809b5e74787b243d40877ba0, type: 3}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87cbf77d115c72d4e9cbcc71feceab59
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -13,15 +13,21 @@ MonoBehaviour:
  m_Name: Rope
  m_EditorClassIdentifier: Assembly-CSharp::ItemData
  itemName: Corde
-  icon: {fileID: 0}
+  icon: {fileID: 21300000, guid: 665f8301275a4bf44b584da28992f449, type: 3}
  description: Corde solide tressee a partir de fibres.
  isStackable: 1
  maxStackSize: 30
  itemType: 0
+  maxUses: 0
+  keepWhenDepleted: 0
  harvestType: 0
  toolPower: 1
  healthRestore: 0
  hungerRestore: 0
  thirstRestore: 0
+  cookedResult: {fileID: 0}
+  cookTime: 10
+  isFuel: 0
+  fuelSeconds: 30
  worldPrefab: {fileID: 2848928878313733705, guid: aee821ce97ce54a409d60916304c8311, type: 3}
  handPrefab: {fileID: 0}