merge

Assets/Model/EventControlTile.cs

@@ -13,15 +13,17 @@ namespace Assets.Model
         public KeyCode keyCode;
         public Tile tile;
         public Tile successTile;
+        public Tile failTile;
         public Vector3Int position;
         public bool isPlusTile;
         public bool isPerformed;
 
-        public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position, bool isPlusTile = false)
+        public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Tile failTile, Vector3Int position, bool isPlusTile = false)
         {
             this.keyCode = keyCode;
             this.tile = tile;
             this.successTile = successTile;
+            this.failTile = failTile;
             this.position = position;
             this.isPlusTile = isPlusTile;
         }

Assets/Scripts/BugMovement.cs

@@ -7,8 +7,9 @@ public class BugMovement : MonoBehaviour
     [SerializeField] private float secondsGoingLeft = 1;
     [SerializeField] private float secondsGoingRight = 1;
     [SerializeField] private float movementSpeed = 10;
-    [SerializeField] BoxCollider2D playerCollider;
+    [SerializeField] Collider2D playerCollider;
     [SerializeField] EventControls eventControls;
+    [SerializeField] Player player;
 
     private int leftAccumalator = 0;
     private int rightAccumalator = 0;
@@ -25,7 +26,7 @@ public class BugMovement : MonoBehaviour
     private void Update()
     {
         if (HasEncounteredPlayer())
-            eventControls.TriggerEvent(playerCollider, GetComponent<BoxCollider2D>());
+            eventControls.TriggerEvent(playerCollider, GetComponent<Collider2D>(), player);
 
         var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft;
         var totalFramesGoingRight = framesPerSecond * secondsGoingRight;

Assets/Scripts/EventControls.cs

@@ -7,10 +7,11 @@ using UnityEngine.Tilemaps;
 
 public class EventControls : MonoBehaviour
 {
-    [SerializeField] private Player player; 
+    [SerializeField] private Player player;
     [SerializeField] private Camera camera;
     [SerializeField] private List<Tile> tiles;
     [SerializeField] private List<Tile> successTiles;
+    [SerializeField] private List<Tile> failTiles;
     [SerializeField] private Tile plusTile;
     [SerializeField] private float framesPerControlTile = 15;
     [SerializeField] private int nextControlYOffset = 0;
@@ -31,6 +32,7 @@ public class EventControls : MonoBehaviour
     private int eventCycleAccumalator = 0;
     private int tileMapClearDelayAccumalator = 0;
     private EventControlTile currentEventControl;
+    private bool isInBattle = false;
 
     private Collider2D currentPlayerCollider;
     private Collider2D currentEnemyCollider;
@@ -42,15 +44,16 @@ public class EventControls : MonoBehaviour
     private int framesPerSecond => 60;
     private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0);
 
-    public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider)
+    public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider, Player player)
     {
         currentPlayerCollider = playerCollider;
         currentEnemyCollider = enemyCollider;
 
-        player.DisablePlayerMovement();
+        player.StartEncounter();
         Physics2D.IgnoreCollision(playerCollider, enemyCollider, true);
 
         eventTriggered = true;
+        isInBattle = true;
     }
 
     public bool IsEventTriggered()
@@ -59,7 +62,7 @@ public class EventControls : MonoBehaviour
     }
 
     private void Start()
-    { 
+    {
         tilemap = GetComponent<Tilemap>();
         eventControlTilesInCycle = new List<EventControlTile>();
     }
@@ -76,7 +79,7 @@ public class EventControls : MonoBehaviour
         {
             PerformControlEvent();
         }
-        
+
         if (eventDrawn && !eventTriggered)
         {
             Reset();
@@ -124,24 +127,24 @@ public class EventControls : MonoBehaviour
 
     private Vector3Int GetCameraPosition()
     {
-        return new Vector3Int((int)camera.transform.position.x, 
+        return new Vector3Int((int)camera.transform.position.x,
-                              (int)camera.transform.position.y, 
+                              (int)camera.transform.position.y,
                               (int)camera.transform.position.z);
     }
 
     private Vector3Int GetNextTilePosition()
     {
-        return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet*2, 0, 0))
+        return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet * 2, 0, 0))
                .GetValueOrDefault();
     }
 
     private Vector3Int GetNextPlusTilePosition()
     {
-        return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet*2-1, 0, 0))
+        return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet * 2 - 1, 0, 0))
                .GetValueOrDefault();
     }
 
