Merge pull request #1 from denisabt/multi_buddy_version

not sure if this is 'old'

ClippyVSPackage/AssistantBase.cs

@@ -0,0 +1,33 @@
+using System.IO;
+using System.Text;
+
+namespace Recoding.ClippyVSPackage
+{
+    public class AssistantBase
+    {
+
+        /// <summary>
+        /// Seconds between a random idle animation and another
+        /// </summary>
+        protected const int IdleAnimationTimeout = 45;
+
+        /// <summary>
+        /// When is true it means an animation is actually running
+        /// </summary>
+        public bool IsAnimating { get; set; }
+
+        /// <summary>
+        /// Reads the content of a stream into a string
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <returns></returns>
+        public static string StreamToString(Stream stream)
+        {
+            stream.Position = 0;
+            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
+            {
+                return reader.ReadToEnd();
+            }
+        }
+    }
+}

ClippyVSPackage/Clippy.cs

@@ -3,9 +3,6 @@
 using Recoding.ClippyVSPackage.Configurations;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -20,7 +17,7 @@ namespace Recoding.ClippyVSPackage
     /// <summary>
     /// The core object that represents Clippy and its animations
     /// </summary>
-    public class Clippy
+    public class Clippy : AssistantBase
     {
         /// <summary>
         /// The URI for the sprite with all the animation stages for Clippy
@@ -57,15 +54,6 @@ public class Clippy
         /// </summary>
         private static int clipHeight = 93;
 
-        /// <summary>
-        /// Seconds between a random idle animation and another
-        /// </summary>
-        private const int IdleAnimationTimeout = 45;
-
-        /// <summary>
-        /// When is true it means an animation is actually running
-        /// </summary>
-        public bool IsAnimating { get; set; }
         public static int ClipHeight { get => clipHeight; set => clipHeight = value; }
         public static int ClipWidth { get => clipWidth; set => clipWidth = value; }
         public List<ClippyAnimation> AllAnimations { get => allAnimations; }
@@ -234,21 +222,5 @@ public async System.Threading.Tasks.Task StartAnimationAsync(ClippyAnimation ani
             }
 
         }
-
-
-
-        /// <summary>
-        /// Reads the content of a stream into a string
-        /// </summary>
-        /// <param name="stream"></param>
-        /// <returns></returns>
-        private static string StreamToString(Stream stream)
-        {
-            stream.Position = 0;
-            using (StreamReader reader = new StreamReader(stream, Encoding.UTF8))
-            {
-                return reader.ReadToEnd();
-            }
-        }
     }
 }

ClippyVSPackage/ClippyVSPackage.csproj

@@ -81,6 +81,7 @@
     <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="AssistantBase.cs" />
     <Compile Include="Clippy.cs" />
     <Compile Include="ClippyVSSettings.cs" />
     <Compile Include="Command1.cs" />
@@ -150,6 +151,10 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Command1.png" />
+    <Content Include="Resources\Merlin\agent.js" />
+    <Resource Include="Resources\Merlin\map.png" />
+    <Content Include="Resources\Merlin\sounds-mp3.js" />
+    <Content Include="Resources\Merlin\sounds-ogg.js" />
     <Content Include="Resources\preview.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>