Compatibility fixes and retrigger bugfix

Assets/Scenes/Andrew.unity

@@ -153,8 +153,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Dialogue: {fileID: 11400000, guid: 5adfc4c6a2d6fa84db2b309f6ff3678f, type: 2}
- Retriggerable: 0
- ResetOnRetrigger: 0
+ Retriggerable: 99
+ ResetOnRetrigger: 1
 --- !u!65 &100610658
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -339,8 +339,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Dialogue: {fileID: 11400000, guid: 4dce91eb47a21f34c81e37b8b28a4afd, type: 2}
- Retriggerable: 0
- ResetOnRetrigger: 0
+ Retriggerable: 99
+ ResetOnRetrigger: 1
 --- !u!65 &519283636
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -616,7 +616,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  Dialogue: {fileID: 11400000, guid: 546944b6fd662d04dbde9088a1fd4a15, type: 2}
- Retriggerable: 0
+ Retriggerable: 99
  ResetOnRetrigger: 0
 --- !u!65 &1182470464
 BoxCollider:

Assets/Scripts/Dialogue/Dialogue.cs

@@ -48,6 +48,15 @@ public class Dialogue : ScriptableObject, IEnumerable<MessagePair>
  }
  }
 
+ /// <summary>
+ /// Resets and returns the persistent enumerator
+ /// </summary>
+ public IEnumerator<MessagePair> ResetEnumerator()
+ {
+ _Enumerator = Messages.GetEnumerator();
+ return _Enumerator;
+ }
+
  public IEnumerator<MessagePair> GetEnumerator()
  {
  return ((IEnumerable<MessagePair>)Messages).GetEnumerator();

Assets/Scripts/Dialogue/DialogueHelpers.cs

@@ -44,13 +44,13 @@ public static class CharacterLookup
  [System.Serializable]
  public class MessagePair
  {
- public Character Character { get => _character; }
+ public Character DisplayCharacter { get => Character; }
  [Tooltip("The character that is speaking this message"), SerializeField]
- private Character _character = Character.None;
+ private Character Character = Character.None;
 
- public string Message { get => message; }
+ public string DisplayMessage { get => Message; }
  [Tooltip("Message text"), TextArea, SerializeField]
- private string message;
+ private string Message;
 
  public float AutoAdvance { get => _AutoAdvance; }
  [Tooltip("How long until this message advances"), SerializeField]

Assets/Scripts/Dialogue/DialogueManager.cs

@@ -41,13 +41,15 @@ void Update()
  /// </summary>
  /// <param name="Dialogue">Dialogue to add</param>
  /// <returns>True if dialogue was added</returns>
- public bool AddToQueue(Dialogue Dialogue)
+ public bool AddToQueue(Dialogue Dialogue, bool ResetDialogue = true)
  {
  var Added = false;
  if (DialogueQueue.Contains(Dialogue) == false)
  {
+ Dialogue.ResetEnumerator(); 
  DialogueQueue.Add(Dialogue);
  DialogueQueue = DialogueQueue.OrderByDescending(d => d.Priority).ToList();
+ Debug.Log($"Added {Dialogue} to the queue, total dialogues is {DialogueQueue.Count}");
  Added = true;
  if (DialogueCoroutine is null)
  {
@@ -89,7 +91,6 @@ protected IEnumerator RunThroughDialogue()
  }
  else
  {
- Debug.Assert(CurrentDialogue != null);
  if (CurrentDialogue.Interruptible && CurrentDialogue != DialogueQueue.First())
  {
  if (CurrentDialogue.ResumeAfterInterrupt == false)
@@ -105,26 +106,23 @@ protected IEnumerator RunThroughDialogue()
  if (CurrentDialogue.Enumerator.MoveNext())
  {
  CurrentMessage = CurrentDialogue.Enumerator.Current;
- Debug.Log($"Enumerator moved to {CurrentMessage}");
  }
  else
  {
- Debug.Log("Enumerator couldn't move to next");
  DialogueQueue.Remove(CurrentDialogue);
  CurrentDialogue = null;
  continue;
  }
  #endregion
 
  Portrait.sprite = CurrentMessage.CharacterSprite;
- MessageBox.text = CurrentMessage.Message;
+ MessageBox.text = CurrentMessage.DisplayMessage;
 
  EndTime = Time.time + CurrentMessage.AutoAdvance;
 
  yield return new WaitForSeconds(.5f);
  yield return new WaitUntil(() => Time.time >= EndTime || AdvanceScript);
 
- Debug.Log("Advancing dialogue");
  } while (DialogueQueue.Count > 0);
 
  Destroy(DialogueCanvas);

Assets/Scripts/Dialogue/DialogueTrigger.cs

@@ -46,11 +46,7 @@ void OnTriggerEnter(Collider other)
  {
  if (other.tag == "Player" && RemainingTriggers > 0)
  {
- var Added = other.GetComponent<DialogueManager>()?.AddToQueue(Dialogue) == true;
- if (ResetOnRetrigger)
- {
- Dialogue.Enumerator.Reset();
- }
+ var Added = other.GetComponent<DialogueManager>()?.AddToQueue(Dialogue, ResetOnRetrigger) == true;
  if (Added)
  {
  --RemainingTriggers;

Assets/Scripts/Dialogue/Interruptable.asset

@@ -13,11 +13,11 @@ MonoBehaviour:
  m_Name: Interruptable
  m_EditorClassIdentifier: 
  Messages:
- - _character: 5
- message: First message
+ - Character: 1
+ Message: First message waiting for input
  _AutoAdvance: Infinity
- - _character: 5
- message: Second message
+ - Character: 1
+ Message: Second message waiting for input
  _AutoAdvance: Infinity
  _Priority: 1
  _Interruptible: 1

Assets/Scripts/Dialogue/InterruptableNoResume.asset

@@ -13,11 +13,11 @@ MonoBehaviour:
  m_Name: InterruptableNoResume
  m_EditorClassIdentifier: 
  Messages:
- - _character: 3
- message: First message
+ - Character: 4
+ Message: First message waiting for input
  _AutoAdvance: Infinity
- - _character: 3
- message: This should not play!
+ - Character: 0
+ Message: This should not display after interruption
  _AutoAdvance: 10
  _Priority: 1
  _Interruptible: 1

Assets/Scripts/Dialogue/TestDialogue.asset

@@ -13,26 +13,26 @@ MonoBehaviour:
  m_Name: TestDialogue
  m_EditorClassIdentifier: 
  Messages:
- - _character: 1
- message: SUCK
+ - Character: 1
+ Message: SUCK
  _AutoAdvance: 3
- - _character: 2
- message: m'dick?
+ - Character: 2
+ Message: m'dick?
  _AutoAdvance: 1
- - _character: 3
- message: m'dick?
+ - Character: 3
+ Message: m'dick?
  _AutoAdvance: 1
- - _character: 4
- message: m'dick?
+ - Character: 4
+ Message: m'dick?
  _AutoAdvance: 1
- - _character: 5
- message: '...'
+ - Character: 5
+ Message: '...'
  _AutoAdvance: 1
- - _character: 5
- message: '... ...'
+ - Character: 5
+ Message: '....'
  _AutoAdvance: 2
- - _character: 5
- message: m'dick?
+ - Character: 5
+ Message: m'dick?
  _AutoAdvance: 4
  _Priority: 2
  _Interruptible: 0