-    private bool PerformControlEvent()
+    private void PerformControlEvent()
     {
         nextControlAccumalator = 0;
 
@@ -158,21 +161,35 @@ public class EventControls : MonoBehaviour
             {
                 eventTriggered = false;
                 eventCycleAccumalator = 0;
+                // Destroy(currentEnemyCollider.gameObject);
+                // currentEnemyCollider = null;
             }
+
+            return;
         }
         else if (eventCycleAccumalator >= eventCycleInSeconds * framesPerSecond)
         {
             eventTriggered = false;
+            isInBattle = false;
             eventCycleAccumalator = 0;
-            Destroy(currentEnemyCollider.gameObject);
+            currentEventControl = null;
-            currentEnemyCollider = null;
+
+            player.ThrowUserInTheAirHurt();
+            return;
         }
-        else
+        else if (FailedToClickCorrect(currentEventControl.keyCode))
         {
-            eventCycleAccumalator++;
+            tilemap.SetTile(currentEventControl.position, currentEventControl.failTile);
+            eventTriggered = false;
+            isInBattle = false;
+            eventCycleAccumalator = 0;
+            currentEventControl = null;
+
+            player.ThrowUserInTheAirHurt();
+            return;
         }
 
-        return false;
+        eventCycleAccumalator++;
     }
 
     private void Reset()
@@ -187,7 +204,8 @@ public class EventControls : MonoBehaviour
 
             if (currentEnemyCollider != null)
                 Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
-            player.EnablePlayerMovement();
+            if (!isInBattle)
+                player.EndEncounter();
 
             currentPlayerCollider = null;
             currentEnemyCollider = null;
@@ -211,6 +229,7 @@ public class EventControls : MonoBehaviour
         return new EventControlTile(TileToKeyMappings.TileToKey[randomNumber],
                                     tiles[randomNumber],
                                     successTiles[randomNumber],
+                                    failTiles[randomNumber],
                                     position);
     }
 
@@ -219,7 +238,15 @@ public class EventControls : MonoBehaviour
         return new EventControlTile(KeyCode.Escape,
                                     plusTile,
                                     null,
+                                    null,
                                     position,
                                     true);
     }
+
+    private bool FailedToClickCorrect(KeyCode correctKey)
+    {
+        var allKeysButCorrect = TileToKeyMappings.TileToKey.Where(x => x != correctKey);
+
+        return allKeysButCorrect.Any(x => Input.GetKeyDown(x));
+    }
 }

Assets/Scripts/Player.cs

@@ -13,26 +13,27 @@ public class Player : MonoBehaviour
     [SerializeField] private float wallLineCaseDistance = 0.5f;
     [SerializeField] private float runErrorThreshold = 0.05f;
     [SerializeField] private int startHealth = 3;
-    private int currentHealth;
     [SerializeField] private int startStamina = 100;
     [SerializeField] private int coffeValuePercent = 10;
     [SerializeField] private int bugStaminaDamagePercent = 15;
+    [SerializeField] private float hurtVelocity = 15f;
+
+    private int currentHealth;
     private int currentStamina;
 
     [SerializeField] private SpriteRenderer healthBar;
     [SerializeField] private SpriteRenderer staminaBar;
 
-
-
     private Rigidbody2D rigidBody;
-    new private BoxCollider2D collider;
+    new private Collider2D collider;
     private Animator animator;
     private bool isMovementEnabled = true;
+    private bool isFighting = false;
 
     private void Start()
     {
         rigidBody = GetComponent<Rigidbody2D>();
-        collider = GetComponent<BoxCollider2D>();
+        collider = GetComponent<Collider2D>();
         animator = GetComponent<Animator>();
         currentHealth = startHealth;
         currentStamina = startStamina;
@@ -171,10 +172,10 @@ public class Player : MonoBehaviour
 
     private bool IsPlayerOnWall(bool ignoreGround = false)
     {
-        return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.6f, 0), ignoreGround) ||
+        return IsPointOnWall(transform.position + new Vector3(0, collider.bounds.extents.y * 0.52f, 0), ignoreGround) ||
-               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.25f, 0), ignoreGround) ||
+               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.24f, 0), ignoreGround) ||
                IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 0.8f, 0), ignoreGround) ||
