Rework on questline naming

3 年前 · e022f2ee
--- a/UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
  _actor: {fileID: 11400000, guid: 027d026cf519df04eb8b7bf251472e13, type: 2}
  _defaultDialogue: {fileID: 11400000, guid: f7ead55387bac6d4a9ba9bf10c5c3ee5, type: 2}
  _questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
+  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
-  _closeDialogueUIEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae,
-    type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
    type: 2}
  dialogueShot: {fileID: 6750458696709992708}
--- a/UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
  _actor: {fileID: 11400000, guid: 2f14ee79b2fa2574480372fff57ec101, type: 2}
  _defaultDialogue: {fileID: 11400000, guid: de0c5f70bf8e19743a163583c1b560f1, type: 2}
  _questData: {fileID: 11400000, guid: dacb138678b7c2344b59c68de5dc18db, type: 2}
-  _immediateInteractionEvent: {fileID: 11400000, guid: 1e813178cd4f39c48a023e2901da5ab5,
-    type: 2}
+  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
    type: 2}
  dialogueShot: {fileID: 254623157318905803}
--- a/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_F.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_F.prefab
  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
    type: 2}
  dialogueShot: {fileID: 4147769428160019637}
--- a/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_M.prefab
+++ b/UOP1_Project/Assets/Prefabs/Characters/Townsfolk_M.prefab
  _interactionEvent: {fileID: 11400000, guid: 5f20ccd3e97527a44a6bf34644f85011, type: 2}
  _winDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69, type: 2}
  _loseDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
  _startDialogueEvent: {fileID: 11400000, guid: 5cfe626f5482b914a9e46ebbe35ea1a8,
    type: 2}
  dialogueShot: {fileID: 4621968594439007087}
--- a/UOP1_Project/Assets/Prefabs/Managers/DialogueManager.prefab
+++ b/UOP1_Project/Assets/Prefabs/Managers/DialogueManager.prefab
    type: 2}
  _showChoicesUIEvent: {fileID: 11400000, guid: a4e5e48a0f3430c4197b317e650727c6,
    type: 2}
-  _endDialogue: {fileID: 11400000, guid: b8f14d59bc3b10e4f9bdf1e65c3c6280, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
-  _closeDialogueUIEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae,
-    type: 2}
  _gameState: {fileID: 11400000, guid: 159f9c22d98e249ceb08f2c5de2311a4, type: 2}
--- a/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
+++ b/UOP1_Project/Assets/Scenes/Managers/Gameplay.unity
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.12731713, g: 0.13414736, b: 0.121078536, a: 1}
+  m_IndirectSpecularColor: {r: 0.12731749, g: 0.13414757, b: 0.1210787, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
  _onSceneReady: {fileID: 11400000, guid: b729e40fc41dd8b4ea7aaf5c857f7186, type: 2}
  _openUIDialogueEvent: {fileID: 11400000, guid: d987db4881d794f2da0013a89588d890,
    type: 2}
-  _closeUIDialogueEvent: {fileID: 11400000, guid: 53a7f1f01ef364704b1d45d01f2421ae,
+  _closeUIDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c,
    type: 2}
  _openInventoryScreenForCookingEvent: {fileID: 11400000, guid: 146c579dca5c2f248a607ef66a36d765,
    type: 2}
    - target: {fileID: 8957403575277752759, guid: 021ad8df909ac4147aa545c01f5ad8db,
        type: 3}
      propertyPath: m_Name
-      value: QuestManager
+      value: GameManager
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 021ad8df909ac4147aa545c01f5ad8db, type: 3}
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/ContinueStepEvent.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/ContinueStepEvent.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: ContinueStepEvent
  m_EditorClassIdentifier: 
-  description: 
+  description: "Event called when a choice button is clicked with the action \"Continue
+    step\" \nThis event tells the Quest manager to check for for the validity of
+    the step. "
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
-  m_Name: LoseDialogueEvent
+  m_Name: PlayCompletionDialogueEvent
  m_EditorClassIdentifier: 
  description: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
-  m_Name: WinDialogueEvent
+  m_Name: PlayIncompleteDialogue
  m_EditorClassIdentifier: 
  description: 
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/Questline1Over-AddRockCandyRecipe.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/Questline1Over-AddRockCandyRecipe.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: Questline1Over-AddRockCandyRecipe
  m_EditorClassIdentifier: 
-  description: 
+  description: "At the end of questline 1 a special recipe needs to be added to the
+    inventory. \nThe Game Manager listens to this event. "
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/Questline2Over-OpenTown.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/Questline2Over-OpenTown.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: Questline2Over-OpenTown
  m_EditorClassIdentifier: 
-  description: 
+  description: 'At the end of questline 2 the doors to town that were closed until
+    that point, open. '
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-RockCandyDiscovery.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-RockCandyDiscovery.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: StartCinematic-RockCandyDiscovery
  m_EditorClassIdentifier: 
-  description: 'Start the cinematic for Rock candy discovery
-
-    This event also
-    needs to add a recipe to the Pig Chef''s inventory'
+  description: Start the cinematic for Rock candy discovery
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SaltyDishTasting.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SaltyDishTasting.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: StartCinematic-SaltyDishTasting
  m_EditorClassIdentifier: 
-  description: 
+  description: 'Start the cinematic for Salty dish tasting by the fry king. '
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SlimeCrittersAttack.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SlimeCrittersAttack.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: StartCinematic-SlimeCrittersAttack
  m_EditorClassIdentifier: 
-  description: 
+  description: Start the cinematic for the slime critters attack in farmland when
+    interacting with Townsfolk1
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SweetDishTasting.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-SweetDishTasting.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: StartCinematic-SweetDishTasting
  m_EditorClassIdentifier: 
-  description: 
+  description: 'Start the cinematic for sweet dish tasting by the fry king. '
--- a/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-TownIntroScene.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Quests/Events/StartCinematic-TownIntroScene.asset
  m_Script: {fileID: 11500000, guid: 7fafac715ff920c4383fed91a38a351e, type: 3}
  m_Name: StartCinematic-TownIntroScene
  m_EditorClassIdentifier: 
-  description: 
+  description: 'Start the cinematic intro in town. '
--- a/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs
+++ b/UOP1_Project/Assets/Scripts/Dialogues/DialogueManager.cs
 	[Header("BoradCasting on channels")]
 	[SerializeField] private DialogueLineChannelSO _openUIDialogueEvent = default;
 	[SerializeField] private DialogueChoicesChannelSO _showChoicesUIEvent = default;
-	[SerializeField] private DialogueDataChannelSO _endDialogue = default;
+	[SerializeField] private IntEventChannelSO _endDialogueEvent = default;
-	[SerializeField] private VoidEventChannelSO _closeDialogueUIEvent = default;

 	[Header("Gameplay Components")]
 	[SerializeField]
 	{
 		if (_gameState.CurrentGameState != GameState.Cutscene)
 			_gameState.UpdateGameState(GameState.Dialogue);
-		BeginDialogueData(dialogueDataSO);
+		_counter = 0;
+		_inputReader.EnableDialogueInput();
+		_inputReader.advanceDialogueEvent += OnAdvance;
+		_currentDialogue = dialogueDataSO;
+
+
 		if (_currentDialogue.DialogueLines != null)
 			DisplayDialogueLine(_currentDialogue.DialogueLines[_counter], dialogueDataSO.Actor);
 		else
 	}
