Added Wizard Dialogue

Fixed Dialogue and Grid bugs

Assets/Resources/Dialogue/BossThug/PL/BossThugDialPl.asset

@@ -12,11 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3}
   m_Name: BossThugDialPl
   m_EditorClassIdentifier: 
-  SpeakerName: 
+  SpeakerName: Boss Thug
   CurrentStep: 0
   DialogueSteps:
-  - Header: 
+  - Header: Boss Thug
-    WasDisplayed: 0
+    WasDisplayed: 1
     ListOfSentences:
     - Sentence: Who are you? How did you get past my guards?!
       Buttons: []
@@ -25,7 +25,7 @@ MonoBehaviour:
     EndOfDialogueStepAction:
       m_PersistentCalls:
         m_Calls:
-        - m_Target: {fileID: 4267060477434669900, guid: df6c42c9616028a4badca81953f003ab, type: 3}
+        - m_Target: {fileID: 5598884596044988526, guid: df6c42c9616028a4badca81953f003ab, type: 3}
           m_TargetAssemblyTypeName: NpcDialogueManager, Assembly-CSharp
           m_MethodName: DialogueEndAction
           m_Mode: 3

Assets/Resources/Dialogue/Wizard.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3c8489a325af53445bbc89b6c882de0a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Wizard/PL.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8e6e3b30665f35440ad1f54ad61201b3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset

@@ -0,0 +1,106 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: WizardFirstDialogue
+  m_EditorClassIdentifier: 
+  SpeakerName: Wizard
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Wizard
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Good morning. I'm glad to see you're finally awake. How are you?
+      Buttons:
+      - ButtonName: Who are you? Where am I?
+        Type: 1
+        ButtonActions:
+          m_PersistentCalls:
+            m_Calls:
+            - m_Target: {fileID: 11400000}
+              m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
+              m_MethodName: GoToNextSentence
+              m_Mode: 1
+              m_Arguments:
+                m_ObjectArgument: {fileID: 0}
+                m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+                m_IntArgument: 0
+                m_FloatArgument: 0
+                m_StringArgument: 
+                m_BoolArgument: 0
+              m_CallState: 2
+    - Sentence: I'm the Wizard. You're in my house. I found you beaten up in a cave
+        so I brought you here. Wasn't sure if you're going to wake up.
+      Buttons:
+      - ButtonName: Thank you for your help but I should be going.
+        Type: 1
+        ButtonActions:
+          m_PersistentCalls:
+            m_Calls:
+            - m_Target: {fileID: 11400000}
+              m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
+              m_MethodName: GoToNextSentence
+              m_Mode: 1
+              m_Arguments:
+                m_ObjectArgument: {fileID: 0}
+                m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+                m_IntArgument: 0
+                m_FloatArgument: 0
+                m_StringArgument: 
+                m_BoolArgument: 0
+              m_CallState: 2
+    - Sentence: I don't think you're strong enough. And those thugs took all your
+        stuff. You should rest for now. I'll give you some medications when I come
+        back.
+      Buttons:
+      - ButtonName: I feel alright I need to go.
+        Type: 1
+        ButtonActions:
+          m_PersistentCalls:
+            m_Calls:
+            - m_Target: {fileID: 11400000}
+              m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
+              m_MethodName: GoToNextSentence
+              m_Mode: 1
+              m_Arguments:
+                m_ObjectArgument: {fileID: 0}
+                m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+                m_IntArgument: 0
+                m_FloatArgument: 0
+                m_StringArgument: 
+                m_BoolArgument: 0
+              m_CallState: 2
+    - Sentence: Well. Prove to me you're strong enough to go and I'll let you go.
+        Northwest from my house, in the woods, there are some bugs I need to kill
+        and harvest their venom. You bring that to me and I'll let you go.
+      Buttons:
+      - ButtonName: Okay.
+        Type: 1
+        ButtonActions:
+          m_PersistentCalls:
+            m_Calls:
+            - m_Target: {fileID: 11400000}
+              m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp
+              m_MethodName: GoToNextSentence
+              m_Mode: 1
+              m_Arguments:
+                m_ObjectArgument: {fileID: 0}
+                m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+                m_IntArgument: 0
+                m_FloatArgument: 0
+                m_StringArgument: 
+                m_BoolArgument: 0
+              m_CallState: 2
+    - Sentence: Somewhere in my house there should be a sword. You can take it.
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialogue.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b47b2441f5e5f9e4ab687bf2a2fddbfa
+guid: 970e3f92c38b0af4fba61576762b8cf2
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/Resources/Dialogue/Wizard/PL/WizardFirstMultiDialogue.asset

