From afb751d7bc41d01777b40d77a6665fd7f7c7e460 Mon Sep 17 00:00:00 2001 From: FredTheNoob Date: Tue, 16 Mar 2021 12:58:43 +0100 Subject: [PATCH] You can now skip dialogue, and also controller support and also fix shooting --- .vscode/settings.json | 56 +++++++++++ Assets/Prefabs/Objects/Bullet.prefab | 2 +- Assets/Scenes/Game World.unity | 5 +- .../Dialogue/JohnDillermand.asset | 3 +- Assets/Scripts/Dialogue/DialogueManager.cs | 35 +++++-- Assets/Scripts/Dialogue/DialogueTrigger.cs | 2 +- Assets/Scripts/InputMaster.cs | 93 ++++++++----------- Assets/Scripts/InputMaster.inputactions | 83 ++++++----------- Assets/Scripts/PlayerController.cs | 18 +++- .../Items.meta => Scripts/Quest.meta} | 2 +- Assets/Scripts/{ => Quest}/QuestManager.cs | 4 +- .../Scripts/{ => Quest}/QuestManager.cs.meta | 0 Assets/Scripts/Quest/Types.meta | 8 ++ .../Types/DialogueQuest.cs} | 4 +- .../Types/DialogueQuest.cs.meta} | 0 15 files changed, 189 insertions(+), 126 deletions(-) create mode 100644 .vscode/settings.json rename Assets/{Scriptable Objects/Items.meta => Scripts/Quest.meta} (77%) rename Assets/Scripts/{ => Quest}/QuestManager.cs (94%) rename Assets/Scripts/{ => Quest}/QuestManager.cs.meta (100%) create mode 100644 Assets/Scripts/Quest/Types.meta rename Assets/Scripts/{Quest.cs => Quest/Types/DialogueQuest.cs} (75%) rename Assets/Scripts/{Quest.cs.meta => Quest/Types/DialogueQuest.cs.meta} (100%) diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1060b04 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitignore":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/Prefabs/Objects/Bullet.prefab b/Assets/Prefabs/Objects/Bullet.prefab index 9654366..3653fbf 100644 --- a/Assets/Prefabs/Objects/Bullet.prefab +++ b/Assets/Prefabs/Objects/Bullet.prefab @@ -96,7 +96,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a040e9002c48ded429daabbcfd29dc65, type: 3} m_Name: m_EditorClassIdentifier: - speed: 20 + speed: 10 rb: {fileID: 3790830501145301816} --- !u!50 &3790830501145301816 Rigidbody2D: diff --git a/Assets/Scenes/Game World.unity b/Assets/Scenes/Game World.unity index 012d8b5..2e70dda 100644 --- a/Assets/Scenes/Game World.unity +++ b/Assets/Scenes/Game World.unity @@ -62076,6 +62076,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6cc6661eaf796f04596dc4570d3c0077, type: 3} m_Name: m_EditorClassIdentifier: + typeDelay: 0.01 nameText: {fileID: 1739398908} dialogueText: {fileID: 1323578051} animator: {fileID: 1047787944} @@ -62084,7 +62085,7 @@ MonoBehaviour: dialogueOptionsButtonPrefab: {fileID: 1759206441773302835, guid: 5bcc9fad4b8f9c64997ada265b9e7478, type: 3} continueButton: {fileID: 1182101428} - isInDialogue: 0 + isDialogueStarted: 0 --- !u!4 &366715259 Transform: m_ObjectHideFlags: 0 @@ -62305,7 +62306,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Quest Name ' + m_text: Quest Name m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} diff --git a/Assets/Scriptable Objects/Dialogue/JohnDillermand.asset b/Assets/Scriptable Objects/Dialogue/JohnDillermand.asset index 9b3f103..116e536 100644 --- a/Assets/Scriptable Objects/Dialogue/JohnDillermand.asset +++ b/Assets/Scriptable Objects/Dialogue/JohnDillermand.asset @@ -17,7 +17,8 @@ MonoBehaviour: dialogueText: Hej det er john dillermand! choices: [] - speakerName: Fred - dialogueText: "Hold din k\xE6ft din perverse stodder" + dialogueText: Dummy dialogue lmao. Did y'all notice this font is ugly as shit, + matter of fact it's arial choices: [] - speakerName: Fred dialogueText: Would you like to commit neckrope? diff --git a/Assets/Scripts/Dialogue/DialogueManager.cs b/Assets/Scripts/Dialogue/DialogueManager.cs index e9ef816..abd7845 100644 --- a/Assets/Scripts/Dialogue/DialogueManager.cs +++ b/Assets/Scripts/Dialogue/DialogueManager.cs @@ -6,7 +6,7 @@ using TMPro; public class DialogueManager : MonoBehaviour { - + public float typeDelay = 0.2f; public TMP_Text nameText; public TMP_Text dialogueText; @@ -17,7 +17,7 @@ public class DialogueManager : MonoBehaviour { public GameObject dialogueOptionsButtonPrefab; public Button continueButton; - public bool isInDialogue = false; + public bool isDialogueStarted = false; private Queue sentences; // A queue containing a string of sentences to be dequeued private Queue speakers; @@ -25,6 +25,9 @@ public class DialogueManager : MonoBehaviour { private List spawnedButtons; + private string currSentence; + private DialogueChoice[] currChoiceArr; + private bool isTyping = false; public static DialogueManager instance; private void Awake() @@ -52,7 +55,7 @@ void Start () { public void StartDialogue (Dialogue dialogue) { - isInDialogue = true; + isDialogueStarted = true; animator.SetBool("IsOpen", true); // Animate the dialogue nameText.text = dialogue.dialogueSegments[0].speakerName; // Set the speakerName to the first element in the dialogueElements array @@ -73,17 +76,27 @@ public void StartDialogue (Dialogue dialogue) public void DisplayNextSentence () { + if (isTyping) + { + StopAllCoroutines(); + dialogueText.text = currSentence; + CheckForChoices(currChoiceArr); + isTyping = false; + return; + } + // If we have nothing else to say we end the dialogue if (sentences.Count == 0) { - isInDialogue = false; + isDialogueStarted = false; EndDialogue(); return; } // We dequeue a choice, this is an array of the dialogueChoice object DialogueChoice[] choiceArr = choices.Dequeue(); - + currChoiceArr = choiceArr; + // We dequeue the speaker and set it to the text nameText.text = speakers.Dequeue(); // We also dequeue the sentence to display @@ -94,6 +107,8 @@ public void DisplayNextSentence () IEnumerator TypeSentence (string sentence, DialogueChoice[] choiceArr) { + isTyping = true; + currSentence = sentence; // We set the dialogueText to an empty string dialogueText.text = ""; @@ -101,9 +116,17 @@ IEnumerator TypeSentence (string sentence, DialogueChoice[] choiceArr) foreach (char letter in sentence.ToCharArray()) { dialogueText.text += letter; // Append the letter onto the string - yield return null; // Wait one frame + //yield return null; // Wait one frame + yield return new WaitForSeconds(typeDelay); } + isTyping = false; + CheckForChoices(choiceArr); + + } + + private void CheckForChoices(DialogueChoice[] choiceArr) + { // Go through each choice in the choiceArr foreach (DialogueChoice choice in choiceArr) { diff --git a/Assets/Scripts/Dialogue/DialogueTrigger.cs b/Assets/Scripts/Dialogue/DialogueTrigger.cs index fe0400b..1bb81f7 100644 --- a/Assets/Scripts/Dialogue/DialogueTrigger.cs +++ b/Assets/Scripts/Dialogue/DialogueTrigger.cs @@ -8,7 +8,7 @@ public class DialogueTrigger : MonoBehaviour { public void TriggerDialogue() { - if (DialogueManager.instance.isInDialogue == false) + if (DialogueManager.instance.isDialogueStarted == false) { DialogueManager.instance.StartDialogue(QuestManager.instance.GetActive().dialogue[0]); QuestManager.instance.CompleteActive(); diff --git a/Assets/Scripts/InputMaster.cs b/Assets/Scripts/InputMaster.cs index 1117a46..0285c1e 100644 --- a/Assets/Scripts/InputMaster.cs +++ b/Assets/Scripts/InputMaster.cs @@ -34,6 +34,14 @@ public @InputMaster() ""processors"": """", ""interactions"": """" }, + { + ""name"": ""ControllerShoot"", + ""type"": ""Button"", + ""id"": ""1c730fdf-87a8-44e9-bb31-8a0e5bf0e4d2"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """" + }, { ""name"": ""Shoot"", ""type"": ""Button"", @@ -44,7 +52,7 @@ public @InputMaster() }, { ""name"": ""Aim"", - ""type"": ""Value"", + ""type"": ""PassThrough"", ""id"": ""c6fa2cd7-cf78-420a-95b0-52d5e44a1f37"", ""expectedControlType"": ""Vector2"", ""processors"": """", @@ -108,59 +116,15 @@ public @InputMaster() ""isPartOfComposite"": true }, { - ""name"": ""Moving (Controller)"", - ""id"": ""9e8ba210-5c41-4f44-b0b4-5d88ee2e2d20"", - ""path"": ""2DVector"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Movement"", - ""isComposite"": true, - ""isPartOfComposite"": false - }, - { - ""name"": ""up"", - ""id"": ""e948ab91-3762-4da3-9e4e-41c5883984c5"", - ""path"": ""/leftStick/up"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""down"", - ""id"": ""131673e4-b008-4b3d-85ce-4d7deed7ed9c"", - ""path"": ""/leftStick/down"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""left"", - ""id"": ""260725c7-aeff-470a-a154-4cd2ebc04899"", - ""path"": ""/leftStick/left"", - ""interactions"": """", - ""processors"": """", - ""groups"": """", - ""action"": ""Movement"", - ""isComposite"": false, - ""isPartOfComposite"": true - }, - { - ""name"": ""right"", - ""id"": ""775a2c3e-d55a-43fa-94c2-42e02b3a8045"", - ""path"": ""/leftStick/right"", + ""name"": """", + ""id"": ""d209cbad-387e-4401-a82b-6667dd572b91"", + ""path"": ""/leftStick"", ""interactions"": """", ""processors"": """", ""groups"": """", ""action"": ""Movement"", ""isComposite"": false, - ""isPartOfComposite"": true + ""isPartOfComposite"": false }, { ""name"": """", @@ -197,25 +161,36 @@ public @InputMaster() }, { ""name"": """", - ""id"": ""aaec98ba-ed76-4cfc-9354-4226bead63f7"", - ""path"": ""/buttonEast"", + ""id"": ""c1876bfe-834d-49c4-863b-fac6d6a635c9"", + ""path"": ""/position"", ""interactions"": """", ""processors"": """", ""groups"": """", - ""action"": ""Shoot"", + ""action"": ""Aim"", ""isComposite"": false, ""isPartOfComposite"": false }, { ""name"": """", - ""id"": ""c1876bfe-834d-49c4-863b-fac6d6a635c9"", - ""path"": ""/position"", + ""id"": ""bbf8a245-b046-4226-8f72-229965e67d61"", + ""path"": ""/rightStick"", ""interactions"": """", ""processors"": """", ""groups"": """", ""action"": ""Aim"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""aaec98ba-ed76-4cfc-9354-4226bead63f7"", + ""path"": ""/rightShoulder"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""ControllerShoot"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -226,6 +201,7 @@ public @InputMaster() m_Player = asset.FindActionMap("Player", throwIfNotFound: true); m_Player_Movement = m_Player.FindAction("Movement", throwIfNotFound: true); m_Player_Interact = m_Player.FindAction("Interact", throwIfNotFound: true); + m_Player_ControllerShoot = m_Player.FindAction("ControllerShoot", throwIfNotFound: true); m_Player_Shoot = m_Player.FindAction("Shoot", throwIfNotFound: true); m_Player_Aim = m_Player.FindAction("Aim", throwIfNotFound: true); } @@ -279,6 +255,7 @@ public void Disable() private IPlayerActions m_PlayerActionsCallbackInterface; private readonly InputAction m_Player_Movement; private readonly InputAction m_Player_Interact; + private readonly InputAction m_Player_ControllerShoot; private readonly InputAction m_Player_Shoot; private readonly InputAction m_Player_Aim; public struct PlayerActions @@ -287,6 +264,7 @@ public struct PlayerActions public PlayerActions(@InputMaster wrapper) { m_Wrapper = wrapper; } public InputAction @Movement => m_Wrapper.m_Player_Movement; public InputAction @Interact => m_Wrapper.m_Player_Interact; + public InputAction @ControllerShoot => m_Wrapper.m_Player_ControllerShoot; public InputAction @Shoot => m_Wrapper.m_Player_Shoot; public InputAction @Aim => m_Wrapper.m_Player_Aim; public InputActionMap Get() { return m_Wrapper.m_Player; } @@ -304,6 +282,9 @@ public void SetCallbacks(IPlayerActions instance) @Interact.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; @Interact.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; @Interact.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnInteract; + @ControllerShoot.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnControllerShoot; + @ControllerShoot.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnControllerShoot; + @ControllerShoot.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnControllerShoot; @Shoot.started -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot; @Shoot.performed -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot; @Shoot.canceled -= m_Wrapper.m_PlayerActionsCallbackInterface.OnShoot; @@ -320,6 +301,9 @@ public void SetCallbacks(IPlayerActions instance) @Interact.started += instance.OnInteract; @Interact.performed += instance.OnInteract; @Interact.canceled += instance.OnInteract; + @ControllerShoot.started += instance.OnControllerShoot; + @ControllerShoot.performed += instance.OnControllerShoot; + @ControllerShoot.canceled += instance.OnControllerShoot; @Shoot.started += instance.OnShoot; @Shoot.performed += instance.OnShoot; @Shoot.canceled += instance.OnShoot; @@ -334,6 +318,7 @@ public interface IPlayerActions { void OnMovement(InputAction.CallbackContext context); void OnInteract(InputAction.CallbackContext context); + void OnControllerShoot(InputAction.CallbackContext context); void OnShoot(InputAction.CallbackContext context); void OnAim(InputAction.CallbackContext context); } diff --git a/Assets/Scripts/InputMaster.inputactions b/Assets/Scripts/InputMaster.inputactions index 12b1db5..620168d 100644 --- a/Assets/Scripts/InputMaster.inputactions +++ b/Assets/Scripts/InputMaster.inputactions @@ -21,6 +21,14 @@ "processors": "", "interactions": "" }, + { + "name": "ControllerShoot", + "type": "Button", + "id": "1c730fdf-87a8-44e9-bb31-8a0e5bf0e4d2", + "expectedControlType": "Button", + "processors": "", + "interactions": "" + }, { "name": "Shoot", "type": "Button", @@ -31,7 +39,7 @@ }, { "name": "Aim", - "type": "Value", + "type": "PassThrough", "id": "c6fa2cd7-cf78-420a-95b0-52d5e44a1f37", "expectedControlType": "Vector2", "processors": "", @@ -95,59 +103,15 @@ "isPartOfComposite": true }, { - "name": "Moving (Controller)", - "id": "9e8ba210-5c41-4f44-b0b4-5d88ee2e2d20", - "path": "2DVector", - "interactions": "", - "processors": "", - "groups": "", - "action": "Movement", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e948ab91-3762-4da3-9e4e-41c5883984c5", - "path": "/leftStick/up", - "interactions": "", - "processors": "", - "groups": "", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "131673e4-b008-4b3d-85ce-4d7deed7ed9c", - "path": "/leftStick/down", - "interactions": "", - "processors": "", - "groups": "", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "260725c7-aeff-470a-a154-4cd2ebc04899", - "path": "/leftStick/left", - "interactions": "", - "processors": "", - "groups": "", - "action": "Movement", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "775a2c3e-d55a-43fa-94c2-42e02b3a8045", - "path": "/leftStick/right", + "name": "", + "id": "d209cbad-387e-4401-a82b-6667dd572b91", + "path": "/leftStick", "interactions": "", "processors": "", "groups": "", "action": "Movement", "isComposite": false, - "isPartOfComposite": true + "isPartOfComposite": false }, { "name": "", @@ -184,25 +148,36 @@ }, { "name": "", - "id": "aaec98ba-ed76-4cfc-9354-4226bead63f7", - "path": "/buttonEast", + "id": "c1876bfe-834d-49c4-863b-fac6d6a635c9", + "path": "/position", "interactions": "", "processors": "", "groups": "", - "action": "Shoot", + "action": "Aim", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "c1876bfe-834d-49c4-863b-fac6d6a635c9", - "path": "/position", + "id": "bbf8a245-b046-4226-8f72-229965e67d61", + "path": "/rightStick", "interactions": "", "processors": "", "groups": "", "action": "Aim", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "aaec98ba-ed76-4cfc-9354-4226bead63f7", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": "", + "action": "ControllerShoot", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index d8fbd5a..45a9300 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -26,16 +26,27 @@ void Awake() playerInput.Player.Interact.performed += Interact; playerInput.Player.Shoot.performed += Shoot; + playerInput.Player.ControllerShoot.performed += ControllerShoot; } + private void ControllerShoot(InputAction.CallbackContext obj) + { + Vector2 controllerDir = playerInput.Player.Aim.ReadValue(); + if (controllerDir == new Vector2(0,0)) controllerDir = new Vector2(1,0); + + GameObject g = Instantiate(bulletPrefab, firePoint.position, Quaternion.identity); + g.GetComponent().MoveBullet(controllerDir.normalized); + } private void Shoot(InputAction.CallbackContext obj) { Vector2 mousePos = playerInput.Player.Aim.ReadValue(); mousePos = Camera.main.ScreenToWorldPoint(mousePos); + + Vector2 direction = mousePos - (Vector2)firePoint.position; - GameObject g = Instantiate(bulletPrefab, firePoint.position, firePoint.rotation); - g.GetComponent().MoveBullet(mousePos.normalized); + GameObject g = Instantiate(bulletPrefab, firePoint.position, Quaternion.identity); + g.GetComponent().MoveBullet(direction.normalized); } private void OnEnable() => playerInput.Enable(); @@ -56,6 +67,9 @@ private void Interact(InputAction.CallbackContext obj) case "Saloon": //TODO: Saloon code break; + case "NPC": + DialogueManager.instance.DisplayNextSentence(); + break; } } diff --git a/Assets/Scriptable Objects/Items.meta b/Assets/Scripts/Quest.meta similarity index 77% rename from Assets/Scriptable Objects/Items.meta rename to Assets/Scripts/Quest.meta index 35fe434..f8dc2d5 100644 --- a/Assets/Scriptable Objects/Items.meta +++ b/Assets/Scripts/Quest.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1301a63481bcac41a19e147cd734f33 +guid: 4aeea45ea3bf49646ad4b992623bf2e2 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/QuestManager.cs b/Assets/Scripts/Quest/QuestManager.cs similarity index 94% rename from Assets/Scripts/QuestManager.cs rename to Assets/Scripts/Quest/QuestManager.cs index 6fafe89..d105352 100644 --- a/Assets/Scripts/QuestManager.cs +++ b/Assets/Scripts/Quest/QuestManager.cs @@ -14,7 +14,7 @@ public class QuestManager : MonoBehaviour public TextMeshProUGUI QuestObjective; public TextMeshProUGUI QuestDescription; - public List AllQuests = new List(); + public List AllQuests = new List(); public bool isStoryFinished = false; @@ -53,7 +53,7 @@ public void CompleteID(int questID) SetUI(); } - public Quest GetActive() + public DialogueQuest GetActive() { return AllQuests[ActiveQuest]; } diff --git a/Assets/Scripts/QuestManager.cs.meta b/Assets/Scripts/Quest/QuestManager.cs.meta similarity index 100% rename from Assets/Scripts/QuestManager.cs.meta rename to Assets/Scripts/Quest/QuestManager.cs.meta diff --git a/Assets/Scripts/Quest/Types.meta b/Assets/Scripts/Quest/Types.meta new file mode 100644 index 0000000..7231fbd --- /dev/null +++ b/Assets/Scripts/Quest/Types.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07bf604f3d8d27f47be4f38ff01fda5f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Quest.cs b/Assets/Scripts/Quest/Types/DialogueQuest.cs similarity index 75% rename from Assets/Scripts/Quest.cs rename to Assets/Scripts/Quest/Types/DialogueQuest.cs index 19cc419..00b0945 100644 --- a/Assets/Scripts/Quest.cs +++ b/Assets/Scripts/Quest/Types/DialogueQuest.cs @@ -6,8 +6,8 @@ namespace QuestSystem { [System.Serializable] - [CreateAssetMenu(fileName = "QuestObject", menuName = "Scriptable Objects/Quest", order = 0)] - public class Quest : ScriptableObject + [CreateAssetMenu(fileName = "QuestObject", menuName = "Quest/DialogueQuest", order = 0)] + public class DialogueQuest : ScriptableObject { // - - - PROPERTIES - - - diff --git a/Assets/Scripts/Quest.cs.meta b/Assets/Scripts/Quest/Types/DialogueQuest.cs.meta similarity index 100% rename from Assets/Scripts/Quest.cs.meta rename to Assets/Scripts/Quest/Types/DialogueQuest.cs.meta