-
+	//TODO : Check if there's no dependencies, and remove this function if none 
-	private void BeginDialogueData(DialogueDataSO dialogueDataSO)
+	private void BeginDialogue(DialogueDataSO dialogueDataSO)
 	{
 		_counter = 0;
 		_inputReader.EnableDialogueInput();
 		switch (choice.ActionType)
 		{
 			case ChoiceActionType.continueWithStep:
-
 				if (_continueWithStep != null)
 					_continueWithStep.RaiseEvent();
 				if (choice.NextDialogue != null)
-
 				if (_playWinningQuest != null)
 					_playWinningQuest.RaiseEvent();
 				if (choice.NextDialogue != null)
-
-
 				if (_playLosingQuest != null)
 					_playLosingQuest.RaiseEvent();
 				if (choice.NextDialogue != null)

 				break;
-			case ChoiceActionType.doNothing
-			:
+			case ChoiceActionType.doNothing:
 				if (choice.NextDialogue != null)
 					DisplayDialogueData(choice.NextDialogue);
 				else


 	}
-	void DialogueEnded()
-	{
-		if (_endDialogue != null)
-			_endDialogue.RaiseEvent(_currentDialogue);
-		_gameState.ResetToPreviousGameState();
-	}
-		if (_endDialogue != null)
-			_endDialogue.RaiseEvent(_currentDialogue);
-		//closes dialogue UI 
-		if (_closeDialogueUIEvent != null)
-			_closeDialogueUIEvent.RaiseEvent();
+		if (_endDialogueEvent != null)
+			_endDialogueEvent.RaiseEvent((int)_currentDialogue.DialogueType);
 		_gameState.ResetToPreviousGameState();
 		_inputReader.advanceDialogueEvent -= OnAdvance;
 		_inputReader.EnableGameplayInput();
--- a/UOP1_Project/Assets/Scripts/Quests/QuestManager.asset
+++ b/UOP1_Project/Assets/Scripts/Quests/QuestManager.asset
  - {fileID: 11400000, guid: e53837a78a301d641bdd95eff3e7d220, type: 2}
  - {fileID: 11400000, guid: 4056d228b0cfae143948cd1185e918f8, type: 2}
  _inventory: {fileID: 11400000, guid: 59c84467f7726dc4587a8373b0936f03, type: 2}
-  _playWinningQuest: {fileID: 11400000, guid: cf85098764f74134e80c631a1a1a1709, type: 2}
-  _playLosingQuest: {fileID: 11400000, guid: 1668df705c9a7a1408c4668ece6b5302, type: 2}
-  _endDialogueEvent: {fileID: 11400000, guid: b8f14d59bc3b10e4f9bdf1e65c3c6280, type: 2}
+  _endDialogueEvent: {fileID: 11400000, guid: 42c4c250df06bf84b97d11a23c36d47c, type: 2}
+  _playWinningQuest: {fileID: 11400000, guid: cf85098764f74134e80c631a1a1a1709, type: 2}
+  _playLosingQuest: {fileID: 11400000, guid: 1668df705c9a7a1408c4668ece6b5302, type: 2}
  _completeDialogueEvent: {fileID: 11400000, guid: dc2da1754c28ab9499cb6c7d72465e69,
    type: 2}
  _incompleteDialogueEvent: {fileID: 11400000, guid: fcc99784052e5cc469b8c22c0674b051,
--- a/UOP1_Project/Assets/Scripts/Quests/QuestManagerSO.cs
+++ b/UOP1_Project/Assets/Scripts/Quests/QuestManagerSO.cs
 	[SerializeField] private InventorySO _inventory = default;


-	[SerializeField] private VoidEventChannelSO _playWinningQuest = default;
-	[SerializeField] private VoidEventChannelSO _playLosingQuest = default;
-	[SerializeField] private VoidEventChannelSO _checkStepValidityEvent = default;
-	[SerializeField] private DialogueDataChannelSO _endDialogueEvent = default;
+	[FormerlySerializedAs("_checkStepValidityEvent")]
+	[SerializeField] private VoidEventChannelSO _continueWithStepEvent = default;
+	[SerializeField] private IntEventChannelSO _endDialogueEvent = default;
+	[SerializeField] private VoidEventChannelSO _playWinningQuest = default;
+	[SerializeField] private VoidEventChannelSO _playLosingQuest = default;
-	[SerializeField] private VoidEventChannelSO _completeDialogueEvent = default;
-	[SerializeField] private VoidEventChannelSO _incompleteDialogueEvent = default;
+	[FormerlySerializedAs("_completeDialogueEvent")]
+	[SerializeField] private VoidEventChannelSO _playCompletionDialogueEvent = default;
+	[FormerlySerializedAs("_incompleteDialogueEvent")]
+	[SerializeField] private VoidEventChannelSO _playIncompleteDialogueEvent = default;
-	[SerializeField] private SaveSystem saveSystem = default; 
+	[SerializeField] private SaveSystem saveSystem = default;
 	private QuestSO _currentQuest = null;
 	private QuestlineSO _currentQuestline;
 	private StepSO _currentStep;
 	public void OnDisable()
 	{
-		_checkStepValidityEvent.OnEventRaised -= CheckStepValidity;
+		_continueWithStepEvent.OnEventRaised -= CheckStepValidity;
 		_endDialogueEvent.OnEventRaised -= EndDialogue;
 		_playWinningQuest.OnEventRaised -= SetWinningSteps;
 		_playLosingQuest.OnEventRaised -= SetLosingSteps;
 		//Add code for saved information
-		_checkStepValidityEvent.OnEventRaised += CheckStepValidity;
+		_continueWithStepEvent.OnEventRaised += CheckStepValidity;
 		_endDialogueEvent.OnEventRaised += EndDialogue;

 		_playWinningQuest.OnEventRaised += SetWinningSteps;
 					{
 						_inventory.Contains(_currentStep.Item);
 						//Trigger win dialogue
-						_completeDialogueEvent.RaiseEvent();
+						_playCompletionDialogueEvent.RaiseEvent();
-						_incompleteDialogueEvent.RaiseEvent();
+						_playIncompleteDialogueEvent.RaiseEvent();
 					}
 					break;
 				case StepType.GiveItem:
-						_completeDialogueEvent.RaiseEvent();
+						_playCompletionDialogueEvent.RaiseEvent();
-						_incompleteDialogueEvent.RaiseEvent();
+						_playIncompleteDialogueEvent.RaiseEvent();

 					}
 					break;
 					if (_currentStep.CompleteDialogue != null)
 					{
-						_completeDialogueEvent.RaiseEvent();
+						_playCompletionDialogueEvent.RaiseEvent();
 					}
 					else
 					{
 					//dialogue has already been played
 					if (_currentStep.CompleteDialogue != null)
 					{
-						_completeDialogueEvent.RaiseEvent();
+						_playCompletionDialogueEvent.RaiseEvent();
 					}
 					else
 					{
 			}
 		}
 	}
-	void EndDialogue(DialogueDataSO dialogue)
+	void EndDialogue(int dialogueType)
-		switch (dialogue.DialogueType)
+		switch ((DialogueType)dialogueType)
 		{
 			case DialogueType.winDialogue:
 				EndStep();
 				}
 			}

-		
+

 	}
 	void EndQuest()
--- a/UOP1_Project/Assets/Scripts/Quests/StepController.cs
+++ b/UOP1_Project/Assets/Scripts/Quests/StepController.cs
 	[SerializeField] private VoidEventChannelSO _winDialogueEvent = default;
 	[SerializeField] private VoidEventChannelSO _loseDialogueEvent = default;
 	//[SerializeField]
-	public VoidEventChannelSO _endDialogueEvent = default;
+	public IntEventChannelSO _endDialogueEvent = default;
 	[Header("Broadcasting on channels")]
 	//[SerializeField]
 	public DialogueDataChannelSO _startDialogueEvent = default;
 		_winDialogueEvent.OnEventRaised += PlayWinDialogue;
 		_loseDialogueEvent.OnEventRaised += PlayLoseDialogue;
 		isInDialogue = true;
-		if (dialogueShot)	dialogueShot.SetActive(true);
+		if (dialogueShot)
+			dialogueShot.SetActive(true);
-	void EndDialogue()
+	void EndDialogue(int dialogueType)
 	{
 		_endDialogueEvent.OnEventRaised -= EndDialogue;
 		_winDialogueEvent.OnEventRaised -= PlayWinDialogue;
-		if (dialogueShot)	dialogueShot.SetActive(false);
+		if (dialogueShot)
+			dialogueShot.SetActive(false);
 	}

 	void PlayLoseDialogue()
