piece movement changes

stopped moving coroutine from firing every frame, added softdamp to move to curve movement, added OnCompleteMove delegate event
wysiwyggins · Apr 29, 2020 · 2a1027b · 2a1027b
1 parent f3ba06e
commit 2a1027b
Show file tree

Hide file tree

Showing 153 changed files with 1,758 additions and 19,744 deletions.
diff --git a/Prototype/.vs/Prototype/xs/UserPrefs.xml b/Prototype/.vs/Prototype/xs/UserPrefs.xml
@@ -1,26 +1,19 @@
 <Properties StartupConfiguration="{B1235EE4-71EE-C815-28F8-C3378E5ADB84}|">
-  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/SimpleTilePathfinding/Script/Path.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/Piece.cs">
     <Files>
-      <File FileName="Assets/Scripts/Piece.cs" Line="75" Column="38" />
-      <File FileName="Assets/Scripts/GameController.cs" />
-      <File FileName="Assets/Scripts/Cursor.cs" Line="1" Column="1" />
-      <File FileName="Assets/SimpleTilePathfinding/Demo/Ant.cs" Line="1" Column="1" />
-      <File FileName="Assets/SimpleTilePathfinding/Demo/Mouse.cs" Line="1" Column="1" />
-      <File FileName="Assets/SimpleTilePathfinding/Demo/Peter.cs" Line="1" Column="1" />
-      <File FileName="Assets/SimpleTilePathfinding/Script/NavNode.cs" Line="1" Column="1" />
-      <File FileName="Assets/SimpleTilePathfinding/Script/Path.cs" Line="1" Column="1" />
+      <File FileName="Assets/Scripts/Piece.cs" Line="1" Column="1" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="Prototype" expanded="True">
             <Node name="Assets" expanded="True">
-              <Node name="Scripts" expanded="True" />
+              <Node name="Scripts" expanded="True">
+                <Node name="Piece.cs" selected="True" />
+              </Node>
               <Node name="SimpleTilePathfinding" expanded="True">
                 <Node name="Demo" expanded="True" />
-                <Node name="Script" expanded="True">
-                  <Node name="Path.cs" selected="True" />
-                </Node>
+                <Node name="Script" expanded="True" />
               </Node>
             </Node>
           </Node>
@@ -30,7 +23,7 @@
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.PinnedWatches />
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
-  <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="9e6d3057-faa8-431f-8e50-182dc00381f4" />
+  <MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="0ed823ec-d964-4e40-9bb1-9c6e3e768c7f" />
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
     <BreakpointStore />
   </MonoDevelop.Ide.DebuggingService.Breakpoints>

diff --git a/Prototype/.vs/Prototype/xs/project-cache/Assembly-CSharp-Debug.json b/Prototype/.vs/Prototype/xs/project-cache/Assembly-CSharp-Debug.json
diff --git a/Prototype/Assembly-CSharp.csproj b/Prototype/Assembly-CSharp.csproj
@@ -67,6 +67,7 @@
     <Compile Include="Assets\Scripts\GameController.cs" />
     <Compile Include="Assets\Scripts\MapTile.cs" />
     <Compile Include="Assets\Scripts\Piece.cs" />
+    <Compile Include="Assets\Scripts\PieceManager.cs" />
     <Compile Include="Assets\SimpleTilePathfinding\Demo\Ant.cs" />
     <Compile Include="Assets\SimpleTilePathfinding\Demo\Mouse.cs" />
     <Compile Include="Assets\SimpleTilePathfinding\Demo\Peter.cs" />

