Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/noellt/seedling into ChrisMerge

# Conflicts:
#	Assets/Scripts/Player/Life.cs

Assets/Animations/Enemies/Boss.controller

 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-7361144016951795927
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3239850326146635360}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-4697685811479879739
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4272770998389893544}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1102 &-3457506211566410077
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Scream
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -4697685811479879739}
+  - {fileID: -7361144016951795927}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 154707910191dc046bdc98ff51318ed8, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-3239850326146635360
 AnimatorState:
   serializedVersion: 5
@@ -21,7 +99,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: 7400000, guid: ae061a80adace2642bcdeff826433062, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -58,7 +136,7 @@ AnimatorStateTransition:
   m_Name: 
   m_Conditions:
   - m_ConditionMode: 1
-    m_ConditionEvent: Shoot
+    m_ConditionEvent: Shooting
     m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: -3239850326146635360}
@@ -83,8 +161,14 @@ AnimatorController:
   m_Name: Boss
   serializedVersion: 5
   m_AnimatorParameters:
-  - m_Name: Shoot
-    m_Type: 9
+  - m_Name: Shooting
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
+  - m_Name: Screaming
+    m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
@@ -102,6 +186,31 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
+--- !u!1101 &44643361807766355
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Screaming
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -3457506211566410077}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 0
 --- !u!1102 &4272770998389893544
 AnimatorState:
   serializedVersion: 5
@@ -144,12 +253,16 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -3239850326146635360}
     m_Position: {x: 560, y: -10, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -3457506211566410077}
+    m_Position: {x: 400, y: 120, z: 0}
   m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: 44643361807766355}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 660, y: -110, z: 0}
+  m_AnyStatePosition: {x: 100, y: 120, z: 0}
   m_EntryPosition: {x: 420, y: -110, z: 0}
   m_ExitPosition: {x: 420, y: 290, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}

Assets/Animations/Enemies/Grub.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-5483867590913447878
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 5461481135283783832}
+    m_Position: {x: 350, y: 120, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 5461481135283783832}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Grub
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -5483867590913447878}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &5461481135283783832
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 9b1fb66e5ba6f6a41a4d2998e4bc0d54, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

Assets/Animations/Enemies/Grub.controller.meta

+fileFormatVersion: 2
+guid: b65c7558fca376a4bbb80c16d39717ea
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Enemies/Plant.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-6895058575239100443
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: -6660207883356859849}
+    m_Position: {x: 240, y: 110, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 6872292951478088518}
+    m_Position: {x: 520, y: 110, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 810, y: 70, z: 0}
+  m_EntryPosition: {x: 400, y: -30, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: -6660207883356859849}
+--- !u!1102 &-6660207883356859849
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Idle
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -3145112351125929151}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 317184ad31d10404ebe8dacdee501a86, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &-3145112351125929151
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: Shooting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 6872292951478088518}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.75
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Plant
+  serializedVersion: 5
+  m_AnimatorParameters:
+  - m_Name: Shooting
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 9100000}
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -6895058575239100443}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &6872292951478088518
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Shoot
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 7124745023226381941}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: db9f1257fd0f4e4469fb753e0977c87c, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!1101 &7124745023226381941
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -6660207883356859849}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1

Assets/Animations/Enemies/Plant.controller.meta

+fileFormatVersion: 2
+guid: 3ac7e9324c6e3dd4d88edfa8a8de576d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 9100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Enemies/Sprites/BossScream.anim

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BossScream
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -8276748676086055486, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.1
+      value: {fileID: -6329600479915695759, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.2
+      value: {fileID: 4411069362413858296, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.3
+      value: {fileID: -6382625769524055035, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.4
+      value: {fileID: 7793191195364086458, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 2485900519473670312, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.6
+      value: {fileID: -4455610876299351405, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.7
+      value: {fileID: -189429130974904559, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.8
+      value: {fileID: -209075152864861492, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 0.9
+      value: {fileID: -2084790453616413385, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1
+      value: {fileID: 2782461134995732162, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.1
+      value: {fileID: -1546252716296144075, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.2
+      value: {fileID: -4691635414251713004, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.3
+      value: {fileID: 6792709445152534811, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.4
+      value: {fileID: -7090696810717628272, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.5
+      value: {fileID: 1031311295055210907, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.6
+      value: {fileID: -8614751627858138232, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.7
+      value: {fileID: -4160726730969842271, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.8
+      value: {fileID: -5552219789664268147, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 1.9
+      value: {fileID: -274387462500699282, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2
+      value: {fileID: 9115111232956753164, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.1
+      value: {fileID: -3274227118200353306, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.2
+      value: {fileID: -8765270399662710641, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.3
+      value: {fileID: -4068389725779008962, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.4
+      value: {fileID: -1220160544716536357, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.5
+      value: {fileID: -6038715925726317996, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.6
+      value: {fileID: -5203331352840137643, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.7
+      value: {fileID: 395177076303805171, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.8
+      value: {fileID: 7197524487287425188, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 2.9
+      value: {fileID: 312693785187331124, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 3
+      value: {fileID: -3064703129387485707, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 3.1
+      value: {fileID: 4183840375328283454, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    - time: 3.2
+      value: {fileID: 685506416902319271, guid: fa80593f660a54f4e847b92ca6592511,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 10
+  m_WrapMode: 0
+  m_Bounds: