Attack system overhaul

4 年前 · 28d4d3bb
--- a/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
+++ b/UOP1_Project/Assets/Art/Characters/PigChef/Animation/PigChef.controller
    m_DefaultFloat: 0
    m_DefaultInt: 0
    m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
  m_IsExit: 0
  serializedVersion: 3
  m_TransitionDuration: 0.2348699
-  m_TransitionOffset: 0.0075354627
-  m_ExitTime: 0.5359604
+  m_TransitionOffset: 0.24913041
+  m_ExitTime: 0.48797604
  m_HasExitTime: 1
  m_HasFixedDuration: 1
  m_InterruptionSource: 0
--- a/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PigChef.prefab
    appendConditionsInfo: 1
    appendActionsInfo: 1
    currentState: 
+--- !u!114 &1144843397063430348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 309633228405838073}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b11d8701791e30b4f8c6dd812db00c7e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _attackCollider: {fileID: 2561880875395320411}
 --- !u!114 &2879436914502920953
 MonoBehaviour:
  m_ObjectHideFlags: 0
  _walkingParticles: {fileID: 4559447277278735044}
  _landParticles: {fileID: 334012115255375375}
  _jumpParticles: {fileID: 4839788363397376542}
--- !u!114 &1144843397063430348
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 309633228405838073}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b11d8701791e30b4f8c6dd812db00c7e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _attack: {fileID: 2950959790634801748}
 --- !u!1 &648091144661104905
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 7980046698497209273}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &1505046488474153364
-Rigidbody:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700848795901119205}
-  serializedVersion: 2
-  m_Mass: 1
-  m_Drag: 0
-  m_AngularDrag: 0.05
-  m_UseGravity: 1
-  m_IsKinematic: 1
-  m_Interpolate: 0
-  m_Constraints: 0
-  m_CollisionDetection: 0
--- !u!114 &2950959790634801748
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2700848795901119205}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 37d3da059d8e76b439a7bd852dfb1f1f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _attackConfigSO: {fileID: 11400000, guid: b8283b4a85847b44993fc5a971db3ac8, type: 2}
 --- !u!1 &2346068202725057742
 GameObject:
  m_ObjectHideFlags: 0
  m_Father: {fileID: 3060529613368993013}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2561880875395320411
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 56102838567927026}
+  - component: {fileID: 3435397776763518371}
+  - component: {fileID: 1939696983541285805}
+  - component: {fileID: 2783981964076607075}
+  m_Layer: 0
+  m_Name: AttackCollider
+  m_TagString: Player
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &56102838567927026
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2561880875395320411}
+  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_Children: []
+  m_Father: {fileID: 3328308589114298463}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!136 &3435397776763518371
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2561880875395320411}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.091426246
+  m_Height: 1.1348616
+  m_Direction: 1
+  m_Center: {x: -0.01, y: -0.011085637, z: -0.02}
+--- !u!54 &1939696983541285805
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2561880875395320411}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &2783981964076607075
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2561880875395320411}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37d3da059d8e76b439a7bd852dfb1f1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _attackConfigSO: {fileID: 11400000, guid: b8283b4a85847b44993fc5a971db3ac8, type: 2}
 --- !u!1 &3054586532798924688
 GameObject:
  m_ObjectHideFlags: 0
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: c478a391cfbc4b74ebda3f9a57283705, type: 3}
--- !u!4 &5700738674217691736 stripped
+--- !u!4 &7450739070704029045 stripped
-  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8613994902604584134 stripped
+--- !u!4 &436620074108784059 stripped
-  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4150588075678938521 stripped
+--- !u!4 &4758616446005709032 stripped
-  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2553538599320838613 stripped
+--- !u!4 &8637924750589673304 stripped
-  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6238229487294904517 stripped
+--- !u!4 &9124457888259134664 stripped
-  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -707639030120515232, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &3509300304837266133 stripped
+--- !u!4 &3618315963565927926 stripped
-  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4232177642318348382, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1693530112229282522 stripped
+--- !u!4 &985740358872296520 stripped
-  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2961255287932742051 stripped
+--- !u!4 &6915316659346450001 stripped
-  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4323982477642669181 stripped
+--- !u!4 &1923828950100165288 stripped
-  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7422665375057060625 stripped
+--- !u!4 &5715074524044649684 stripped
-  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5616668664904030341 stripped
+--- !u!4 &5745820188237013370 stripped
-  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4093735697823429422, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8764961453140708844 stripped
+--- !u!4 &8982674315347795983 stripped
-  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -854066939871359577, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5352552595453864673 stripped
+--- !u!4 &8132278368170902139 stripped
-  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -552033998009847853, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8865730958858592416 stripped
+--- !u!4 &1451216263893667083 stripped
-  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -7156605088127885149, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &313519885195136893 stripped
+--- !u!4 &8237582483159280860 stripped
-  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1780510391696116336 stripped
+--- !u!4 &8001623918027809885 stripped
-  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7459679077848680949, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &3597017886523096375 stripped
+--- !u!4 &4078477855462155147 stripped
-  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5758755827412709853, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &996919128022108076 stripped
+--- !u!4 &1150530919496827069 stripped
-  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 538991392088845589, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7980046698497209273 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!1 &309633228405838073 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5338329370284706551 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &722022415557853372 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &2973733550900446787 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &8001623918027809885 stripped
+--- !u!4 &1083073290189785667 stripped
-  m_CorrespondingSourceObject: {fileID: 7459679077848680949, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4078477855462155147 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -5758755827412709853, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!137 &2643181883930254223 stripped
+SkinnedMeshRenderer:
+  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1150530919496827069 stripped
+--- !u!4 &7479199366626129125 stripped
-  m_CorrespondingSourceObject: {fileID: 538991392088845589, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8132278368170902139 stripped
+--- !u!4 &489423445654532973 stripped
-  m_CorrespondingSourceObject: {fileID: -552033998009847853, guid: c478a391cfbc4b74ebda3f9a57283705,
-    type: 3}
-  m_PrefabInstance: {fileID: 616254372594363816}
-  m_PrefabAsset: {fileID: 0}
--- !u!4 &8982674315347795983 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -854066939871359577, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &1451216263893667083 stripped
+--- !u!4 &8916725356198928834 stripped
-  m_CorrespondingSourceObject: {fileID: -7156605088127885149, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5745820188237013370 stripped
+--- !u!4 &8291487101514034000 stripped
-  m_CorrespondingSourceObject: {fileID: -4093735697823429422, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5715074524044649684 stripped
+--- !u!4 &5700738674217691736 stripped
-  m_CorrespondingSourceObject: {fileID: 5178407201426131324, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 5156753003295213552, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5337852870612368657 stripped
+--- !u!4 &8613994902604584134 stripped
-  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 9153124993310210414, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1923828950100165288 stripped
+--- !u!4 &4150588075678938521 stripped
-  m_CorrespondingSourceObject: {fileID: -7908408724013584640, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3536655889091270705, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6915316659346450001 stripped
+--- !u!4 &5337852870612368657 stripped
-  m_CorrespondingSourceObject: {fileID: 6302017792269552633, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4422890038042128199, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &985740358872296520 stripped
+--- !u!4 &2553538599320838613 stripped
-  m_CorrespondingSourceObject: {fileID: 370260214279946720, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6061108676553290627, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &3618315963565927926 stripped
+--- !u!4 &6238229487294904517 stripped
-  m_CorrespondingSourceObject: {fileID: 4232177642318348382, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6782355879607981421, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &9124457888259134664 stripped
+--- !u!4 &3509300304837266133 stripped
-  m_CorrespondingSourceObject: {fileID: -707639030120515232, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5170437905352857731, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8637924750589673304 stripped
+--- !u!4 &1693530112229282522 stripped
-  m_CorrespondingSourceObject: {fileID: 9182121511924208368, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6985715532588761230, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!1 &309633228405838073 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!4 &2961255287932742051 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2419873259462771723, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &1083073290189785667 stripped
+--- !u!4 &4323982477642669181 stripped
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5436760431573913131, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &4758616446005709032 stripped
+--- !u!4 &7422665375057060625 stripped
-  m_CorrespondingSourceObject: {fileID: -3853004972517743296, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8038919574753283769, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &436620074108784059 stripped
+--- !u!4 &5616668664904030341 stripped
-  m_CorrespondingSourceObject: {fileID: 1045485693096927251, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4215639240221346515, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7450739070704029045 stripped
+--- !u!4 &8764961453140708844 stripped
-  m_CorrespondingSourceObject: {fileID: -1158771302699065123, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8155462669016834116, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5944104996185666453 stripped
+--- !u!4 &5352552595453864673 stripped
-  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -4411990312409643191, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &9049048348530379419 stripped
+--- !u!4 &8865730958858592416 stripped
-  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8323785998403603720, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &928224351994020785 stripped
+--- !u!4 &313519885195136893 stripped
-  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8298805101869964587, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6905220490405268265 stripped
+--- !u!4 &1780510391696116336 stripped
-  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -8054471524138817576, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2518796056843120514 stripped
+--- !u!4 &3597017886523096375 stripped
-  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 4136077574930157727, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &9121043209303941797 stripped
+--- !u!4 &996919128022108076 stripped
-  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 385238895606393348, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!137 &2643181883930254223 stripped
-SkinnedMeshRenderer:
-  m_CorrespondingSourceObject: {fileID: -6042959897766808025, guid: c478a391cfbc4b74ebda3f9a57283705,
+--- !u!4 &7980046698497209273 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7364425696442113553, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5338329370284706551 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4424524600484927649, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6251068571708505270 stripped
+--- !u!4 &722022415557853372 stripped
-  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 182470111581875476, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &2680419760045213584 stripped
+--- !u!4 &8520217290748661238 stripped
-  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &6924639228666418553 stripped
+--- !u!4 &8731736048503314800 stripped
-  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8746458819780820913 stripped
+--- !u!4 &2669244628279071469 stripped
-  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &5328577669981913599 stripped
+--- !u!4 &7103292230657876148 stripped
-  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8916725356198928834 stripped
+--- !u!4 &6856479198010907045 stripped
-  m_CorrespondingSourceObject: {fileID: -922126996795814806, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &6856479198010907045 stripped
+--- !u!4 &2973733550900446787 stripped
-  m_CorrespondingSourceObject: {fileID: 6316997315383997453, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -6788698156879991829, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7103292230657876148 stripped
+--- !u!4 &5328577669981913599 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4719641836314782807, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8746458819780820913 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8209158195610554905, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6924639228666418553 stripped
-  m_CorrespondingSourceObject: {fileID: -1576657136440373988, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 7535686175401523409, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &7479199366626129125 stripped
+--- !u!4 &2680419760045213584 stripped
-  m_CorrespondingSourceObject: {fileID: 8018118334481897805, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 3296533255824239160, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &489423445654532973 stripped
+--- !u!4 &6251068571708505270 stripped
-  m_CorrespondingSourceObject: {fileID: 1028975834724622021, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2428247613635587810, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
--- !u!4 &2669244628279071469 stripped
+--- !u!4 &9121043209303941797 stripped
-  m_CorrespondingSourceObject: {fileID: -5942939723840012475, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 8509855438106808077, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8731736048503314800 stripped
+--- !u!4 &2518796056843120514 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3060741017273451050, guid: c478a391cfbc4b74ebda3f9a57283705,
+    type: 3}
+  m_PrefabInstance: {fileID: 616254372594363816}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6905220490405268265 stripped
-  m_CorrespondingSourceObject: {fileID: 8187609794124182744, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 6294103071620228737, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8520217290748661238 stripped
+--- !u!4 &928224351994020785 stripped
-  m_CorrespondingSourceObject: {fileID: -94429984831856546, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: 318866306700684825, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8237582483159280860 stripped
+--- !u!4 &9049048348530379419 stripped
-  m_CorrespondingSourceObject: {fileID: 8853132977705894260, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -785370636125362381, guid: c478a391cfbc4b74ebda3f9a57283705,
--- !u!4 &8291487101514034000 stripped
+--- !u!4 &5944104996185666453 stripped
-  m_CorrespondingSourceObject: {fileID: -316334440819292424, guid: c478a391cfbc4b74ebda3f9a57283705,
+  m_CorrespondingSourceObject: {fileID: -2670401387866497475, guid: c478a391cfbc4b74ebda3f9a57283705,
    type: 3}
  m_PrefabInstance: {fileID: 616254372594363816}
  m_PrefabAsset: {fileID: 0}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 2805eb0b3dc773b4a8d0d171134e062c, type: 3}
--- !u!1 &2700848795901119205 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 4112729716880871686, guid: 2805eb0b3dc773b4a8d0d171134e062c,
+--- !u!4 &3328308589114298463 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 3627800475418545084, guid: 2805eb0b3dc773b4a8d0d171134e062c,
    type: 3}
  m_PrefabInstance: {fileID: 2046901735864851427}
  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/PlantCritter.prefab
  isPlayerInAlertZone: 0
  isPlayerInAttackZone: 0
  currentTarget: {fileID: 0}
+--- !u!114 &1889831287862199189
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8745063237678790951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b11d8701791e30b4f8c6dd812db00c7e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _attackCollider: {fileID: 4216333156615661930}
 --- !u!114 &5224987954583862020
 MonoBehaviour:
  m_ObjectHideFlags: 0
  _getHitEffectSO: {fileID: 11400000, guid: b025ed16ca528cd4da2ec4afe52db2d4, type: 2}
  _mainMeshRenderer: {fileID: 855856000742017355}
  _droppableRewardSO: {fileID: 11400000, guid: 6158158d6ef9a3d47827f7851295bcef, type: 2}
--- !u!114 &1889831287862199189
+--- !u!114 &7815649186505158594
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
-  m_Enabled: 1
+  m_Enabled: 0
-  m_Script: {fileID: 11500000, guid: b11d8701791e30b4f8c6dd812db00c7e, type: 3}
+  m_Script: {fileID: 11500000, guid: b2d8418b0b9634b1892b0268dd9c2743, type: 3}
-  _attack: {fileID: 5383258290465724991}
+  boneShape: 1
+  drawBones: 1
+  drawTripods: 0
+  boneSize: 1
+  tripodSize: 1
+  boneColor: {r: 0, g: 0, b: 1, a: 0.5}
+  m_Transforms:
+  - {fileID: 4188975802292468309}
+  - {fileID: 7234782137268576505}
+  - {fileID: 4599535222794758831}
+  - {fileID: 2333203040040827346}
+  - {fileID: 3449803262824529501}
+  - {fileID: 5604265818896575681}
+  - {fileID: 1448319098836265727}
+  - {fileID: 2141545069302126356}
+  - {fileID: 5093156719673898483}
+  - {fileID: 5541210816209986875}
+  - {fileID: 6492212199389777660}
+  - {fileID: 1833594675884105159}
+  - {fileID: 8923232597102945876}
+  - {fileID: 4298065697403911377}
+  - {fileID: 7492415303597500717}
+  - {fileID: 3367916164164828314}
+  - {fileID: 7900849304968062265}
+  - {fileID: 2154738241042901890}
+  - {fileID: 1577963483032510801}
+  - {fileID: 7618537762606215315}
+  - {fileID: 883400021584321324}
+  - {fileID: 2638366578443283257}
+  - {fileID: 5123279322988003801}
+  - {fileID: 5833845725013369579}
+  - {fileID: 699210089534170155}
+  - {fileID: 7337735862227476469}
+  - {fileID: 1821607689904002344}
 --- !u!1001 &4629040063581857200
 PrefabInstance:
  m_ObjectHideFlags: 0
    - target: {fileID: -8049899988642145405, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -45.332375
+      value: 16.71938
-      value: 23.118322
+      value: 12.214222
-      value: -7.9019136
+      value: 4.1145024
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -3.7621816e-19
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0014999991
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9991057
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.006291443
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.00000004689561
+      objectReference: {fileID: 0}
+    - target: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.041812774
-      value: 21.510841
+      value: -3.466
-      value: -2.8930762
+      value: -1.11
-      value: 4.5766134
+      value: 4.8640003
+      objectReference: {fileID: 0}
+    - target: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.42768928
+      objectReference: {fileID: 0}
+    - target: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.29555288
+      objectReference: {fileID: 0}
+    - target: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.68786556
+      objectReference: {fileID: 0}
+    - target: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.5065287
      objectReference: {fileID: 0}
    - target: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      objectReference: {fileID: 0}
    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -5.5359906e-10
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.0007148572
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.00128085
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.8733731
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.48705178
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.0000012488764
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.0000009093364
+      objectReference: {fileID: 0}
+    - target: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
-      value: -85.697975
+      value: -58.40144
-      value: -179.9978
+      value: -0.0003117684
-      value: 179.99785
+      value: 0.00029003454
-      value: 72.76993
+      value: 54.212597
-      value: 65.12152
+      value: 36.3535
-      value: 75.654755
+      value: 42.180702
-      value: -0.00004816352
+      value: -0.000048035112
-      value: -0.00004276867
+      value: -0.000042930456
      objectReference: {fileID: 0}
    - target: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: -3870551865322967335, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -0.720354
+      value: -0.7203539
-      value: 0.030121585
+      value: 0.030121546
      objectReference: {fileID: 0}
    - target: {fileID: -3870551865322967335, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 1.3124862
+      value: 0.018424967
-      value: -25.091242
+      value: -0.32037112
-      value: -49.330902
+      value: -49.021446
-      value: -0.7198933
+      value: -0.71989334
-      value: 0.030210676
+      value: 0.030210769
      objectReference: {fileID: 0}
    - target: {fileID: -2196441651781931383, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: -1718802088460758174, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 1.8499092
+      value: 0.025982928
-      value: 26.44861
+      value: 0.3348378
-      value: 48.72076
+      value: 48.260117
      objectReference: {fileID: 0}
    - target: {fileID: -108859347475657411, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 1029193162744603170, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: 32.331055
+      value: 66.620094
-      value: -11.734205
+      value: 5.5820904
-      value: 8.81739
+      value: 30.282389
      objectReference: {fileID: 0}
    - target: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 3424184763994540682, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -13.612426
+      value: -17.183525
-      value: 103.49201
+      value: 83.43164
-      value: 52.997936
+      value: 106.95964
      objectReference: {fileID: 0}
    - target: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: -0.000014063178
+      value: -0.000014127493
      objectReference: {fileID: 0}
    - target: {fileID: 5836807036472995663, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 5836807036472995663, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: -0.16106635
+      value: -0.16106664
-      value: 0.38635758
+      value: 0.3863573
-      value: 0.000040839575
+      value: 0.000041105137
-      value: -0.000049223487
+      value: -0.00004903806
      objectReference: {fileID: 0}
    - target: {fileID: 6520636896438483499, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.73167837
+      objectReference: {fileID: 0}
+    - target: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.008423374
+      objectReference: {fileID: 0}
+    - target: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.6811926
+      objectReference: {fileID: 0}
+    - target: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.02350483
+      objectReference: {fileID: 0}
+    - target: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
-      value: 12.180236
+      value: 34.533924
-      value: -85.24309
+      value: -79.73823
-      value: 6.288136
+      value: 20.223463
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.00024754665
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0029519305
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.0000853763
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.4978962
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.86621714
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.038640026
+      objectReference: {fileID: 0}
+    - target: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.01655936
-      value: 54.348297
+      value: 61.605762
-      value: -176.32777
+      value: -50.39878
-      value: -172.51015
+      value: -172.0975
-      value: -11.398729
+      value: -58.400543
-      value: -85.32961
+      value: 11.05912
-      value: -5.8720756
+      value: -128.38173
      objectReference: {fileID: 0}
    - target: {fileID: 8417361359673230750, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
    - target: {fileID: 8781925660957204314, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
-      value: -67.510216
+      value: -42.47463
-      value: -139.38078
+      value: -17.062664
-      value: 142.70969
+      value: 16.787605
      objectReference: {fileID: 0}
    - target: {fileID: 8879528566716807029, guid: 415e24332f8993c4da4c452ed27d2873,
        type: 3}
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 415e24332f8993c4da4c452ed27d2873, type: 3}
+--- !u!4 &7900849304968062265 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1745331680755163471, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2154738241042901890 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7528600739965906932, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1577963483032510801 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6952379229305972007, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &883400021584321324 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8781925660957204314, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2638366578443283257 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5836807036472995663, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7337735862227476469 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8049899988642145405, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1821607689904002344 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -1379654041943944866, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7618537762606215315 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5833845725013369579 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2695446951548987037, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &699210089534170155 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8946904926415183965, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8221149608678237085 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8745063237678790951 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &8221149608678237085 stripped
+--- !u!4 &5123279322988003801 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5583242968700353105, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4188975802292468309 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5746564759562468899, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &6492212199389777660 stripped
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 415e24332f8993c4da4c452ed27d2873,
+  m_CorrespondingSourceObject: {fileID: 3424184763994540682, guid: 415e24332f8993c4da4c452ed27d2873,
--- !u!4 &7618537762606215315 stripped
+--- !u!4 &1833594675884105159 stripped
-  m_CorrespondingSourceObject: {fileID: -7194598512780364571, guid: 415e24332f8993c4da4c452ed27d2873,
+  m_CorrespondingSourceObject: {fileID: 7849741006751160753, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8923232597102945876 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1029193162744603170, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4298065697403911377 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -3587092341587183449, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &4599535222794758831 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -3870551865322967335, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7234782137268576505 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7927811463243438961, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3449803262824529501 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6520636896438483499, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5604265818896575681 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5162383639822505801, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &1448319098836265727 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -2196441651781931383, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2141545069302126356 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -1718802088460758174, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2333203040040827346 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -3027282400719110748, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5541210816209986875 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4142054500885684557, guid: 415e24332f8993c4da4c452ed27d2873,
    type: 3}
  m_PrefabInstance: {fileID: 8475173613595968630}
  m_PrefabAsset: {fileID: 0}
    type: 3}
  m_PrefabInstance: {fileID: 8475173613595968630}
  m_PrefabAsset: {fileID: 0}
+--- !u!4 &7492415303597500717 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -7897143885434458789, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &3367916164164828314 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6566495199314442476, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &5093156719673898483 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -5533980067985051259, guid: 415e24332f8993c4da4c452ed27d2873,
+    type: 3}
+  m_PrefabInstance: {fileID: 8475173613595968630}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/SlimeCritter_Base.prefab
  m_Script: {fileID: 11500000, guid: b11d8701791e30b4f8c6dd812db00c7e, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _attack: {fileID: 4088571348706217679}
+  _attackCollider: {fileID: 3916043639789646247}
 --- !u!114 &4341850141098197772
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/UOP1_Project/Assets/Prefabs/Items/WalkingCane.prefab
+++ b/UOP1_Project/Assets/Prefabs/Items/WalkingCane.prefab
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!136 &969440480837226763
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4112729716880871686}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.091426246
-  m_Height: 1.1348616
-  m_Direction: 1
-  m_Center: {x: -0.01, y: -0.011085637, z: -0.02}
 --- !u!1001 &3878215223713049687
 PrefabInstance:
  m_ObjectHideFlags: 0
    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
        type: 3}
      propertyPath: m_LocalPosition.x
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
        type: 3}
-
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
-        type: 3}
-      propertyPath: m_RootOrder
      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: c5d242d6bd84e46af8b2bb85418929ef,
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: c5d242d6bd84e46af8b2bb85418929ef, type: 3}
--- !u!1 &4112729716880871686 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c5d242d6bd84e46af8b2bb85418929ef,
-    type: 3}
-  m_PrefabInstance: {fileID: 3878215223713049687}
-  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
+++ b/UOP1_Project/Assets/Scenes/WIP/TestingGround.unity
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloaded.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloaded.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 0d5f6fd99b3b3b54c8d565fdfc894d1f, type: 3}
-  m_Name: IsAttackReloadedCondition
+  m_Name: IsAttackReloaded
-  cacheResult: 1
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/PlantCritter_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/PlantCritter/PlantCritter_TransitionTable.asset
  - FromState: {fileID: 11400000, guid: 1de353704da8d97478d3bff49358e322, type: 2}
    ToState: {fileID: 11400000, guid: 4761dfa82bc2730428ddeb4b90bf2dee, type: 2}
    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 27c06ead5f7a1ed4d89197fe9a61d0c2, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 1
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
-      Operator: 0
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 879aebdccfac8334089096e432810559, type: 2}
    ToState: {fileID: 11400000, guid: 4761dfa82bc2730428ddeb4b90bf2dee, type: 2}
    Conditions:
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 1
    - ExpectedResult: 1
      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/SlimeRockCritter_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/SlimeRockCritter/SlimeRockCritter_TransitionTable.asset
  - FromState: {fileID: 11400000, guid: 0fe0dc68c0fc2604ca06ad36d16b1117, type: 2}
    ToState: {fileID: 11400000, guid: ea7a8e48b1a87c241bb721da98d1d812, type: 2}
    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 27c06ead5f7a1ed4d89197fe9a61d0c2, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: ea7a8e48b1a87c241bb721da98d1d812, type: 2}
    ToState: {fileID: 11400000, guid: 05826b0374eccc245b9b1da390ab7d04, type: 2}
    Conditions:
+    - ExpectedResult: 1
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 0
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
      Operator: 0
+    - ExpectedResult: 0
+      Condition: {fileID: 11400000, guid: 72dd7a9972bd3614ead2fd62cebc6144, type: 2}
+      Operator: 1
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 05826b0374eccc245b9b1da390ab7d04, type: 2}
    ToState: {fileID: 11400000, guid: ea7a8e48b1a87c241bb721da98d1d812, type: 2}
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: fa8a674126a68004888ee6cef86cb5f5, type: 2}
      Operator: 0
-  - FromState: {fileID: 11400000, guid: 05826b0374eccc245b9b1da390ab7d04, type: 2}
-    ToState: {fileID: 11400000, guid: 0fe0dc68c0fc2604ca06ad36d16b1117, type: 2}
-    Conditions:
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 27c06ead5f7a1ed4d89197fe9a61d0c2, type: 2}
-      Operator: 0
-    - ExpectedResult: 1
-      Condition: {fileID: 11400000, guid: 3d30788033cfd9d4fa24fa5112d9430c, type: 2}
-      Operator: 0
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttack.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttack.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 6f0c74685e74c2546a191f9f99c8b4f8, type: 3}
-  m_Name: IsHoldingAttackAction
+  m_Name: IsHoldingAttack
-  cacheResult: 1
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsThisDead.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsThisDead.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 53e847bca5e64154c9c78ff8acbbe27e, type: 3}
-  m_Name: IsPlayerKilled
+  m_Name: IsThisDead
-  cacheResult: 1
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/PigChef_TransitionTable.asset
      Condition: {fileID: 11400000, guid: 9c4a0f8b97247c643aef1b1284f21ebc, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
-    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
    ToState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
    Conditions:
    - ExpectedResult: 0
    Conditions:
    - ExpectedResult: 0
      Condition: {fileID: 11400000, guid: 9c4a0f8b97247c643aef1b1284f21ebc, type: 2}
-      Operator: 0
-  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
-    ToState: {fileID: 11400000, guid: ff92a93d8a8694247b507d811c88e402, type: 2}
-    Conditions:
-    - ExpectedResult: 0
-      Condition: {fileID: 11400000, guid: b33fba8c83df19f4ead430fbcc728687, type: 2}
      Operator: 0
  - FromState: {fileID: 11400000, guid: 027d32476800b3543b2f5446a59054c8, type: 2}
    ToState: {fileID: 11400000, guid: e128814ff6dbf63449bbc4dc8b6dc066, type: 2}
--- a/UOP1_Project/Assets/Scripts/Characters/Attack.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Attack.cs

 public class Attack : MonoBehaviour
 {
-	[SerializeField]
-	private AttackConfigSO _attackConfigSO;
+	[SerializeField] private AttackConfigSO _attackConfigSO;
-	public bool Enable { get; set; }
+	public AttackConfigSO AttackConfig => _attackConfigSO;
-	public AttackConfigSO AttackConfig => _attackConfigSO;
+	private void Awake()
+	{
+		gameObject.SetActive(false);
+	}
+	private void OnTriggerEnter(Collider other)
+	{
+		// Avoid friendly fire!
+		if (!other.CompareTag(gameObject.tag))
+		{
+			if(other.TryGetComponent(out Damageable damageableComp))
+			{
+				if (!damageableComp.GetHit)
+					damageableComp.ReceiveAnAttack(_attackConfigSO.AttackStrength);
+			}
+		}
+	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/Attacker.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Attacker.cs

 public class Attacker : MonoBehaviour
 {
-	[SerializeField]
-	private Attack _attack;
+	[SerializeField] private GameObject _attackCollider;
-		_attack.Enable = true;
+		_attackCollider.SetActive(true);
-		_attack.Enable = false;
+		_attackCollider.SetActive(false);
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/Critter.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Critter.cs
-using UnityEngine;
+using System;
+using UnityEngine;
-	[HideInInspector] public GameObject currentTarget;
+	public Damageable currentTarget; //The StateMachine evaluates its health when needed
-		currentTarget = entered ? who : null;
+
+		if(entered && who.TryGetComponent(out Damageable d))
+		{
+			currentTarget = d;
+			currentTarget.OnDie += OnTargetDead;
+		}
+		else
+		{
+			currentTarget = null;
+		}
 	}

 	public void OnAttackTriggerChange(bool entered, GameObject who)
 		//No need to set the target. If we did, we would get currentTarget to null even if
 		//a target exited the Attack zone (inner) but stayed in the Alert zone (outer).
+	}
+
+	private void OnTargetDead()
+	{
+		currentTarget = null;
+		isPlayerInAlertZone = false;
+		isPlayerInAttackZone = false;
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/Damageable.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/Damageable.cs
 using UnityEngine;
-using UnityEngine.Localization;
+using UnityEngine.Events;
-	[SerializeField]
-	private HealthConfigSO _healthConfigSO;
-
-	[SerializeField]
-	private GetHitEffectConfigSO _getHitEffectSO;
-
-	[SerializeField]
-	private Renderer _mainMeshRenderer;
-
-	[SerializeField]
-	private DroppableRewardConfigSO _droppableRewardSO;
-
+	[SerializeField] private HealthConfigSO _healthConfigSO;
+	[SerializeField] private GetHitEffectConfigSO _getHitEffectSO;
+	[SerializeField] private Renderer _mainMeshRenderer;
+	[SerializeField] private DroppableRewardConfigSO _droppableRewardSO;
-	public bool getHit { get; set; }
-	public bool isDead { get; set; }
+	public bool GetHit { get; set; }
+	public bool IsDead { get; set; }

 	public GetHitEffectConfigSO GetHitEffectConfig => _getHitEffectSO;
 	public Renderer MainMeshRenderer => _mainMeshRenderer;
+	public UnityAction OnDie;
+
-	private void ReceiveAnAttack(int damange)
+	public void ReceiveAnAttack(int damage)
-		_currentHealth -= damange;
-		getHit = true;
+		_currentHealth -= damage;
+		GetHit = true;
-			isDead = true;
-		}
-	}
-
-	private void OnTriggerStay(Collider other)
-	{
-		// Avoid friendly fire!
-		if (!other.tag.Equals(gameObject.tag))
-		{
-			Attack attack = other.GetComponent<Attack>();
-			if (!getHit && attack != null && attack.Enable)
-			{
-				ReceiveAnAttack(attack.AttackConfig.AttackStrength);
-			}
+			IsDead = true;
+			if(OnDie != null) OnDie.Invoke();
 		}
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DestroyEntitySO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/DestroyEntitySO.cs

 	public override void OnStateEnter()
 	{
-		// Hack to force Collider Exit to be triggered before destroying an object.
-		_gameObject.transform.position += - Vector3.up * 1000;
 		GameObject.Destroy(_gameObject, 0.1f);
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ResetGetHitStateSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Actions/ResetGetHitStateSO.cs

 	public override void OnStateExit()
 	{
-		_damageableEntity.getHit = false;
+		_damageableEntity.GetHit = false;
 	}
 }
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsAttackReloadedConditionSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsAttackReloadedConditionSO.cs

 	public override void Awake(StateMachine stateMachine)
 	{
-		_reloadDuration = stateMachine.gameObject.GetComponentInChildren<Attack>().AttackConfig.AttackReloadDuration;
+		//TODO: Remove this. We don't need to rely on a timer hidden in the attack config of the weapon,
+		//since our attacks depend on the lenght of the animation anyway
+		_reloadDuration = stateMachine.gameObject.GetComponentInChildren<Attack>(true).AttackConfig.AttackReloadDuration;
 	}

 	public override void OnStateEnter()
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityGettingHitSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityGettingHitSO.cs
 		bool result = false;
 		if (_damageableEntity != null)
 		{
-			result = _damageableEntity.getHit;
+			result = _damageableEntity.GetHit;
 		}
 		return result;
 	}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsHoldingExtraActionConditionSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsHoldingExtraActionConditionSO.cs
-using UnityEngine;
+/* Unused. Kept for reference
+
+using UnityEngine;
 using UOP1.StateMachine;
 using UOP1.StateMachine.ScriptableObjects;

 		}
 	}
 }
+
+*/
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsTargetDead.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsTargetDead.asset
+%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: 793f9ef3e602bff4aa542fb04bda5923, type: 3}
+  m_Name: IsTargetDead
+  m_EditorClassIdentifier: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsTargetDead.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsTargetDead.asset.meta
+fileFormatVersion: 2
+guid: 72dd7a9972bd3614ead2fd62cebc6144
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsDeadConditionSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsDeadConditionSO.cs
+using UnityEngine;
+using UOP1.StateMachine;
+using UOP1.StateMachine.ScriptableObjects;
+
+[CreateAssetMenu(fileName = "IsDeadCondition", menuName = "State Machines/Conditions/Is Dead")]
+public class IsDeadConditionSO : StateConditionSO
+{
+	protected override Condition CreateCondition() => new IsDeadCondition();
+}
+
+public class IsDeadCondition : Condition
+{
+	private Damageable _damageableScript;
+
+	public override void Awake(StateMachine stateMachine)
+	{
+		_damageableScript = stateMachine.GetComponent<Damageable>();
+	}
+
+	protected override bool Statement()
+	{
+		return _damageableScript.IsDead;
+	}
+}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsTargetDeadConditionSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsTargetDeadConditionSO.cs
+using UnityEngine;
+using UOP1.StateMachine;
+using UOP1.StateMachine.ScriptableObjects;
+
+[CreateAssetMenu(fileName = "IsTargetDeadCondition", menuName = "State Machines/Conditions/Is Target Dead Condition")]
+public class IsTargetDeadConditionSO : StateConditionSO
+{
+	protected override Condition CreateCondition() => new IsTargetDeadCondition();
+}
+
+public class IsTargetDeadCondition : Condition
+{
+	private Critter _critterScript;
+
+	public override void Awake(StateMachine stateMachine)
+	{
+		_critterScript = stateMachine.GetComponent<Critter>();
+	}
+	
+	protected override bool Statement()
+	{
+		return _critterScript.currentTarget == null || _critterScript.currentTarget.IsDead;
+	}
+}
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsTargetDeadConditionSO.cs.meta
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsTargetDeadConditionSO.cs.meta
+fileFormatVersion: 2
+guid: 793f9ef3e602bff4aa542fb04bda5923
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingExtraAction.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingExtraAction.asset
-%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: 5a9702ec6c86b134b9ed9963dc30d7bc, type: 3}
-  m_Name: IsHoldingExtraAction
-  m_EditorClassIdentifier: 
-  cacheResult: 1
--- a/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingExtraAction.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingExtraAction.asset.meta
-fileFormatVersion: 2
-guid: b33fba8c83df19f4ead430fbcc728687
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityKilledHitSO.cs
+++ b/UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityKilledHitSO.cs
-using UnityEngine;
-using UOP1.StateMachine;
-using UOP1.StateMachine.ScriptableObjects;
-
-[CreateAssetMenu(fileName = "IsEntityKilledHit", menuName = "State Machines/Conditions/Is Entity Killed")]
-public class IsEntityKilledHitSO : StateConditionSO
-{
-	protected override Condition CreateCondition() => new IsEntityKilledHit();
-}
-
-public class IsEntityKilledHit : Condition
-{
-	private Damageable _damageableEntity;
-
-	public override void Awake(StateMachine stateMachine)
-	{
-		_damageableEntity = stateMachine.GetComponent<Damageable>();
-	}
-
-	protected override bool Statement()
-	{
-		bool result = false;
-		if (_damageableEntity != null)
-		{
-			result = _damageableEntity.isDead;
-		}
-		return result;
-	}
-}
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloadedCondition.asset.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloadedCondition.asset.meta
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloadedCondition.asset
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Critters/Conditions/IsAttackReloadedCondition.asset
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttackAction.asset.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttackAction.asset.meta
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsPlayerKilled.asset.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsPlayerKilled.asset.meta
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttackAction.asset
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsHoldingAttackAction.asset
--- a//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsPlayerKilled.asset
+++ b//UOP1_Project/Assets/ScriptableObjects/StateMachine/Protagonist/Conditions/IsPlayerKilled.asset
--- a//UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityKilledHitSO.cs.meta
+++ b//UOP1_Project/Assets/Scripts/Characters/StateMachine/Conditions/IsEntityKilledHitSO.cs.meta