--- a/UOP1_Project/Assets/Scripts/UI/UIManager.cs
+++ b/UOP1_Project/Assets/Scripts/UI/UIManager.cs

 	[Header("Dialogue Events")]
 	[SerializeField] private DialogueLineChannelSO _openUIDialogueEvent = default;
-	[SerializeField] private VoidEventChannelSO _closeUIDialogueEvent = default;
+	[SerializeField] private IntEventChannelSO _closeUIDialogueEvent = default;

 	[Header("Inventory Events")]
 	[SerializeField] private VoidEventChannelSO _openInventoryScreenForCookingEvent = default;
 		_dialogueController.SetDialogue(dialogueLine, actor);
 		_dialogueController.gameObject.SetActive(true);
 	}
-	void CloseUIDialogue()
+	void CloseUIDialogue(int dialogueType)
 	{
 		_selectionHandler.Unselect();
 		_dialogueController.gameObject.SetActive(false);
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Dialogue/EndDialogueEventWithType.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Dialogue/EndDialogueEventWithType.asset
+%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: 696142ab7e0adf0478f66a5c9e06a168, type: 3}
+  m_Name: EndDialogueEventWithType
+  m_EditorClassIdentifier: 
+  description: "When a dialogue is over. Also passes the Dialogue type as int. \nDialogue
+    type is needed in the QuestManager"
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Dialogue/EndDialogueEventWithType.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Dialogue/EndDialogueEventWithType.asset.meta
+fileFormatVersion: 2
+guid: 42c4c250df06bf84b97d11a23c36d47c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/CheckStepValidityEvent.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/CheckStepValidityEvent.asset.meta
-fileFormatVersion: 2
-guid: 71375bc63dd705044a6b0fc6ee5f2acd
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/StartStepEvent.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/StartStepEvent.asset.meta
-fileFormatVersion: 2
-guid: ab5fce85191f90d449e132c92e099476
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/CheckStepValidityEvent.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/CheckStepValidityEvent.asset
-%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: 7fafac715ff920c4383fed91a38a351e, type: 3}
-  m_Name: CheckStepValidityEvent
-  m_EditorClassIdentifier: 
-  description: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/StartStepEvent.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/StartStepEvent.asset
-%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: 4d2ce8a9511333c42a9e907bbdb3b32f, type: 3}
-  m_Name: StartStepEvent
-  m_EditorClassIdentifier: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/EndStepEvent.asset
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/EndStepEvent.asset
-%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: 7fafac715ff920c4383fed91a38a351e, type: 3}
-  m_Name: EndStepEvent
-  m_EditorClassIdentifier: 
-  description: 
--- a/UOP1_Project/Assets/ScriptableObjects/Events/Quests/EndStepEvent.asset.meta
+++ b/UOP1_Project/Assets/ScriptableObjects/Events/Quests/EndStepEvent.asset.meta
-fileFormatVersion: 2
-guid: de57bfb8f4b9de7489e0af77da306a8d
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset.meta
+++ b//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset.meta
--- a//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset
+++ b//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayCompletionDialogueEvent.asset
--- a//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset
+++ b//UOP1_Project/Assets/ScriptableObjects/Events/Quests/PlayIncompleteDialogue.asset
--- a//UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Critter.meta
+++ b//UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Critter.meta
--- a//UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Critter
+++ b//UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Critter