diff --git a/Prototype/Assets/Scripts/Piece.cs b/Prototype/Assets/Scripts/Piece.cs
@@ -6,11 +6,12 @@
 public class Piece : MonoBehaviour
 {
     //piece attributes
-    public delegate void PieceAction(); 
+    public delegate void PieceAction();
     public static event PieceAction OnCompleteMove;
+
     Vector3Int cellPosition;
     public Vector3Int[] cellPositions;
-    public string pieceName = "unnamed"; 
+    public string pieceName = "unnamed";
     public int strength = 0; // can take pieces with strength under this number
     public int range = 1; //this is the move range
     public bool isPlayer = true;
@@ -23,20 +24,28 @@ public class Piece : MonoBehaviour
     //pathing
     private SimplePF2D.Path path;
     private Rigidbody2D rb;
-    private float moveSpeed = 2; //speed for Moving()
+    private float moveSpeed = 6f; //speed for Moving()
     private bool isStationary = true; //not using this yet
     Coroutine MoveIE;
-
+    SimplePathFinding2D pf;
 
     // Start is called before the first frame update
     void Start()
     {
         grid = GameController.instance.grid;
         rb = GetComponent<Rigidbody2D>();
-        SimplePathFinding2D pf = GameObject.Find("Grid").GetComponent<SimplePathFinding2D>();
+        pf = GameObject.Find("Grid").GetComponent<SimplePathFinding2D>();
         path = new SimplePF2D.Path(pf);
+        PieceManager.AllPieces.Add(this);
+    }
+
+
+    private void OnDestroy()
+    {
+        PieceManager.AllPieces.Remove(this);
     }
 
+
     // Update is called once per frame
     void Update()
     {
@@ -47,11 +56,7 @@ void Update()
             Vector3 mouseWorldPos = Camera.main.ScreenToWorldPoint(Input.mousePosition);
             mouseWorldPos.z = 0.0f;
 
-
-
-
-
-            if (Input.GetMouseButtonDown(0)) //click the mouse
+            if (Input.GetMouseButtonDown(0) && path.IsGenerated() == false) //click the mouse
             {
 
                 Vector3Int coordinate = grid.WorldToCell(mouseWorldPos); //get a hex cell coordinate from a mouse click
@@ -60,40 +65,44 @@ void Update()
                 path.CreatePath(position, mouseWorldPos); // generate a path
 
             }
-            if (path.IsGenerated()) //once there's a path
+            if (path.IsGenerated() && !following) //once there's a path
             {
-
                 StartCoroutine(followPath());
                 isStationary = false;
             }
         }
-            
+
     }
 
+    bool following = false;
+
     IEnumerator followPath()
     {
+        following = true;
         List<Vector3Int> cellPositions = path.GetPathPointList(); // a list of grid positions in the path
         for (int i = 0; i < cellPositions.Count; i++) //Loop through them (lists have a "count", not a "length")
         {
-            MoveIE = StartCoroutine(Moving(i));
-            yield return MoveIE;
-
-        }
-    }
+            Debug.Log("Get path point");
+            Vector3 targetPos = path.GetPathPointWorld(i);
 
-    IEnumerator Moving(int positionNumber)
-    {
+            Vector3 vel = Vector3.zero;
+            while (Vector3.Distance(transform.position, targetPos) > 0.01f)
+            {
+                transform.position = Vector3.SmoothDamp(transform.position, targetPos, ref vel, 0.5f, moveSpeed);
+
+                //  transform.position = Vector3.MoveTowards(transform.position, targetPos, Time.deltaTime * moveSpeed);
+                yield return new WaitForEndOfFrame();
+            }
+
+            Debug.Log("Reached path point");
+            yield return new WaitForSeconds(0.05f);
 
-        while (transform.position != path.GetPathPointWorld(positionNumber)) //as  long as you're not at the destination (world point converted from grid point)
-        {
-            Debug.Log("Moving to: " + path.GetPathPointWorld(positionNumber));
-            transform.position = Vector3.MoveTowards(transform.position, path.GetPathPointWorld(positionNumber), moveSpeed * Time.deltaTime); //this is not happy
-            //transform.position = path.GetPathPointWorld(currentPosition);
-            yield return null;
         }
-        isStationary = true;
 
+        if (OnCompleteMove != null)
+            OnCompleteMove();
+        path = new SimplePF2D.Path(pf);
+        following = false;
     }
 
