Merge pull request 'DamianBranch' (#80) from DamianBranch into main

Reviewed-on: #80
2025-12-10 18:26:46 +00:00
parent 0b4def8a05 26cb55bf05
commit 942bbc59f1
8 changed files with 488 additions and 17 deletions
--- a/Assets/Data/SubLevels/CardQualityControl.asset
+++ b/Assets/Data/SubLevels/CardQualityControl.asset
@@ -15,6 +15,6 @@ MonoBehaviour:
  targetLevelSceneName: CardQualityControl
  targetMinigameSceneName: 
  description: Level loading for CementFaactory
-  mapSprite: {fileID: -8246103488371625927, guid: fb6b9846cb4b3bd4ca8517a34a5f9a3c, type: 3}
+  mapSprite: {fileID: 3001265211797695019, guid: afdc182c0c32e8f4c9ab04187ea11042, type: 3}
  menuSprite: {fileID: 0}
  minigameMenuSprite: {fileID: 0}
--- a/Assets/Data/SubLevels/FortFight.asset
+++ b/Assets/Data/SubLevels/FortFight.asset
@@ -15,6 +15,6 @@ MonoBehaviour:
  targetLevelSceneName: FortFight
  targetMinigameSceneName: 
  description: Level loading for Dump
-  mapSprite: {fileID: 1508337238920719353, guid: 03a5936ba20198b48a228a1cb0ccf1e0, type: 3}
+  mapSprite: {fileID: -1379189406845521443, guid: 33223754673e54648b06862520aeb899, type: 3}
  menuSprite: {fileID: 0}
  minigameMenuSprite: {fileID: 0}
--- a/Assets/Prefabs/Items/BoosterPack.prefab
+++ b/Assets/Prefabs/Items/BoosterPack.prefab
@@ -0,0 +1,180 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1192232787243676909
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2473101330038538266}
+  - component: {fileID: 3707340055322249340}
+  - component: {fileID: 6929523442900823636}
+  - component: {fileID: 5148150843116358608}
+  m_Layer: 10
+  m_Name: BoosterPack
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2473101330038538266
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1192232787243676909}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 73.19, y: 4.27, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3707340055322249340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1192232787243676909}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 11629418bd2d44fa9da229ad62c04332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Interactions.BoosterPackPickup
+  isOneTime: 0
+  cooldown: -1
+  characterToInteract: 2
+  interactionStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionInterrupted:
+    m_PersistentCalls:
+      m_Calls: []
+  characterArrived:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionComplete:
+    m_PersistentCalls:
+      m_Calls: []
+  itemData: {fileID: 11400000, guid: c7fafa07afc3ea44598349d2a4777a8c, type: 2}
+  iconRenderer: {fileID: 6929523442900823636}
+  glowVisualPrefab: {fileID: 0}
+  zoomCamera: {fileID: 0}
+  boosterPackCount: 1
+  cameraBlendWait: 0.3
+  growDuration: 0.25
+  pulseDuration: 0.3
+  pulseCount: 3
+  disappearDuration: 0.5
+  growScale: 1.5
+  pulseScale: 1.2
+--- !u!212 &6929523442900823636
+SpriteRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1192232787243676909}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 1
+  m_MaskInteraction: 0
+  m_Sprite: {fileID: -1296148786, guid: b07c9a09f81cfa5428d6db01c6a36960, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 3, y: 4.57}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_SpriteSortPoint: 0
+--- !u!61 &5148150843116358608
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1192232787243676909}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: -0.100000024, y: 0.0050001144}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.53333336, y: 0.4989059}
+    oldSize: {x: 3, y: 4.57}
+    newSize: {x: 3, y: 4.57}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Size: {x: 4.25, y: 6.15}
+  m_EdgeRadius: 0
--- a/Assets/Prefabs/Items/BoosterPack.prefab.meta
+++ b/Assets/Prefabs/Items/BoosterPack.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a9162beaeedfb184694b8ea7b99f19de
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Levels/CementFactory.unity
+++ b/Assets/Scenes/Levels/CementFactory.unity
@@ -325084,6 +325084,175 @@ SpriteRenderer:
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
  m_SpriteSortPoint: 0
