Pull request #31: harvesters

Merge in CGD/gather-and-defend from feature/resourceSpawnWhenHarvested to main * commit '9889ca76a7a282f6a8e64d9d5d538a31ce6cf4e3': harvesters
2023-07-14 16:43:36 +00:00 · 2023-07-14 16:43:36 +00:00 · 9de78c62db
commit 9de78c62db
parent 1554bd2315 9889ca76a7
12 changed files with 652 additions and 57 deletions
--- a/Assets/Prefabs/baseArcher.prefab
+++ b/Assets/Prefabs/baseArcher.prefab
@ -174,8 +174,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: b28a7c5aeb45b224983f69339965c55d, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -290,8 +290,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: 155064a96fa9cb74b8acc3bab1afc1b5, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -406,8 +406,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: 155064a96fa9cb74b8acc3bab1afc1b5, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -643,7 +643,6 @@ MonoBehaviour:
  _speed: 0
  _attack_damage: 10
  _attack_speed: 2
-  _arrow: {fileID: 6962989255644195630, guid: 869a03bba705e8d4485aa73daad773dc, type: 3}
 --- !u!1 &6125909153338481476
 GameObject:
  m_ObjectHideFlags: 0
@ -714,8 +713,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 2
  m_Sprite: {fileID: 21300000, guid: 0079f356210180e4ba47d765126ddce2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -798,8 +797,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: dc3d93084bac5514b8590fbc9dfd0b5a, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -882,8 +881,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: e84af54fc0cd2a34faf8a2e9a550ba9b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1064,8 +1063,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 4
  m_Sprite: {fileID: 21300000, guid: 93f451b710e9c694db5f4b1578424ee2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1148,8 +1147,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 6
  m_Sprite: {fileID: 21300000, guid: 93f451b710e9c694db5f4b1578424ee2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1204,6 +1203,7 @@ GameObject:
  m_Component:
  - component: {fileID: 6125909154234938795}
  - component: {fileID: 6125909154234938792}
+  - component: {fileID: 5922700276807885449}
  m_Layer: 0
  m_Name: root
  m_TagString: Untagged
@ -1253,6 +1253,20 @@ Animator:
  m_AllowConstantClipSamplingOptimization: 1
  m_KeepAnimatorStateOnDisable: 0
  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &5922700276807885449
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6125909154234938794}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c0fbd934c179894458914437255781c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _entity: {fileID: 9177659942431061517}
+  _projectile: {fileID: 6962989255644195630, guid: 869a03bba705e8d4485aa73daad773dc, type: 3}
 --- !u!1 &6125909154266960117
 GameObject:
  m_ObjectHideFlags: 0
@ -1358,8 +1372,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 3
  m_Sprite: {fileID: 21300000, guid: 904f94aa9d4c87446a5a5b5827ffb32e, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1442,8 +1456,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 2
  m_Sprite: {fileID: 21300000, guid: a0a2648475cc14b4eab6cfea42ed9ef4, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1590,8 +1604,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 3
  m_Sprite: {fileID: 21300000, guid: 904f94aa9d4c87446a5a5b5827ffb32e, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Prefabs/baseProjectile.prefab
+++ b/Assets/Prefabs/baseProjectile.prefab
@ -180,8 +180,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 4
  m_Sprite: {fileID: 21300000, guid: b28a7c5aeb45b224983f69339965c55d, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Prefabs/farmerStick.prefab
+++ b/Assets/Prefabs/farmerStick.prefab
@ -72,7 +72,7 @@ Transform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5157279991943416622
 Animator:
-  serializedVersion: 4
+  serializedVersion: 5
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -89,7 +89,8 @@ Animator:
  m_WarningMessage: 
  m_HasTransformHierarchy: 1
  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!1 &5157279991946993315
 GameObject:
  m_ObjectHideFlags: 0
@ -192,8 +193,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 6
  m_Sprite: {fileID: 21300000, guid: 93f451b710e9c694db5f4b1578424ee2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -299,6 +300,9 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 5157279992115123225}
+  - component: {fileID: -3852588021827760540}
+  - component: {fileID: -6358718468452003836}
+  - component: {fileID: 6414742418917179956}
  m_Layer: 0
  m_Name: farmerStick
  m_TagString: Untagged
@ -323,6 +327,69 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &-3852588021827760540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5157279992115123224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c0051e3c39a18654fbc359fd2353010f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _hp: 10
+  _speed: 0
+  _attack_damage: 0
+  _attack_speed: 0
+--- !u!50 &-6358718468452003836
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5157279992115123224}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 0
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 4
+--- !u!61 &6414742418917179956
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5157279992115123224}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
 --- !u!1 &5157279992317039071
 GameObject:
  m_ObjectHideFlags: 0
@ -393,8 +460,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 4
  m_Sprite: {fileID: 21300000, guid: 93f451b710e9c694db5f4b1578424ee2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -510,8 +577,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 3
  m_Sprite: {fileID: 21300000, guid: 904f94aa9d4c87446a5a5b5827ffb32e, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -658,8 +725,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 2
  m_Sprite: {fileID: 21300000, guid: a0a2648475cc14b4eab6cfea42ed9ef4, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -742,8 +809,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 3
  m_Sprite: {fileID: 21300000, guid: 904f94aa9d4c87446a5a5b5827ffb32e, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -892,8 +959,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: e84af54fc0cd2a34faf8a2e9a550ba9b, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -976,8 +1043,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 5
  m_Sprite: {fileID: 21300000, guid: 19d0ab0c147a5b242b355602d32e172d, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1060,8 +1127,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 2
  m_Sprite: {fileID: 21300000, guid: 0079f356210180e4ba47d765126ddce2, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
@ -1144,8 +1211,8 @@ SpriteRenderer:
  m_AutoUVMaxDistance: 0.5
  m_AutoUVMaxAngle: 89
  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: 364159097
+  m_SortingLayer: 1
  m_SortingOrder: 3
  m_Sprite: {fileID: 21300000, guid: 99766a8fe0682f44bba10a369dee18d9, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
--- a/Assets/Scenes/Game.unity
+++ b/Assets/Scenes/Game.unity
@ -123,6 +123,141 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!1 &89453227
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 89453228}
+  - component: {fileID: 89453230}
+  - component: {fileID: 89453229}
+  m_Layer: 5
+  m_Name: Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &89453228
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 89453227}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1217068630}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 44.4, y: -5.1415}
+  m_SizeDelta: {x: 29.1063, y: 10.2831}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &89453229
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 89453227}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: melee
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 9.2
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 1
+  m_fontSizeMin: 0
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &89453230
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 89453227}
+  m_CullTransparentMesh: 1
 --- !u!1 &119018171
 GameObject:
  m_ObjectHideFlags: 0
@ -494,6 +629,7 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
+  - {fileID: 794776829}
  - {fileID: 1217068629}
  - {fileID: 984272484}
  m_Father: {fileID: 952122246}
@ -1475,6 +1611,328 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 633175823}
  m_CullTransparentMesh: 1
+--- !u!1001 &794776828
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 442237165}
+    m_Modifications:
+    - target: {fileID: 907652127959947826, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Name
+      value: Farmer
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 53.2464
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: cc83829c8925f1649879f8fbb02b1d8b, type: 3}
+    - target: {fileID: 907652128235033332, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652129260736052, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652129260736052, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652129260736052, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 907652129260736052, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 949180984095654406, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 949180984095654406, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 949180984095654406, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 949180984095654406, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1828595713600957353, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1828595713600957353, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1828595713600957353, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1828595713600957353, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923522898556396649, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923522898556396649, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923522898556396649, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1923522898556396649, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3154407583948094730, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3154407583948094730, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3154407583948094730, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3154407583948094730, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 5139721979244350189, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6264934827021399749, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6264934827021399749, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6264934827021399749, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6264934827021399749, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7106892478383455582, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 23
+      objectReference: {fileID: 0}
+    - target: {fileID: 7112938880036038065, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7424225105167539335, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7424225105167539335, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7424225105167539335, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7424225105167539335, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _food
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8434244523906479734, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+      propertyPath: _prefab
+      value: 
+      objectReference: {fileID: 5157279992115123224, guid: 85534a2d6c2add54d864073914646192, type: 3}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+--- !u!224 &794776829 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+  m_PrefabInstance: {fileID: 794776828}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &829543638
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -1734,7 +2192,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 2
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.x
@ -2476,7 +2934,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_RootOrder
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
      propertyPath: m_AnchorMax.x
@ -2777,6 +3235,11 @@ RectTransform:
  m_CorrespondingSourceObject: {fileID: 907652127959947829, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
  m_PrefabInstance: {fileID: 1217068628}
  m_PrefabAsset: {fileID: 0}
+--- !u!224 &1217068630 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 907652128235033330, guid: e20680474d73eee49836ff9cbc6d0b28, type: 3}
+  m_PrefabInstance: {fileID: 1217068628}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1276740227
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Ally/Harvester.cs
+++ b/Assets/Scripts/Ally/Harvester.cs
@ -0,0 +1,6 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+public class Harvester : Entity 
+{
+}
--- a/Assets/Scripts/Ally/Harvester.cs.meta
+++ b/Assets/Scripts/Ally/Harvester.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c0051e3c39a18654fbc359fd2353010f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs
+++ b/Assets/Scripts/Drag&Drop/GameObjectPlacementButton.cs
@ -10,9 +10,9 @@ public class GameObjectPlacementButton : UnitPlacementButton
        var instance = Instantiate(_prefab);

        //we need to fetch the detection size before stripping the object
-        var detectComp = instance.GetComponentInChildren<Detection>();
+        var detectComp = _prefab.GetComponentInChildren<Detection>();
        Rect detectionRect = default;
-        if(detectComp) detectionRect = instance.GetComponentInChildren<Detection>().DetectionRectangle;
+        if(detectComp) detectionRect = _prefab.GetComponentInChildren<Detection>().DetectionRectangle;

        //strip the object
        foreach (var r_body in instance.transform.GetAllComponents<Rigidbody2D>()) Destroy(r_body);
--- a/Assets/Scripts/Drag&Drop/ObjectPlaceholder.cs
+++ b/Assets/Scripts/Drag&Drop/ObjectPlaceholder.cs
@ -10,9 +10,10 @@ public class ObjectPlaceholder : DraggablePlaceholder
    public override bool CanBePlacedHere()
    {
        var objsOnPosition = LevelManager.Instance.GetAll<ILevelObject>(obj => obj.Position.IsContainedIn(transform.position));
-        var positionContainsFarm = objsOnPosition.Exists(obj => obj.Name.ToLower().Contains("farm"));
+        var positionIsCollidable = objsOnPosition.Exists(obj => obj.IsCollidable);

-        //either no object, or object is farm
-        return objsOnPosition.Count == 0 || (objsOnPosition.Count == 1 && positionContainsFarm);
+        return !positionIsCollidable 
+            && _lvlBoundsCache.Contains(transform.position)
+            && ResourceManager.Instance.EnoughFor(Rock, Wood, Food);
    }
 }
--- a/Assets/Scripts/LevelManager/LevelManager.cs
+++ b/Assets/Scripts/LevelManager/LevelManager.cs
@ -98,8 +98,6 @@ public class LevelManager : Singleton<LevelManager>

    public void UpdateLevel()
    {
-        _levelObjects.ForEach(levelObject => levelObject.LevelUpdate());
-
        var toAdd = new List<ILevelObject>(_toAdd);
        toAdd.ForEach(addedObject =>
        {
@ -115,7 +113,27 @@ public class LevelManager : Singleton<LevelManager>
            _levelObjects.Remove(removedObject);
            removedObject.LevelDestroy();
        });
-        toRemove.Clear();
+
+        _levelObjects.ForEach(levelObject =>
+        {
+            levelObject.LevelUpdate();
+        });
+
+        toAdd = new List<ILevelObject>(_toAdd);
+        toAdd.ForEach(addedObject =>
+        {
+            _toAdd.Remove(addedObject);
+            _levelObjects.Add(addedObject);
+            addedObject.LevelStart();
+        });
+
+        toRemove = new List<ILevelObject>(_toRemove);
+        toRemove.ForEach(removedObject =>
+        {
+            _toRemove.Remove(removedObject);
+            _levelObjects.Remove(removedObject);
+            removedObject.LevelDestroy();
+        });
    }

    public void ClearLevel()
--- a/Assets/Scripts/LevelManager/LevelObject.cs
+++ b/Assets/Scripts/LevelManager/LevelObject.cs
@ -10,7 +10,14 @@ public abstract class LevelObject : MonoBehaviour, ILevelObject
    public Vector3 Position { get => transform.position; protected set => transform.position = value; }
    public string Name { get => name; protected set => name = value; }

-    public bool IsCollidable => GetComponent<Collider2D>();
+    public bool IsCollidable
+    {
+        get
+        {
+            var collider = GetComponent<Collider2D>();
+            return collider && !collider.isTrigger;
+        }
+    }

    void Awake()
    {
--- a/Assets/Scripts/Tiles/ResourceTile.cs
+++ b/Assets/Scripts/Tiles/ResourceTile.cs
@ -21,6 +21,11 @@ public class ResourceTile : LevelTile

    public override void LevelUpdate()
    {
+        //check if there is an harvester unit on top
+        var hasFarmer = LevelManager.Instance.Get<Harvester>(x => x.Position.IsContainedIn(Position));
+        if (!hasFarmer) return;
+
+
        _yieldCounter += Time.deltaTime * _yieldSpeed;
        if (_yieldCounter < 1) return;
        if(_yieldPrefab != null)
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -44,9 +44,12 @@ TagManager:
  - name: paysage
    uniqueID: 436725303
    locked: 0
+  - name: Tiles
+    uniqueID: 2009948983
+    locked: 0
  - name: Default
    uniqueID: 0
    locked: 0
-  - name: Character
+  - name: Unit
    uniqueID: 364159097
    locked: 0