*misc

5 files changed, 71 insertions, 0 deletions

diff --git a/marching/Assets/Scripts/Projectiles/BladeScript.cs b/marching/Assets/Scripts/Projectiles/BladeScript.cs
index f5f613c..8a71c27 100644
--- a/marching/Assets/Scripts/Projectiles/BladeScript.cs
+++ b/marching/Assets/Scripts/Projectiles/BladeScript.cs
@@ -1,3 +1,4 @@
+using MH;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -38,4 +39,24 @@ public class BladeScript : ProjectileBase
         sr.flipX = flip;
     }
 
+    private void OnTriggerEnter2D(Collider2D other)
+    {
+        Debug.Log(other.gameObject.name);
+        LayerMask layerMask = LayerMask.GetMask("Hurtbox");
+        if ((layerMask & (1 << other.transform.gameObject.layer)) != 0)
+        {
+            //Debug.Log(other.GetType().Name);
+            Rigidbody2D rig = other.transform.parent.GetComponent<Rigidbody2D>();   
+            if(rig != null)
+            {
+                Debug.Log("force");
+                UnitBase hero = UnitManager.hero;
+                Vector2 pos = transform.position;
+                Vector2 heroPos = hero.transform.position;
+                Vector2 dir = (heroPos - pos).normalized;
+
+                rig.AddForce(-dir * 100);
+            }
+        }
+    }
 }
diff --git a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
index 29b182c..a271693 100644
--- a/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
+++ b/marching/Assets/Scripts/Unit/Characters/Samurai/SamuraiScript.cs
@@ -6,6 +6,11 @@ using static UnityEditor.PlayerSettings;
 namespace MH
 {
 
+    public class UnitManager
+    {
+        public static UnitBase hero; 
+    }
+
     public class SamuraiScript : UnitBase
     {
         [SerializeField] private WaypointScript m_Waypoint;
@@ -29,6 +34,8 @@ namespace MH
             m_Sprite = GetComponent<SpriteRenderer>();
             m_TimeSinceLastMove = float.MaxValue;
             StartCoroutine(CoAttack(1f));
+
+            UnitManager.hero = this;
         }
 
         protected override void Update()
diff --git a/marching/Assets/Scripts/Unit/Enemies.meta b/marching/Assets/Scripts/Unit/Enemies.meta
new file mode 100644
index 0000000..0256866
--- /dev/null
+++ b/marching/Assets/Scripts/Unit/Enemies.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cc665e807c1d03e43b9b106fcb1ae902
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs
new file mode 100644
index 0000000..f38b354
--- /dev/null
+++ b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs
@@ -0,0 +1,24 @@
+using MH;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SpiritScript : UnitBase
+{
+    public float speed = 10f;
+
+    protected override void Update()
+    {
+        base.Update();  
+        UnitBase hero = UnitManager.hero;
+        Vector2 pos = transform.position;
+        Vector2 heroPos = hero.transform.position; 
+        Vector2 dir = (heroPos - pos).normalized;
+        pos += dir * Time.deltaTime * speed;
+        this.GetComponent<SpriteRenderer>().flipX = dir.x < 0;
+
+        transform.position = pos;   
+    }
+
+
+}
diff --git a/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta
new file mode 100644
index 0000000..57d99b0
--- /dev/null
+++ b/marching/Assets/Scripts/Unit/Enemies/SpiritScript.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b3f7267bb8a6746409b3dbbaf48a575b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: