From 1e4c49509051faf311f1ed8e06d8fe034431e238 Mon Sep 17 00:00:00 2001
From: Gregory Campbell <gjcampbell777@gmail.com>
Date: Sat, 28 Mar 2020 18:40:46 -0400
Subject: [PATCH] Added a tagging system so clicking on objects can have a more
 defined selection in scripting and fixed an issue with the attack animation
 starting and looping on start

---
 Assets/Animations/Draft Attack.anim           |  2 +-
 .../Party Member Animation.controller         | 33 +++++++++++++++++--
 Assets/Scenes/Test Scene.unity                |  8 ++---
 Assets/Scripts/GMScript.cs                    | 22 +++++++++----
 ProjectSettings/TagManager.asset              |  4 ++-
 5 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/Assets/Animations/Draft Attack.anim b/Assets/Animations/Draft Attack.anim
index 6c45ed1..4254bd4 100644
--- a/Assets/Animations/Draft Attack.anim	
+++ b/Assets/Animations/Draft Attack.anim	
@@ -95,7 +95,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0
diff --git a/Assets/Animations/Party Member Animation.controller b/Assets/Animations/Party Member Animation.controller
index 6f8698a..49deac5 100644
--- a/Assets/Animations/Party Member Animation.controller	
+++ b/Assets/Animations/Party Member Animation.controller	
@@ -11,7 +11,10 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 8090843760006368951}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 270, y: 60, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -812155198749090587}
+    m_Position: {x: 280, y: 130, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -21,7 +24,33 @@ AnimatorStateMachine:
   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: 8090843760006368951}
+  m_DefaultState: {fileID: -812155198749090587}
+--- !u!1102 &-812155198749090587
+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: 0}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Test Scene.unity b/Assets/Scenes/Test Scene.unity
index c652fe8..07f4bad 100644
--- a/Assets/Scenes/Test Scene.unity	
+++ b/Assets/Scenes/Test Scene.unity	
@@ -380,7 +380,7 @@ GameObject:
   - component: {fileID: 617295557}
   m_Layer: 0
   m_Name: Party Member 2
-  m_TagString: Untagged
+  m_TagString: Party
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -733,7 +733,7 @@ GameObject:
   - component: {fileID: 1394857172}
   m_Layer: 0
   m_Name: Party Member 3
-  m_TagString: Untagged
+  m_TagString: Party
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1058,7 +1058,7 @@ GameObject:
   - component: {fileID: 1935397211}
   m_Layer: 0
   m_Name: Party Member 4
-  m_TagString: Untagged
+  m_TagString: Party
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -1187,7 +1187,7 @@ GameObject:
   - component: {fileID: 2058067576}
   m_Layer: 0
   m_Name: Party Member 1
-  m_TagString: Untagged
+  m_TagString: Party
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
diff --git a/Assets/Scripts/GMScript.cs b/Assets/Scripts/GMScript.cs
index 84009bf..c0d19e0 100644
--- a/Assets/Scripts/GMScript.cs
+++ b/Assets/Scripts/GMScript.cs
@@ -32,16 +32,26 @@ public class GMScript : MonoBehaviour
 		    RaycastHit2D hit = Physics2D.Raycast(mousePos2D, Vector2.zero);
 
 		    if (hit.collider != null) {
-		    	CheckParty(hit.collider.gameObject);
 
-		    	if(noRepeat)
+
+		    	if(hit.collider.gameObject.tag == "Party")
 		    	{
-		    		AddMember(hit.collider.gameObject);
-		    	} else {
-		    		RemoveMember(hit.collider.gameObject);
+		    		CheckParty(hit.collider.gameObject);
+
+			    	if(noRepeat)
+			    	{
+			    		AddMember(hit.collider.gameObject);
+			    	} else {
+			    		RemoveMember(hit.collider.gameObject);
+			    	}
+
+			    	OutputParty();
 		    	}
 
-		    	OutputParty();
+		    	if(hit.collider.gameObject.tag == "Attack")
+		    	{
+		    		
+		    	}
 
 			}
         }
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 633812d..db76bab 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -3,7 +3,9 @@
 --- !u!78 &1
 TagManager:
   serializedVersion: 2
-  tags: []
+  tags:
+  - Party
+  - Attack
   layers:
   - Default
   - TransparentFX