+--- !u!1 &2003226690
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2003226694}
+  - component: {fileID: 2003226693}
+  - component: {fileID: 2003226692}
+  - component: {fileID: 2003226691}
+  m_Layer: 10
+  m_Name: CardQualityControl
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &2003226691
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2003226690}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9b7a2b4b1fe492aae7b0f280b4063cf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Levels.MinigameSwitch
+  isOneTime: 0
+  cooldown: -1
+  characterToInteract: 1
+  interactionStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionInterrupted:
+    m_PersistentCalls:
+      m_Calls: []
+  characterArrived:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionComplete:
+    m_PersistentCalls:
+      m_Calls: []
+  switchData: {fileID: 11400000, guid: d94f27522661728419a03566db9d19ff, type: 2}
+  startUnlocked: 1
+  iconRenderer: {fileID: 2003226693}
+--- !u!61 &2003226692
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2003226690}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_CompositeOperation: 0
+  m_CompositeOrder: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 9.62, y: 11.09}
+    newSize: {x: 5.55, y: 6.76}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  m_Size: {x: 9.62, y: 11.09}
+  m_EdgeRadius: 0
+--- !u!212 &2003226693
+SpriteRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2003226690}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_ForceMeshLod: -1
+  m_MeshLodSelectionBias: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_GlobalIlluminationMeshLod: 0
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_MaskInteraction: 0
+  m_Sprite: {fileID: 3001265211797695019, guid: afdc182c0c32e8f4c9ab04187ea11042, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 5.55, y: 6.76}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_SpriteSortPoint: 0
+--- !u!4 &2003226694
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2003226690}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -35.56, y: -74.8, z: 0}
+  m_LocalScale: {x: 0.48, y: 0.48, z: 0.48}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2019787772
 GameObject:
  m_ObjectHideFlags: 0
@@ -327862,3 +328031,4 @@ SceneRoots:
  - {fileID: 3817275161224707557}
  - {fileID: 1818803817}
  - {fileID: 6671167903009625445}
+  - {fileID: 2003226694}
--- a/Assets/Scenes/Levels/Dump.unity
+++ b/Assets/Scenes/Levels/Dump.unity
@@ -959,6 +959,7 @@ PolygonCollider2D:
  m_UseDelaunayMesh: 0
 --- !u!483693784 &260349093
 TilemapRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -1004,6 +1005,7 @@ TilemapRenderer:
  m_SortingLayerID: 622133659
  m_SortingLayer: -1
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_ChunkSize: {x: 32, y: 32, z: 32}
  m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
  m_MaxChunkCount: 16
@@ -1011,7 +1013,6 @@ TilemapRenderer:
  m_SortOrder: 0
  m_Mode: 0
  m_DetectChunkCullingBounds: 0
-  m_MaskInteraction: 0
 --- !u!1839735485 &260349094
 Tilemap:
  m_ObjectHideFlags: 0
@@ -362327,6 +362328,7 @@ GameObject:
  m_IsActive: 1
 --- !u!212 &492398446
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -362372,6 +362374,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -8097480472054124286, guid: 82a2520f13702314bb048a6516f64166, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -362381,7 +362384,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!4 &492398447
 Transform:
@@ -363001,6 +363003,7 @@ BoxCollider2D:
  m_EdgeRadius: 0
 --- !u!212 &589826006
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -363046,6 +363049,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: 6641218827833524352, guid: 74fde2f2504129149a33d69a1b6ab264, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -363055,7 +363059,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1001 &597370927
 PrefabInstance:
@@ -363894,15 +363897,63 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 7616732157221451338, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: -1379189406845521443, guid: 33223754673e54648b06862520aeb899, type: 3}
    - target: {fileID: 7628774400998359375, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
      propertyPath: m_Name
-      value: PigmanPlaceholder
+      value: FortFight
      objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 6896877652323851773, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 7628774400998359375, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 728960433}
  m_SourcePrefab: {fileID: 100100000, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
+--- !u!1 &728960431 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7628774400998359375, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
+  m_PrefabInstance: {fileID: 728960430}
+  m_PrefabAsset: {fileID: 0}
+--- !u!212 &728960432 stripped
+SpriteRenderer:
+  m_CorrespondingSourceObject: {fileID: 7616732157221451338, guid: e9f7d396c2b6f9c419510a8c6a36281a, type: 3}
+  m_PrefabInstance: {fileID: 728960430}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &728960433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 728960431}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d9b7a2b4b1fe492aae7b0f280b4063cf, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: AppleHillsScripts::Levels.MinigameSwitch
+  isOneTime: 0
+  cooldown: -1
+  characterToInteract: 2
+  interactionStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionInterrupted:
+    m_PersistentCalls:
+      m_Calls: []
+  characterArrived:
+    m_PersistentCalls:
+      m_Calls: []
+  interactionComplete:
+    m_PersistentCalls:
+      m_Calls: []
+  switchData: {fileID: 11400000, guid: e483266a9791f60409ddd45f22d8637e, type: 2}
+  startUnlocked: 1
+  iconRenderer: {fileID: 728960432}
 --- !u!1001 &761563880
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -364643,6 +364694,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: AppleHillsScripts::Core.SaveLoad.AppleState
 --- !u!212 &875494119
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -364688,6 +364740,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -2848904672192912036, guid: da9d569a00112f34da69aa6d2b45a529, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -364697,7 +364750,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1001 &885232754
 PrefabInstance:
