Merge branch 'develop'

demonixis · Dec 20, 2022 · 3d5f877 · 3d5f877
2 parents ffa82ad + 47c524a
commit 3d5f877
Show file tree

Hide file tree

Showing 257 changed files with 4,149 additions and 41,343 deletions.
diff --git a/Assets/Scripts/Services/Brain/AIMLNetService.cs b/Assets/Scripts/Services/Brain/AIMLNetService.cs
@@ -56,10 +56,10 @@ private void InitializeBrain()
 
             _pathToUserSettings = Path.Combine(SaveGame.GetSavePath("Brain"), $"aiml-{_data.Language}-graphmaster.xml");
 
-            _aimlBot.ChangeMyPath = Path.Combine(Application.streamingAssetsPath, "AIML.Net", _data.Language);
-            _aimlBot.loadSettings();
+            _aimlBot.CustomResourcePath = Path.Combine(Application.streamingAssetsPath, "AIML.Net", _data.Language);
+            _aimlBot.LoadSettings();
             _aimlBot.isAcceptingUserInput = false;
-            _aimlBot.loadAIMLFromFiles();
+            _aimlBot.LoadAimlFromFiles();
             _aimlBot.isAcceptingUserInput = true;
         }
 
@@ -115,7 +115,7 @@ public void LoadBrain()
         {
             try
             {
-                _user.Predicates.loadSettings(_pathToUserSettings);
+                _user.Predicates.LoadSettings(_pathToUserSettings);
                 Debug.Log("Brain loaded");
             }
             catch (Exception e)

diff --git a/Assets/Vendors/aimlbot.net/AIMLBot.meta b/Assets/Vendors/aimlbot.net/AIMLBot.meta
diff --git a/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot.meta b/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot.meta
diff --git a/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/bot.cs b/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/bot.cs
diff --git a/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/condition.cs b/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/condition.cs
diff --git a/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/formal.cs b/Assets/Vendors/aimlbot.net/AIMLBot/AIMLbot/AIMLTagHandlers/formal.cs