-               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.5f, 0), ignoreGround);
+               IsPointOnWall(transform.position - new Vector3(0, collider.bounds.extents.y * 1.45f, 0), ignoreGround);
     }
 
     private bool IsPointOnWall(Vector2 position, bool ignoreGround = false)
@@ -211,15 +212,23 @@ public class Player : MonoBehaviour
         animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold);
         animator.SetBool("IsGround", IsPlayerOnGround());
         animator.SetFloat("YVelocity", rigidBody.velocity.y);
+        animator.SetBool("IsFighting", isFighting);
     }
 
-    public void DisablePlayerMovement()
+    public void StartEncounter()
     {
+        isFighting = true;
         isMovementEnabled = false;
     }
 
-    public void EnablePlayerMovement()
+    public void EndEncounter()
     {
+        isFighting = false;
         isMovementEnabled = true;
     }
+
+    public void ThrowUserInTheAirHurt()
+    {
+        GetComponent<Rigidbody2D>().velocity += new Vector2(Mathf.Sign(transform.localScale.x) * -1 * hurtVelocity, hurtVelocity);
+    }
 }

Assets/Sprites/Enemy/GioBug/GioBug.png.meta

@@ -143,12 +143,12 @@ TextureImporter:
       name: GioBug0
       rect:
         serializedVersion: 2
-        x: 0
+        x: 8
         y: 0
-        width: 64
+        width: 51
-        height: 64
+        height: 43
-      alignment: 7
+      alignment: 0
-      pivot: {x: 0.5, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -164,12 +164,12 @@ TextureImporter:
       name: GioBug1
       rect:
         serializedVersion: 2
-        x: 64
+        x: 71
         y: 0
-        width: 64
+        width: 51
-        height: 64
+        height: 44
-      alignment: 7
+      alignment: 0
-      pivot: {x: 0.5, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []

Assets/Sprites/Enemy/GioBug/GioBugAnim.controller

@@ -34,7 +34,13 @@ AnimatorController:
   m_PrefabAsset: {fileID: 0}
   m_Name: GioBugAnim
   serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: IsFighting
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -59,7 +65,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -2351193573875906098}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 290, y: 190, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Sprites/Hud/Controls.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bf9fc495ca38d7d4d804ad1d2df0f4c5
+guid: 93ff3d1c20b08c048a2ae60a4b35e73f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Sprites/Player/JrDev.png.meta

@@ -17,6 +17,9 @@ TextureImporter:
   - first:
       213: 111747663661122317
     second: JrDevFall
+  - first:
+      213: -2705122181307999374
+    second: JrDevHurt
   externalObjects: {}
   serializedVersion: 10
   mipmaps:
@@ -157,13 +160,13 @@ TextureImporter:
         width: 64
         height: 64
       alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
       tessellationDetail: 0
       bones: []
-      spriteID: 86374016e66a36a40a65436719e0b707
+      spriteID: c8b5882c9de93cd439b08d3aaa871557
       internalID: 7394781096031462559
       vertices: []
       indices: 
@@ -178,13 +181,13 @@ TextureImporter:
         width: 64
         height: 64
       alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
       tessellationDetail: 0
       bones: []
-      spriteID: 578354f911b99a84b886bfb419c60a7b
+      spriteID: 44534712afa629841914c36d6f85cfca
       internalID: -1717341178490256666
       vertices: []
       indices: 
@@ -199,13 +202,13 @@ TextureImporter:
         width: 64
         height: 64
       alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
       tessellationDetail: 0
       bones: []
-      spriteID: cd4a447353767a349a3ef0be23e16d13
+      spriteID: 1ed01d1e16ae5f644b754e0406177073
       internalID: 5052719299223408713
       vertices: []
       indices: 
@@ -220,13 +223,13 @@ TextureImporter:
         width: 64
         height: 64
       alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
       tessellationDetail: 0
       bones: []
-      spriteID: 7485496dd79020844a99727b74804931
+      spriteID: f18a4ec784c67e841887089e1518a9a4
       internalID: -8899148160246948828
       vertices: []
       indices: 
@@ -241,18 +244,39 @@ TextureImporter:
         width: 64
         height: 64
       alignment: 0
-      pivot: {x: 0.5, y: 0.5}
+      pivot: {x: 0, y: 0}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
       tessellationDetail: 0
       bones: []
-      spriteID: 1f2b4486e434dab44b1d305865109c80
+      spriteID: 663795bb62daf804e8de7632fba6f177
       internalID: 111747663661122317
       vertices: []
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: JrDevHurt
+      rect:
+        serializedVersion: 2
+        x: 128
+        y: 0
+        width: 64
+        height: 64
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6cebddc5301784741ab9fa524fa3ea50
+      internalID: -2705122181307999374
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []

Assets/Sprites/Player/JrDevHurt.anim

@@ -0,0 +1,69 @@
+%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: JrDevHurt
+  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: -2705122181307999374, guid: f983f27dec2fe7c428c3a3ed78b900d1,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -2705122181307999374, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.016666668
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []

Assets/Sprites/Player/JrDevHurt.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ca9625b971160a43ac7618745ae6966
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Player/Player.controller

@@ -21,17 +21,49 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 6251363122210737033}
     m_Position: {x: 160, y: 270, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 3898215635428985453}