@@ -365534,7 +365586,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
      propertyPath: m_LocalPosition.x
-      value: -69
+      value: -66.9
      objectReference: {fileID: 0}
    - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3}
      propertyPath: m_LocalPosition.y
@@ -367547,7 +367599,7 @@ Transform:
  m_GameObject: {fileID: 1810521056}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -69, y: -40.7, z: -10}
+  m_LocalPosition: {x: -66.9, y: -40.7, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -367703,6 +367755,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1857955315
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -367748,6 +367801,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -220729042279198803, guid: 845da894b8a3b8c42987cf2830a27bd2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 1
@@ -367757,7 +367811,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!95 &1857955316
 Animator:
@@ -367897,6 +367950,7 @@ BoxCollider2D:
  m_EdgeRadius: 0
 --- !u!212 &1883533862
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -367942,6 +367996,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -8097480472054124286, guid: 82a2520f13702314bb048a6516f64166, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -367951,7 +368006,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1 &1930616352
 GameObject:
@@ -368133,6 +368187,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1956836870
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -368178,6 +368233,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 0
+  m_MaskInteraction: 0
  m_Sprite: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -368187,7 +368243,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!1001 &2007332638
 PrefabInstance:
@@ -368450,6 +368505,7 @@ MonoBehaviour:
        m_CallState: 2
 --- !u!212 &2046020909
 SpriteRenderer:
+  serializedVersion: 2
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@@ -368495,6 +368551,7 @@ SpriteRenderer:
  m_SortingLayerID: 0
  m_SortingLayer: 0
  m_SortingOrder: 1
+  m_MaskInteraction: 0
  m_Sprite: {fileID: -2848904672192912036, guid: da9d569a00112f34da69aa6d2b45a529, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_FlipX: 0
@@ -368504,7 +368561,6 @@ SpriteRenderer:
  m_AdaptiveModeThreshold: 0.5
  m_SpriteTileMode: 0
  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
 --- !u!114 &2046020910
 MonoBehaviour:
@@ -368792,7 +368848,7 @@ Transform:
  m_GameObject: {fileID: 2103114174}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -69, y: -40.7, z: -10}
+  m_LocalPosition: {x: -66.9, y: -40.7, z: -10}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
--- a/Assets/Scenes/Levels/Quarry.unity
+++ b/Assets/Scenes/Levels/Quarry.unity
@@ -472525,6 +472525,63 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 3fa494ec083cbe54a86c3a1b107a90c0, type: 3}
+--- !u!1001 &7412702034506718418
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1192232787243676909, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_Name
+      value: BoosterPack
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 73.19
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.27
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2473101330038538266, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a9162beaeedfb184694b8ea7b99f19de, type: 3}
 --- !u!1001 &7530821580781571560
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -473049,6 +473106,7 @@ SceneRoots:
  - {fileID: 523851908375903090}
  - {fileID: 341893679}
  - {fileID: 1373293420}
+  - {fileID: 7412702034506718418}
  - {fileID: 1073425384}
  - {fileID: 624616733}
  - {fileID: 1794862441}
--- a/Assets/Settings/PlayerFollowerSettings.asset
+++ b/Assets/Settings/PlayerFollowerSettings.asset
@@ -29,7 +29,7 @@ MonoBehaviour:
    manualMoveSmooth: 1
    thresholdFar: 10
    thresholdNear: 3
-    stopThreshold: 0.1
+    stopThreshold: 0.5
    followUpdateInterval: 0.1
    followerSpeedMultiplier: 0.9
    heldIconDisplayHeight: 2