-}
-
+}
diff --git a/Prototype/Assets/Scripts/PieceManager.cs b/Prototype/Assets/Scripts/PieceManager.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public static class PieceManager
+{
+    public static List<Piece> AllPieces = new List<Piece>();
+
+    public static Piece GetPieceAtPos(Vector3 aPos)
+    {
+        foreach (Piece aPiece in AllPieces)
+        {
+            //if the piece is at aPos, return that piece
+            //      return aPiece;
+        }
+        return null;
+    }
+
+    //public static Piece[] GetAllPiecesOfKind()
+    //{
+    //    //do some stuff
+    //}
+}
diff --git a/Prototype/Assets/Scripts/PieceManager.cs.meta b/Prototype/Assets/Scripts/PieceManager.cs.meta
diff --git a/Prototype/Library/ArtifactDB b/Prototype/Library/ArtifactDB
diff --git a/Prototype/Library/Artifacts/01/01e07c7958477a613a5fa3d8fbee8eb5 b/Prototype/Library/Artifacts/01/01e07c7958477a613a5fa3d8fbee8eb5
diff --git a/Prototype/Library/Artifacts/03/031fdbb8486b6d360f0c13683572d2cf b/Prototype/Library/Artifacts/03/031fdbb8486b6d360f0c13683572d2cf
diff --git a/Prototype/Library/Artifacts/03/0383861e92d7fea7d22c992f72374435 b/Prototype/Library/Artifacts/03/0383861e92d7fea7d22c992f72374435
diff --git a/Prototype/Library/Artifacts/03/03b9226d4dcd5a9523a7b4c5fbe6955a b/Prototype/Library/Artifacts/03/03b9226d4dcd5a9523a7b4c5fbe6955a
diff --git a/Prototype/Library/Artifacts/04/048fedec3e556ef707d204399c2afb91 b/Prototype/Library/Artifacts/04/048fedec3e556ef707d204399c2afb91
diff --git a/...facts/11/11d7b6c07bdfe94f602ce5ba35eb86bd → ...facts/04/04c4209d47bf80f9f7be33fe072a96d4 b/...facts/11/11d7b6c07bdfe94f602ce5ba35eb86bd → ...facts/04/04c4209d47bf80f9f7be33fe072a96d4
diff --git a/...facts/85/853093302e2b3fa3c8aa61e28b67b6c4 → ...facts/0e/0e444ae7a64770a60f62e28006d97e8e b/...facts/85/853093302e2b3fa3c8aa61e28b67b6c4 → ...facts/0e/0e444ae7a64770a60f62e28006d97e8e
diff --git a/...facts/cd/cd30db2b0d571b716ab8b2b025120970 → ...facts/1b/1b2f6f81bdddb99acc416cbdcdbab147 b/...facts/cd/cd30db2b0d571b716ab8b2b025120970 → ...facts/1b/1b2f6f81bdddb99acc416cbdcdbab147
diff --git a/Prototype/Library/Artifacts/1e/1e525270e0eb7cd12860979d4cb03ca4 b/Prototype/Library/Artifacts/1e/1e525270e0eb7cd12860979d4cb03ca4
diff --git a/Prototype/Library/Artifacts/1e/1ede5bb02806d3feb41283e97b06c4a7 b/Prototype/Library/Artifacts/1e/1ede5bb02806d3feb41283e97b06c4a7
diff --git a/Prototype/Library/Artifacts/20/206a2fa162e49bbaba0e0a1f8e3175cc b/Prototype/Library/Artifacts/20/206a2fa162e49bbaba0e0a1f8e3175cc
diff --git a/...facts/45/453f8cfc759bc527d4e1b72493a1d5fe → ...facts/21/2186d9578e6c6f949528597661f8320d b/...facts/45/453f8cfc759bc527d4e1b72493a1d5fe → ...facts/21/2186d9578e6c6f949528597661f8320d
diff --git a/Prototype/Library/Artifacts/27/270af9252e0e4b5eef0a0555e2ebeca8 b/Prototype/Library/Artifacts/27/270af9252e0e4b5eef0a0555e2ebeca8
diff --git a/Prototype/Library/Artifacts/29/299c1cb6c805798a8fd1d190e4e391d4 b/Prototype/Library/Artifacts/29/299c1cb6c805798a8fd1d190e4e391d4
diff --git a/Prototype/Library/Artifacts/32/3207663a0e8078150b527a2e6edbd08b b/Prototype/Library/Artifacts/32/3207663a0e8078150b527a2e6edbd08b
diff --git a/...facts/03/03cab5c4b0cce9b990f24131025fd6be → ...facts/42/42ba1969620658ffef8489e2a21e2f7e b/...facts/03/03cab5c4b0cce9b990f24131025fd6be → ...facts/42/42ba1969620658ffef8489e2a21e2f7e
diff --git a/Prototype/Library/Artifacts/43/4303dd89f0c6a9e277c674530afaeb9a b/Prototype/Library/Artifacts/43/4303dd89f0c6a9e277c674530afaeb9a
diff --git a/Prototype/Library/Artifacts/49/49a75540ee45ec13f72b88839be06f5f b/Prototype/Library/Artifacts/49/49a75540ee45ec13f72b88839be06f5f
diff --git a/Prototype/Library/Artifacts/4a/4ae69cc0b387c5b823d8b512324fa73d b/Prototype/Library/Artifacts/4a/4ae69cc0b387c5b823d8b512324fa73d
diff --git a/Prototype/Library/Artifacts/4b/4b0b81046c7cd862d59212e7042c5498 b/Prototype/Library/Artifacts/4b/4b0b81046c7cd862d59212e7042c5498
diff --git a/Prototype/Library/Artifacts/4e/4eccd57f08d7b05134f028be8bc41c54 b/Prototype/Library/Artifacts/4e/4eccd57f08d7b05134f028be8bc41c54
diff --git a/Prototype/Library/Artifacts/56/567f347cfc2347c3098a25c4ff97b0ab b/Prototype/Library/Artifacts/56/567f347cfc2347c3098a25c4ff97b0ab
diff --git a/Prototype/Library/Artifacts/5c/5ca3f85cc8245a0e9acf72dac25dbb13 b/Prototype/Library/Artifacts/5c/5ca3f85cc8245a0e9acf72dac25dbb13
diff --git a/Prototype/Library/Artifacts/5f/5f105c7253ede416e05b334409e61dc6 b/Prototype/Library/Artifacts/5f/5f105c7253ede416e05b334409e61dc6
diff --git a/Prototype/Library/Artifacts/62/6212c1b0d34f2fb53eb1173aec41db9d b/Prototype/Library/Artifacts/62/6212c1b0d34f2fb53eb1173aec41db9d
diff --git a/Prototype/Library/Artifacts/63/63d3d7c5b9c70cecf814a12b71d8838c b/Prototype/Library/Artifacts/63/63d3d7c5b9c70cecf814a12b71d8838c
diff --git a/Prototype/Library/Artifacts/66/66b77a1b4eed813dfa8bdd59f7043747 b/Prototype/Library/Artifacts/66/66b77a1b4eed813dfa8bdd59f7043747
diff --git a/Prototype/Library/Artifacts/6a/6a2029677872d36ca69779f2e0161e70 b/Prototype/Library/Artifacts/6a/6a2029677872d36ca69779f2e0161e70
diff --git a/Prototype/Library/Artifacts/6a/6a77187dceccdd34e00b8474d62c142d b/Prototype/Library/Artifacts/6a/6a77187dceccdd34e00b8474d62c142d
diff --git a/...facts/99/996a77d676d6f859df3aa2d5ccc678e9 → ...facts/6b/6b8d680f7c523f227f43a2ef80d3f6e1 b/...facts/99/996a77d676d6f859df3aa2d5ccc678e9 → ...facts/6b/6b8d680f7c523f227f43a2ef80d3f6e1
diff --git a/Prototype/Library/Artifacts/6d/6d20654dd7455ce7951df288a1dd8ffc b/Prototype/Library/Artifacts/6d/6d20654dd7455ce7951df288a1dd8ffc
diff --git a/Prototype/Library/Artifacts/6d/6dcc9889b3078e1a1ba3873092f8e093 b/Prototype/Library/Artifacts/6d/6dcc9889b3078e1a1ba3873092f8e093
diff --git a/Prototype/Library/Artifacts/74/7405c794ebb20a4fd5c78dc19798e426 b/Prototype/Library/Artifacts/74/7405c794ebb20a4fd5c78dc19798e426
diff --git a/Prototype/Library/Artifacts/76/7688cec9ad084a8c9927f4ca1d03d710 b/Prototype/Library/Artifacts/76/7688cec9ad084a8c9927f4ca1d03d710
diff --git a/Prototype/Library/Artifacts/7b/7bb536b4955d6ba86fb6d20ac4b8d1b5 b/Prototype/Library/Artifacts/7b/7bb536b4955d6ba86fb6d20ac4b8d1b5
diff --git a/Prototype/Library/Artifacts/89/890d8d4a2a9e90453225cd93e099d6cd b/Prototype/Library/Artifacts/89/890d8d4a2a9e90453225cd93e099d6cd
diff --git a/Prototype/Library/Artifacts/89/8990aa5d7b4423ade29945adf03881ed b/Prototype/Library/Artifacts/89/8990aa5d7b4423ade29945adf03881ed
diff --git a/Prototype/Library/Artifacts/8a/8a22b41936eac9b4f66036bcedf02a03 b/Prototype/Library/Artifacts/8a/8a22b41936eac9b4f66036bcedf02a03
diff --git a/Prototype/Library/Artifacts/8b/8be201f82eb69d354a9b212020c32ea6 b/Prototype/Library/Artifacts/8b/8be201f82eb69d354a9b212020c32ea6
diff --git a/Prototype/Library/Artifacts/8f/8feb6ea25b807c19122a01b3e9ad94f5 b/Prototype/Library/Artifacts/8f/8feb6ea25b807c19122a01b3e9ad94f5
diff --git a/Prototype/Library/Artifacts/91/913ac107ee0eb8a919c793587f33d9be b/Prototype/Library/Artifacts/91/913ac107ee0eb8a919c793587f33d9be
diff --git a/Prototype/Library/Artifacts/92/9209843ccbe38c4aba0c669f64e6db34 b/Prototype/Library/Artifacts/92/9209843ccbe38c4aba0c669f64e6db34
diff --git a/Prototype/Library/Artifacts/9a/9a55f7e9e4d1d60cead1c474235b0d51 b/Prototype/Library/Artifacts/9a/9a55f7e9e4d1d60cead1c474235b0d51
diff --git a/Prototype/Library/Artifacts/a1/a1e6b8d822a0d4ecf211ce510e852c5f b/Prototype/Library/Artifacts/a1/a1e6b8d822a0d4ecf211ce510e852c5f
diff --git a/Prototype/Library/Artifacts/a6/a6b6a5cba48a5ff93d0e423e64944804 b/Prototype/Library/Artifacts/a6/a6b6a5cba48a5ff93d0e423e64944804
diff --git a/Prototype/Library/Artifacts/ab/aba623ff629d55e4f8cac96d76a3864f b/Prototype/Library/Artifacts/ab/aba623ff629d55e4f8cac96d76a3864f
diff --git a/Prototype/Library/Artifacts/b5/b5d09d92472694b25a8dce0f94215a1c b/Prototype/Library/Artifacts/b5/b5d09d92472694b25a8dce0f94215a1c
diff --git a/Prototype/Library/Artifacts/b7/b72ed58a3274250283be51e0fe9288e8 b/Prototype/Library/Artifacts/b7/b72ed58a3274250283be51e0fe9288e8
diff --git a/Prototype/Library/Artifacts/bf/bf9b5f0666fc16da0fa8d711e9d53282 b/Prototype/Library/Artifacts/bf/bf9b5f0666fc16da0fa8d711e9d53282
diff --git a/Prototype/Library/Artifacts/d2/d2347345b8f6b6b74a937df438af472b b/Prototype/Library/Artifacts/d2/d2347345b8f6b6b74a937df438af472b
diff --git a/Prototype/Library/Artifacts/d2/d23fb5146045c1d2e3f2ab88410fc3ec b/Prototype/Library/Artifacts/d2/d23fb5146045c1d2e3f2ab88410fc3ec
diff --git a/...facts/00/00aaa0f3f175449606ce06aad581a2b1 → ...facts/d5/d57a2439f80ef9e0aa2b182304d79fe8 b/...facts/00/00aaa0f3f175449606ce06aad581a2b1 → ...facts/d5/d57a2439f80ef9e0aa2b182304d79fe8
diff --git a/Prototype/Library/Artifacts/d6/d616e5728a44c9fe5334f292aec50958 b/Prototype/Library/Artifacts/d6/d616e5728a44c9fe5334f292aec50958
diff --git a/Prototype/Library/Artifacts/d6/d68d0d2b52e302346b5b502ef2d64839 b/Prototype/Library/Artifacts/d6/d68d0d2b52e302346b5b502ef2d64839
diff --git a/Prototype/Library/Artifacts/d6/d69d110c086d7ebaa470e3f5c43de951 b/Prototype/Library/Artifacts/d6/d69d110c086d7ebaa470e3f5c43de951
diff --git a/Prototype/Library/Artifacts/d8/d8ef71730b8ed64be7ba3d1787db68d7 b/Prototype/Library/Artifacts/d8/d8ef71730b8ed64be7ba3d1787db68d7
diff --git a/Prototype/Library/Artifacts/d9/d9dd4e5a9f8d844e68df6c5953634979 b/Prototype/Library/Artifacts/d9/d9dd4e5a9f8d844e68df6c5953634979
diff --git a/Prototype/Library/Artifacts/da/da63640db704ad48745fe15ecbfbf9d7 b/Prototype/Library/Artifacts/da/da63640db704ad48745fe15ecbfbf9d7
diff --git a/Prototype/Library/Artifacts/dd/ddec7d5aa4af1b0375c08e5178c89bf9 b/Prototype/Library/Artifacts/dd/ddec7d5aa4af1b0375c08e5178c89bf9
diff --git a/Prototype/Library/Artifacts/e1/e1510dda7640acc4e422f14abd9fcc42 b/Prototype/Library/Artifacts/e1/e1510dda7640acc4e422f14abd9fcc42
diff --git a/Prototype/Library/Artifacts/e2/e2d8c31cad1966933814c03da9e94d35 b/Prototype/Library/Artifacts/e2/e2d8c31cad1966933814c03da9e94d35
diff --git a/Prototype/Library/Artifacts/e7/e7286171399d67ccf2ebe783cbf49722 b/Prototype/Library/Artifacts/e7/e7286171399d67ccf2ebe783cbf49722
diff --git a/Prototype/Library/Artifacts/e7/e7841ae94ce83b38078b80228ce7e0dd b/Prototype/Library/Artifacts/e7/e7841ae94ce83b38078b80228ce7e0dd
diff --git a/Prototype/Library/Artifacts/e7/e78bd7a68e714914fc2a7837afdedfd2 b/Prototype/Library/Artifacts/e7/e78bd7a68e714914fc2a7837afdedfd2
diff --git a/Prototype/Library/Artifacts/eb/eb94c22c02eaae0d95cdd51adbaa9cc6 b/Prototype/Library/Artifacts/eb/eb94c22c02eaae0d95cdd51adbaa9cc6
diff --git a/Prototype/Library/Artifacts/f3/f382f17c4efaec341a77194d271774da b/Prototype/Library/Artifacts/f3/f382f17c4efaec341a77194d271774da
diff --git a/Prototype/Library/Artifacts/f4/f42f0a9c82113a00ed8cd92d828ddf56 b/Prototype/Library/Artifacts/f4/f42f0a9c82113a00ed8cd92d828ddf56
diff --git a/Prototype/Library/Artifacts/f5/f5bac61817e47737221be8096b6aca87 b/Prototype/Library/Artifacts/f5/f5bac61817e47737221be8096b6aca87
diff --git a/Prototype/Library/Artifacts/fa/fa26f57cf682f2460b915a6e3fb39e57 b/Prototype/Library/Artifacts/fa/fa26f57cf682f2460b915a6e3fb39e57