small fixes

Assets/_Game/Data/Player Data/PlayerState.asset

@@ -12,14 +12,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 353b156b7c59b1c45a8767d7500b31fb, type: 3}
   m_Name: PlayerState
   m_EditorClassIdentifier: 
-  currentInfusedElement: 1
+  currentInfusedElement: 0
   currentMoveState:
     jumpForce: 15
     smoothing: 0.03
     airControl: 1
     canSwim: 1
-    moveSpeed: 20
-    maxJumpCount: 2
+    moveSpeed: 30
+    maxJumpCount: 1
     mass: 1
     gravity: 3
   movementStates: {fileID: 11400000, guid: c757aad6925b37a46b916f609fa9012b, type: 2}

Assets/_Game/Graphics/Sprite/SavePoint.meta

-fileFormatVersion: 2
-guid: bc43ac6a6d9af5e44b800027e40c1e84
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/_Game/Scenes/Pick_Up_Test_Scene.unity

@@ -378,36 +378,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 615b74be12ac7ec4e9b491a7ef5cbbe1, type: 3}
---- !u!1 &392034771
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 392034772}
-  m_Layer: 0
-  m_Name: WaterAttackSpawner
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &392034772
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 392034771}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.75, y: -0.375, z: 0}
-  m_LocalScale: {x: 1, y: 0.5, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1876157337}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &531909445
 GameObject:
   m_ObjectHideFlags: 0
@@ -559,6 +529,101 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 599519593b27fd2448e33dcb9f69045b, type: 3}
+--- !u!1001 &671048602
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_Name
+      value: Player
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
+        type: 3}
+      propertyPath: r_State
+      value: 
+      objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
+        type: 2}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228603, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: launchPower
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228604, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228605, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 352228606, guid: 2e3528907311e438dab0d393127aa332, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
 --- !u!1001 &1343459453
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -768,7 +833,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1685552533
 GameObject:
@@ -839,259 +904,3 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
---- !u!1001 &1711059647
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Name
-      value: Player
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Layer
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362284, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_GravityScale
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 1.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Color.r
-      value: 0.27959237
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Color.g
-      value: 0.5947245
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362290, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Color.b
-      value: 0.9716981
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_MovementSmoothing
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_JumpForce
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_AirControl
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_Speed
-      value: 40
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: m_MaxJumpCount
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 52145075018362291, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: r_State
-      value: 
-      objectReference: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639,
-        type: 2}
-    - target: {fileID: 6060985002925283250, guid: 2e3528907311e438dab0d393127aa332,
-        type: 3}
-      propertyPath: lowJumpMultiplier
-      value: 2
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 2e3528907311e438dab0d393127aa332, type: 3}
---- !u!1 &1876157326 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 52145075018362288, guid: 2e3528907311e438dab0d393127aa332,
-    type: 3}
-  m_PrefabInstance: {fileID: 1711059647}
-  m_PrefabAsset: {fileID: 0}
---- !u!114 &1876157327
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1876157326}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: adc21094da13d8649a490855a137565f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cooldown: 3
-  volleySize: 1
-  launchPower: 10
-  attackSpeed: 0.1
-  shotSpawn: {fileID: 392034772}
-  elementalAttack: {fileID: 7588789901055592565, guid: c916ffaff3c476b448f67d9d827b3e7e,
-    type: 3}
---- !u!114 &1876157328
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1876157326}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 83eb4399ff535ee4cbc76de3b8a32e46, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cooldown: 0
-  volleySize: 10
-  launchPower: 10
-  attackSpeed: 0.1
-  shotSpawn: {fileID: 1992150795}
-  fireBall: {fileID: 1870586037468468, guid: 61411254df3161c4e81f6c0a4f2cd33c, type: 3}
---- !u!114 &1876157329
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1876157326}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ad90db0185377664288543ce4696c6b8, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cooldown: 0
-  massIncrease: 0
-  isStomping: 0
---- !u!114 &1876157330
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1876157326}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5a8392b2d467dfc428ede6cd785337f2, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  weight: 0
-  isPerformingAction: 0
-  windAttack: {fileID: 0}
-  Cooldown: 0
-  attackRange: 0
-  firePower: 0
---- !u!114 &1876157331
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1876157326}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2f8415a7fda2c084e87b3caa1b43ffbf, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  state: {fileID: 11400000, guid: c5777bcc7b64ce24c9bd65d2c4b7c639, type: 2}
-  onElementChanged: {fileID: 0}
---- !u!4 &1876157337 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 52145075018362285, guid: 2e3528907311e438dab0d393127aa332,
-    type: 3}
-  m_PrefabInstance: {fileID: 1711059647}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &1992150794
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1992150795}
-  m_Layer: 0
-  m_Name: FireAttackSpawner
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1992150795
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1992150794}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.05, y: 0.1, z: 0}
-  m_LocalScale: {x: 1, y: 0.5, z: 1}
-  m_Children: []
-  m_Father: {fileID: 1876157337}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/_Game/Scripts/Scriptable Object/ElementGameEventListener.cs

-using System;
+ using System;
 using UnityEngine;
 using UnityEngine.Events;