Browse Source

Renamed and Moved ConversationManager class

master
Christopher 9 years ago
parent
commit
0075f24ced
  1. 8
      Assets/Fungus/Narrative/Scripts/Conversation.cs
  2. 0
      Assets/Fungus/Narrative/Scripts/Conversation.cs.meta
  3. 6
      Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs

8
Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs → Assets/Fungus/Narrative/Scripts/Conversation.cs

@ -6,7 +6,7 @@ using UnityEngine;
namespace Fungus namespace Fungus
{ {
public class ConversationManager public class Conversation
{ {
protected struct ConversationItem protected struct ConversationItem
{ {
@ -20,7 +20,7 @@ namespace Fungus
protected bool exitSayWait; protected bool exitSayWait;
public ConversationManager () public Conversation ()
{ {
// cache characters for faster lookup // cache characters for faster lookup
characters = UnityEngine.Object.FindObjectsOfType<Character>(); characters = UnityEngine.Object.FindObjectsOfType<Character>();
@ -55,7 +55,7 @@ namespace Fungus
yield break; yield break;
} }
var conversationItems = ParseConversation(conv); var conversationItems = Parse(conv);
// Play the conversation // Play the conversation
@ -132,7 +132,7 @@ namespace Fungus
} }
} }
protected virtual List<ConversationItem> ParseConversation(string conv) protected virtual List<ConversationItem> Parse(string conv)
{ {
//find SimpleScript say strings with portrait options //find SimpleScript say strings with portrait options
//You can test regex matches here: http://regexstorm.net/tester //You can test regex matches here: http://regexstorm.net/tester

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs.meta → Assets/Fungus/Narrative/Scripts/Conversation.cs.meta

6
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs vendored

@ -72,7 +72,7 @@ namespace Fungus
protected StringSubstituter stringSubstituter; protected StringSubstituter stringSubstituter;
protected ConversationManager conversationManager; protected Conversation conversation;
/// <summary> /// <summary>
/// Called by LuaEnvironment when initializing. /// Called by LuaEnvironment when initializing.
@ -285,7 +285,7 @@ namespace Fungus
stringSubstituter = new StringSubstituter(); stringSubstituter = new StringSubstituter();
conversationManager = new ConversationManager(); conversation = new Conversation();
if (fungusModule == FungusModuleOptions.UseGlobalVariables) if (fungusModule == FungusModuleOptions.UseGlobalVariables)
{ {
@ -477,7 +477,7 @@ namespace Fungus
/// <param name="conv"></param> /// <param name="conv"></param>
public virtual IEnumerator Conversation(string conv) public virtual IEnumerator Conversation(string conv)
{ {
return conversationManager.DoConversation(conv); return conversation.DoConversation(conv);
} }
} }

Loading…
Cancel
Save