- Applied minor tweaks and fixes

Author: UrusaiDaisei

Assets/EmotionalAppraisal/AppraisalRules/AppraisalRule.cs

@@ -13,9 +13,13 @@ namespace EmotionalAppraisal.AppraisalRules
 	/// @author João Dias
 	/// @author Pedro Gonçalves
 	[Serializable]
-	public class AppraisalRule : BaseDomainObject
+	public class AppraisalRule
 	{
-        public Name EventName { get; set; }
+		[NonSerialized]
+		private Guid m_id;
+
+		public Guid Id { get { return m_id; } set { m_id = value; } }
+		public Name EventName { get; set; }
 		public ConditionSet Conditions { get; set; }
 
 		public AppraisalRule(Name eventName, ConditionSet conditions = null)
@@ -25,8 +29,9 @@ public AppraisalRule(Name eventName, ConditionSet conditions = null)
 			Desirability = Praiseworthiness = 0;
 		}
 
-	    public AppraisalRule(AppraisalRuleDTO appraisalRuleDTO) :base(appraisalRuleDTO.Id)
+	    public AppraisalRule(AppraisalRuleDTO appraisalRuleDTO)
 	    {
+		    m_id = appraisalRuleDTO.Id;
 	        EventName = Name.BuildName(appraisalRuleDTO.EventMatchingTemplate);
 	        Desirability = appraisalRuleDTO.Desirability;
 	        Praiseworthiness = appraisalRuleDTO.Praiseworthiness;
@@ -37,8 +42,9 @@ public AppraisalRule(AppraisalRuleDTO appraisalRuleDTO) :base(appraisalRuleDTO.I
 		///     Clone Constructor
 		/// </summary>
 		/// <param name="other">the reaction to clone</param>
-		public AppraisalRule(AppraisalRule other) : base(other.Id)
+		public AppraisalRule(AppraisalRule other)
 		{
+			m_id = other.m_id;
 			EventName = other.EventName;
 			Conditions = new ConditionSet(other.Conditions);
 			Desirability = other.Desirability;

Assets/EmotionalAppraisal/AppraisalRules/ReactiveAppraisalDerivator.cs

@@ -211,6 +211,7 @@ public void SetObjectData(ISerializationData dataHolder, ISerializationContext c
 
 		    foreach (var r in rules)
 		    {
+				r.Id = Guid.NewGuid();
                 AddEmotionalReaction(r);
             }
 		}

Assets/EmotionalAppraisal/BaseDomainObject.cs

@@ -40,7 +40,6 @@
     <Compile Include="ActiveEmotion.cs" />
     <Compile Include="AppraisalRules\AppraisalRule.cs" />
     <Compile Include="AppraisalRules\ReactiveAppraisalDerivator.cs" />
-    <Compile Include="BaseDomainObject.cs" />
     <Compile Include="BaseEmotion.cs" />
     <Compile Include="Components\IAffectDerivator.cs" />
     <Compile Include="Components\IAppraisalDerivator.cs" />

Assets/EmotionalAppraisal/EmotionalAppraisal.csproj

@@ -303,7 +303,9 @@ public void SetObjectData(ISerializationData dataHolder, ISerializationContext c
             {
                 m_agentDialogues = new List<DialogStateAction>(agentDialogueArray.Select(dto => new DialogStateAction(dto)));
             }
-        }
+
+			m_dialogueStates = new Dictionary<string, string>();
+		}
 
         #endregion
 

Assets/IntegratedAuthoringTool/IntegratedAuthoringToolAsset.cs

@@ -1,6 +1,6 @@
 @echo off
 SET debugPath=bin\Debug
-SET debugInclude=*.dll *.pdb
+SET debugInclude=*.dll *.pdb *.mdb
 SET releasePath=bin\Release
 SET releaseInclude=*.dll
 

Components/Utilities/export.bat Assets/SocialImportance/export.bat

@@ -180,23 +180,19 @@ public override bool Equals(Name name)
 
 			public override bool Match(Name name)
 			{
-				var other = name as ComposedName;
-				if (other == null)
-					return false;
+				if (name.IsUniversal)
+					return true;
 
-				if (other.Terms.Length != Terms.Length)
+				var other = name as ComposedName;
+				if (other?.Terms.Length != Terms.Length)
 					return false;
 
 				if (!other.RootSymbol.Match(RootSymbol))
 				{
 					return false;
 				}
 
-				for (int i = 0; i < Terms.Length; i++)
-					if (!Terms[i].Match(other.Terms[i]))
-						return false;
-
-				return true;
+				return !Terms.Where((t, i) => !t.Match(other.Terms[i])).Any();
 			}
 
 			public override Name ApplyToTerms(Func<Name, Name> transformFunction)

Components/WellFormedNames/Implementation/ComposedName.cs

@@ -85,6 +85,9 @@ public override Name MakeGround(SubstitutionSet bindings)
 
 			public override bool Match(Name name)
 			{
+				if (name.IsUniversal)
+					return true;
+
 				PrimitiveSymbol s = name as PrimitiveSymbol;
 				if (s == null)
 					return false;

Components/WellFormedNames/Implementation/PrimitiveSymbol.cs

@@ -83,6 +83,9 @@ public override Name MakeGround(SubstitutionSet bindings)
 
 			public override bool Match(Name name)
 			{
+				if (name.IsUniversal)
+					return true;
+
 				return Equals(name as VariableSymbol);
 			}
 

Components/WellFormedNames/Implementation/VariableSymbol.cs

@@ -37,7 +37,7 @@ public static bool Unify(Name name1, Name name2, out IEnumerable<Substitution> b
 
 			if (name1.IsGrounded && name2.IsGrounded)
 			{
-				var result = name1.Equals(name2);
+				var result = name1.Match(name2);
 				if (result)
 					bindings = Enumerable.Empty<Substitution>();
 				return result;

Components/WellFormedNames/Unifier.cs

@@ -1,7 +1,7 @@
 @echo off
 
 SET exportBat=export.bat
-SET excludeDirectories=tools Tests
+SET excludeDirectories=\tools\ \Tests\
 SET pdo2mdbPath=\tools\pdb2mdb\pdb2mdb.exe
 
 IF NOT "%~1" == "debug" (
@@ -25,7 +25,7 @@ IF NOT EXIST "%targetPath%" (
 	exit /B 
 )
 
-FOR /F %%i IN ('dir /b /AD ^| findstr /v /x "%excludeDirectories%"') DO (
+FOR /F "delims=" %%i IN ('dir /B /S /A:D ^| findstr /v "%excludeDirectories%"') DO (
 	pushd "%%~fi"
 		IF EXIST %exportBat% (
 			echo Exporting %%i

ExportDlls.bat

@@ -23,6 +23,9 @@ protected BaseAssetForm()
 
 		public void SetModified()
 		{
+			if(_wasModified)
+				return;
+
 			_wasModified = true;
 			UpdateWindowTitle();
 		}

GUI/GAIPS.AssetEditorTools/BaseAssetForm.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using AssetManagerPackage;
+using GAIPS.AssetEditorTools;
 
 namespace IntegratedAuthoringToolWF
 {
@@ -12,6 +13,8 @@ static class Program
         [STAThread]
         static void Main()
         {
+			AssetManager.Instance.Bridge = new ApplicationBridge();
+
 			Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new MainForm());

GUI/IntegratedAuthoringToolWF/Program.cs

@@ -133,7 +133,8 @@ private void GenerateVoicesTask(string basePath, IProgressBarControler controlle
 			int i = 0;
 			foreach (var split in _agentActions.Zip(controller.Split(_agentActions.Length), (dto, ctrl) => new { data = dto, ctrl }))
 			{
-				var path = Path.Combine(basePath, split.data.Id.ToString("N"));
+				var id = $"{split.data.CurrentState}#{split.data.NextState}#{split.data.Meaning}({split.data.Style})".ToUpperInvariant();
+				var path = Path.Combine(basePath, id);
 				Directory.CreateDirectory(path);
 
 				split.ctrl.Message = $"Generating TTS for Utterance ({++i}/{_agentActions.Length})";

GUI/IntegratedAuthoringToolWF/TextToSpeechForm.cs

@@ -63,6 +63,7 @@ private void button1_Click(object sender, EventArgs e)
 		private void button2_Click(object sender, EventArgs e)
 		{
 			_path.Text = string.Empty;
+			OnPathChanged?.Invoke(this, new EventArgs());
 		}
 
 		private void _path_TextChanged(object sender, EventArgs e)

GUI/RolePlayCharacterWF/BaseAssetControl.cs

@@ -7,13 +7,17 @@ namespace RolePlayCharacterWF
 {
     public sealed partial class MainForm : BaseRPCForm
     {
+	    private bool _ignoreEvents = false;
+
 		public MainForm()
         {
             InitializeComponent();
         }
 
 		protected override void OnAssetDataLoaded(RolePlayCharacterAsset asset)
-	    {
+		{
+			_ignoreEvents = true;
+
 			textBoxCharacterName.Text = asset.CharacterName;
 			textBoxCharacterBody.Text = asset.BodyName;
 			var ea = EditorTools.GetFieldValue<EmotionalAppraisal.EmotionalAppraisalAsset>(asset, "_emotionalAppraisalAsset");
@@ -24,34 +28,56 @@ protected override void OnAssetDataLoaded(RolePlayCharacterAsset asset)
 
 			var si = EditorTools.GetFieldValue<SocialImportance.SocialImportanceAsset>(asset, "_socialImportanceAsset");
 			siAssetControl1.SetAsset(si);
+
+			_ignoreEvents = false;
 		}
 
 		private void textBoxCharacterName_TextChanged(object sender, EventArgs e)
         {
+			if(_ignoreEvents)
+				return;
+
 			CurrentAsset.CharacterName = textBoxCharacterName.Text;
+			SetModified();
         }
 
         private void textBoxCharacterBody_TextChanged(object sender, EventArgs e)
         {
-            CurrentAsset.BodyName = textBoxCharacterBody.Text;
-        }
+			if (_ignoreEvents)
+				return;
+
+			CurrentAsset.BodyName = textBoxCharacterBody.Text;
+			SetModified();
+		}
 
 		private void eaAssetControl1_OnPathChanged(object sender, EventArgs e)
 		{
+			if (_ignoreEvents)
+				return;
+
 			CurrentAsset.EmotionalAppraisalAssetSource = eaAssetControl1.Path;
 			ReloadAsset(sender,e);
+			SetModified();
 		}
 
 		private void edmAssetControl1_OnPathChanged(object sender, EventArgs e)
 		{
+			if (_ignoreEvents)
+				return;
+
 			CurrentAsset.EmotionalDecisionMakingSource = edmAssetControl1.Path;
 			ReloadAsset(sender, e);
+			SetModified();
 		}
 
 		private void siAssetControl1_OnPathChanged(object sender, EventArgs e)
 		{
+			if (_ignoreEvents)
+				return;
+
 			CurrentAsset.SocialImportanceAssetSource = siAssetControl1.Path;
 			ReloadAsset(sender, e);
+			SetModified();
 		}
 
 		private void ReloadAsset(object sender, EventArgs e)

GUI/RolePlayCharacterWF/MainForm.cs

@@ -1,7 +1,7 @@
 @echo off
 set mode=debug
 set assetRepositoriesFolder=..\..\AssetDev
-set destination=\Assets\AssetDLLs
+set destination=\Assets\FAtiMA\Plugins
 SET mainExportBat=ExportDlls.bat
 
 ::----------------------------------------------------------