@@ -10,10 +10,10 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 45b41589283138641ba006c2243b0637, type: 3}
-  m_Name: BossThugDialPl
+  m_Name: WizardFirstMultiDialogue
   m_EditorClassIdentifier: 
   SpeakerName: 
   CurrentDialogue: 0
   Dialogues:
   - Key: 0
-    Value: {fileID: 0}
+    Value: {fileID: 11400000, guid: 970e3f92c38b0af4fba61576762b8cf2, type: 2}

Assets/Resources/Dialogue/Wizard/PL/WizardFirstMultiDialogue.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4f0b63e09b976d4a81990d13d767629
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/SampleScene/Enemies/BossThug.prefab

@@ -13,11 +13,11 @@ GameObject:
   - component: {fileID: 482428332992622010}
   - component: {fileID: 482428332992622011}
   - component: {fileID: 482428332992622007}
-  - component: {fileID: 4267060477434669900}
   - component: {fileID: 482428332992622006}
   - component: {fileID: 482428332992622001}
   - component: {fileID: -4365747932373452915}
   - component: {fileID: 7039618587524187519}
+  - component: {fileID: 5598884596044988526}
   m_Layer: 0
   m_Name: BossThug
   m_TagString: NPC
@@ -35,7 +35,6 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -2.5, y: 75, z: 10}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
@@ -51,7 +50,6 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -155,40 +153,6 @@ CircleCollider2D:
   m_Offset: {x: 0, y: -0.5}
   serializedVersion: 2
   m_Radius: 1.2
---- !u!114 &4267060477434669900
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 482428332992622009}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2bd5e7fa2661ee649861ce0b80373740, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  SpeakerName: Thug Boss
-  DialogueTemplate: {fileID: 11400000, guid: cb19cd4601a7b9f4c8804f5ec09ad157, type: 2}
-  Dialogue: {fileID: 0}
-  EndactionEventList:
-  - Key:
-      Key: 0
-      Value: 0
-    Value:
-      m_PersistentCalls:
-        m_Calls:
-        - m_Target: {fileID: 482428332992622001}
-          m_TargetAssemblyTypeName: BossThug, Assembly-CSharp
-          m_MethodName: ChanegStatusToAttack
-          m_Mode: 1
-          m_Arguments:
-            m_ObjectArgument: {fileID: 0}
-            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-            m_IntArgument: 0
-            m_FloatArgument: 0
-            m_StringArgument: 
-            m_BoolArgument: 0
-          m_CallState: 2
 --- !u!114 &482428332992622006
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -250,7 +214,7 @@ MonoBehaviour:
   state: 0
 --- !u!95 &-4365747932373452915
 Animator:
-  serializedVersion: 4
+  serializedVersion: 3
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -263,7 +227,6 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -288,3 +251,37 @@ MonoBehaviour:
     worldPosition: {x: 0, y: 0, z: 0}
     gridPosition: {x: 0, y: 0}
   path: []
+--- !u!114 &5598884596044988526
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 482428332992622009}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3a6e7fe9a7e85294fbf51884f7313f11, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SpeakerName: Boss Thug
+  DialogueTemplate: {fileID: 11400000, guid: cb19cd4601a7b9f4c8804f5ec09ad157, type: 2}
+  Dialogue: {fileID: 0}
+  EndactionEventList:
+  - Key:
+      Key: 0
+      Value: 0
+    Value:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 482428332992622001}
+          m_TargetAssemblyTypeName: BossThug, Assembly-CSharp
+          m_MethodName: ChanegStatusToAttack
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2

Assets/Scripts/NPCs' Scripts/WizardScripts.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 04a9c3ee050bb9842a5ed334457afe96
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/NPCs' Scripts/WizardScripts/Wizard.cs

@@ -0,0 +1,37 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Wizard : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+
+    public void OnTriggerEnter2D(Collider2D other)
+    {
+        if (other.tag == "Player")
+        {
+            Debug.Log("OnTriggerEnter2D");
+
+            gameObject.GetComponent<NpcDialogueManager>().Dialogue.StartDialogue();
+        }
+    }
+
+    public void OnTriggerExit2D(Collider2D other)
+    {
+        if (other.tag == "Player")
+        {
+            gameObject.GetComponent<NpcDialogueManager>().Dialogue.BreakDialogueStep();
+        }
+    }
+
+}

Assets/Scripts/NPCs' Scripts/WizardScripts/Wizard.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3c776521de96c694bae24caa54802f59
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: