From 0075f24ced96abf475fe2ec0096d531bbefce351 Mon Sep 17 00:00:00 2001 From: Christopher Date: Tue, 26 Jul 2016 10:50:01 +0100 Subject: [PATCH] Renamed and Moved ConversationManager class --- .../Scripts/Conversation.cs} | 8 ++++---- .../Scripts/Conversation.cs.meta} | 0 Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename Assets/Fungus/{Thirdparty/FungusLua/Scripts/ConversationManager.cs => Narrative/Scripts/Conversation.cs} (97%) rename Assets/Fungus/{Thirdparty/FungusLua/Scripts/ConversationManager.cs.meta => Narrative/Scripts/Conversation.cs.meta} (100%) diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs b/Assets/Fungus/Narrative/Scripts/Conversation.cs similarity index 97% rename from Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs rename to Assets/Fungus/Narrative/Scripts/Conversation.cs index 1324effd..8e981d20 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs +++ b/Assets/Fungus/Narrative/Scripts/Conversation.cs @@ -6,7 +6,7 @@ using UnityEngine; namespace Fungus { - public class ConversationManager + public class Conversation { protected struct ConversationItem { @@ -20,7 +20,7 @@ namespace Fungus protected bool exitSayWait; - public ConversationManager () + public Conversation () { // cache characters for faster lookup characters = UnityEngine.Object.FindObjectsOfType(); @@ -55,7 +55,7 @@ namespace Fungus yield break; } - var conversationItems = ParseConversation(conv); + var conversationItems = Parse(conv); // Play the conversation @@ -132,7 +132,7 @@ namespace Fungus } } - protected virtual List ParseConversation(string conv) + protected virtual List Parse(string conv) { //find SimpleScript say strings with portrait options //You can test regex matches here: http://regexstorm.net/tester diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs.meta b/Assets/Fungus/Narrative/Scripts/Conversation.cs.meta similarity index 100% rename from Assets/Fungus/Thirdparty/FungusLua/Scripts/ConversationManager.cs.meta rename to Assets/Fungus/Narrative/Scripts/Conversation.cs.meta diff --git a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs index c4b6a8e0..3728ec45 100644 --- a/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs +++ b/Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs @@ -72,7 +72,7 @@ namespace Fungus protected StringSubstituter stringSubstituter; - protected ConversationManager conversationManager; + protected Conversation conversation; /// /// Called by LuaEnvironment when initializing. @@ -285,7 +285,7 @@ namespace Fungus stringSubstituter = new StringSubstituter(); - conversationManager = new ConversationManager(); + conversation = new Conversation(); if (fungusModule == FungusModuleOptions.UseGlobalVariables) { @@ -477,7 +477,7 @@ namespace Fungus /// public virtual IEnumerator Conversation(string conv) { - return conversationManager.DoConversation(conv); + return conversation.DoConversation(conv); } }