+    m_Position: {x: 40, y: 380, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 5819910786424590319}
+    m_Position: {x: -390, y: 170, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: 3708718943660755162}
+  - {fileID: -1637549219293370904}
   m_EntryTransitions: []
   m_StateMachineTransitions: {}
   m_StateMachineBehaviours: []
   m_AnyStatePosition: {x: -100, y: 40, z: 0}
   m_EntryPosition: {x: -100, y: 80, z: 0}
-  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ExitPosition: {x: 390, y: 70, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
   m_DefaultState: {fileID: -2991084837782200938}
+--- !u!1101 &-5610768259902955866
+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: IsFighting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2991084837782200938}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-4427708455344951909
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -91,6 +123,7 @@ AnimatorState:
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -4109286016316069763}
+  - {fileID: -880235167412170940}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -106,6 +139,56 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1101 &-880235167412170940
+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: IsFighting
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5819910786424590319}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &-1637549219293370904
+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: IsHurt
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 3898215635428985453}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  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
@@ -119,7 +202,7 @@ AnimatorController:
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
-    m_DefaultBool: 1
+    m_DefaultBool: 0
     m_Controller: {fileID: 0}
   - m_Name: IsGround
     m_Type: 4
@@ -133,6 +216,18 @@ AnimatorController:
     m_DefaultInt: 0
     m_DefaultBool: 0
     m_Controller: {fileID: 0}
+  - m_Name: IsFighting
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
+  - m_Name: IsHurt
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -277,6 +372,31 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &3128541272162943053
+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: IsHurt
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 0}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 1
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &3708718943660755162
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -288,6 +408,9 @@ AnimatorStateTransition:
   - m_ConditionMode: 2
     m_ConditionEvent: IsGround
     m_EventTreshold: 0
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsHurt
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
   m_DstState: {fileID: 3835953866042416}
   m_Solo: 0
@@ -302,6 +425,33 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &3898215635428985453
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: JrDevHurt
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 3128541272162943053}
+  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: 9ca9625b971160a43ac7618745ae6966, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1101 &4734573323873509709
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -327,6 +477,33 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1102 &5819910786424590319
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BugFight
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -5610768259902955866}
+  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: 784d0899d352c39428548fc7aa7de282, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &6251363122210737033
 AnimatorState:
   serializedVersion: 5

Assets/Sprites/Tilemaps/Matrix.png.meta

@@ -0,0 +1,151 @@
+fileFormatVersion: 2
+guid: e33008ddf5593464c90eced40f3f28e8
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 1
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: