Improved Simulator UI when displaying emotions. Fixed a World Effect bug

Author: Rexrex

Assets/EmotionalAppraisal/ActiveEmotion.cs

@@ -191,6 +191,7 @@ public EmotionDTO ToDto(AM am)
 	        {
                 Type = this.EmotionType,
                 Intensity = this.Intensity,
+                Target = this.Direction?.ToString(),
                 CauseEventId =  this.CauseId, 
                 CauseEventName = am.RecallEvent(this.CauseId).EventName.ToString(),
 	        };

Assets/EmotionalAppraisal/BaseEmotion.cs

@@ -161,6 +161,7 @@ public EmotionDTO ToDto(AM am)
             {
                 Type = this.EmotionType,
                 Intensity = this.Potential,
+                Target = this.Direction?.ToString(),
                 CauseEventId = this.CauseId,
                 CauseEventName = am.RecallEvent(this.CauseId).EventName.ToString()
             };

Assets/EmotionalAppraisal/DTOs/EmotionDTO.cs

@@ -16,6 +16,10 @@ public class EmotionDTO
 		/// The current intencity of the emotion
 		/// </summary>
 		public float Intensity { get; set; }
+        /// <summary>
+		/// The current intencity of the emotion
+		/// </summary>
+		public string Target { get; set; }
 		/// <summary>
 		/// The event that caused the expression of this emotion
 		/// </summary>

Assets/RolePlayCharacter/RolePlayerCharacterAsset.cs

@@ -531,10 +531,12 @@ public string GetInternalStateString()
         {
             if (this.GetAllActiveEmotions().Any())
             {
-                var emotion = GetBeliefValue("StrongestEmotion(SELF)");
-                var intensity = this.GetAllActiveEmotions().Max(e => e.Intensity);
+                var em = this.GetAllActiveEmotions().MaxValue<EmotionDTO>(e => e.Intensity);
+
+                
+
                 return "M: " + this.Mood.ToString("F2") +
-                       " | S. Em: " + emotion + "-" + intensity.ToString("F2");
+                       " | S. Em: " + em.Type + "(" + em.Intensity.ToString("F2") + ", " + em.Target + ")";
             }
             else return "M: " + this.Mood.ToString("F2");
         }

AuthoringTools/.vs/AuthoringTools/v15/Server/sqlite3/storage.ide

@@ -117,6 +117,7 @@
     <Compile Include="TTSEngines\Viseme.cs" />
     <EmbeddedResource Include="AboutForm.resx">
       <DependentUpon>AboutForm.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="AddOrEditDialogueActionForm.resx">
       <DependentUpon>AddOrEditDialogueActionForm.cs</DependentUpon>

AuthoringTools/.vs/AuthoringTools/v15/Server/sqlite3/storage.ide-shm

@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.5.0")]
-[assembly: AssemblyFileVersion("2.5.0")]
+[assembly: AssemblyVersion("2.5.4")]
+[assembly: AssemblyFileVersion("2.5.4")]

AuthoringTools/.vs/AuthoringTools/v15/Server/sqlite3/storage.ide-wal

@@ -40,6 +40,7 @@ public AddorEditEffect(WorldModelAsset wm, Name eventTemplate , int _index, Effe
 
             propertyName.AllowNil = false;
             propertyName.AllowUniversal = false;
+            propertyName.AllowLiteral = false;
 
             _effectToEdit = effectToEdit;
 
@@ -112,5 +113,10 @@ private void label4_Click(object sender, EventArgs e)
         {
 
         }
+
+        private void propertyName_TextChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }