Improved Storyboard parsing;

Negum.Core/Loaders/IDataLoader.cs

@@ -47,23 +47,31 @@ public async Task<IData> LoadAsync(IEngine engine)
 
             if (!string.IsNullOrWhiteSpace(motifLogoPath))
             {
-                var motifLogoFullPath = this.FindFile(motifFile.Directory.FullName, motifLogoPath);
-                data.LogoManager = await this.ReadManagerAsync<IStoryboardManager>(motifLogoFullPath);
-                data.LogoAnimationManager = await this.ReadManagerAsync<IAnimationManager, IAnimationReader>(motifLogoFullPath);
+                data.Logo = await this.ReadStoryboardAsync(motifFile.Directory.FullName, motifLogoPath);
             }
 
             var motifIntroPath = data.MotifManager.Files.IntroStoryboardDefinition;
 
             if (!string.IsNullOrWhiteSpace(motifIntroPath))
             {
-                var motifIntroFullPath = this.FindFile(motifFile.Directory.FullName, motifIntroPath);
-                data.IntroManager = await this.ReadManagerAsync<IStoryboardManager>(motifIntroFullPath);
-                data.IntroAnimationManager = await this.ReadManagerAsync<IAnimationManager, IAnimationReader>(motifIntroFullPath);
+                data.Intro = await this.ReadStoryboardAsync(motifFile.Directory.FullName, motifIntroPath);
             }
 
             return data;
         }
 
+        protected virtual async Task<IStoryboard> ReadStoryboardAsync(string dirName, string fileName)
+        {
+            var defFilePath = this.FindFile(dirName, fileName);
+            var storyboard = new Storyboard();
+
+            storyboard.Manager = await this.ReadManagerAsync<IStoryboardManager>(defFilePath);
+            storyboard.Animation = await this.ReadManagerAsync<IAnimationManager, IAnimationReader>(defFilePath);
+            storyboard.Sprite = await this.GetSpriteAsync(dirName, storyboard.Manager.SceneDef.SpriteFile);
+
+            return storyboard;
+        }
+
         protected override FileInfo FindFile(string dirName, string fileName)
         {
             if (fileName.StartsWith("data/"))

Negum.Core/Managers/Types/IStoryboardManager.cs

@@ -21,6 +21,9 @@ public interface IStoryboardManager : IManager
 
     public interface IStoryboardSceneDef : IManagerSection
     {
+        /// <summary>
+        /// Path to the sprite file.
+        /// </summary>
         string SpriteFile => this.GetValue<string>("spr");
 
         /// <summary>

Negum.Core/Models/Data/IData.cs

@@ -44,24 +44,14 @@ public interface IData
         IFightManager FightManager { get; }
 
         /// <summary>
-        /// Manager which wraps logo definition.
+        /// Defines Logo-related information.
         /// </summary>
-        IStoryboardManager LogoManager { get; }
+        IStoryboard Logo { get; }
 
         /// <summary>
-        /// Manager which wraps logo animation.
+        /// Defines Intro-related information.
         /// </summary>
-        IAnimationManager LogoAnimationManager { get; }
-
-        /// <summary>
-        /// Manager which wraps intro definition.
-        /// </summary>
-        IStoryboardManager IntroManager { get; }
-
-        /// <summary>
-        /// Manager which wraps intro animation.
-        /// </summary>
-        IAnimationManager IntroAnimationManager { get; }
+        IStoryboard Intro { get; }
     }
 
     /// <summary>
@@ -78,9 +68,7 @@ public class NegumData : IData
         public ISound MotifSound { get; internal set; }
         public ISelectionManager SelectionManager { get; internal set; }
         public IFightManager FightManager { get; internal set; }
-        public IStoryboardManager LogoManager { get; internal set; }
-        public IAnimationManager LogoAnimationManager { get; internal set; }
-        public IStoryboardManager IntroManager { get; internal set; }
-        public IAnimationManager IntroAnimationManager { get; internal set; }
+        public IStoryboard Logo { get; internal set; }
+        public IStoryboard Intro { get; internal set; }
     }
 }

Negum.Core/Models/Data/IStoryboard.cs

@@ -0,0 +1,43 @@
+using Negum.Core.Managers.Types;
+using Negum.Core.Models.Sprites;
+
+namespace Negum.Core.Models.Data
+{
+    /// <summary>
+    /// Represents Storyboard data read from directory.
+    /// </summary>
+    /// 
+    /// <author>
+    /// https://github.com/TheNegumProject/Negum.Core
+    /// </author>
+    public interface IStoryboard
+    {
+        /// <summary>
+        /// Main manager which contains information about current Storyboard.
+        /// </summary>
+        IStoryboardManager Manager { get; }
+
+        /// <summary>
+        /// Manager which contains information about Animations in this Storyboard.
+        /// </summary>
+        IAnimationManager Animation { get; }
+
+        /// <summary>
+        /// Sprites used by this storyboard.
+        /// </summary>
+        ISprite Sprite { get; }
+    }
+
+    /// <summary>
+    /// </summary>
+    /// 
+    /// <author>
+    /// https://github.com/TheNegumProject/Negum.Core
+    /// </author>
+    public class Storyboard : IStoryboard
+    {
+        public IStoryboardManager Manager { get; internal set; }
+        public IAnimationManager Animation { get; internal set; }
+        public ISprite Sprite { get; internal set; }
+    }
+}

Tests/Negum.Core.Tests/Managers/StoryboardManagerTests.cs

@@ -15,8 +15,7 @@ namespace Negum.Core.Tests.Managers
     public class StoryboardManagerTests : TestBase
     {
         [Theory]
-        [InlineData(
-            "https://raw.githubusercontent.com/TheNegumProject/DragonBallMugenEdition2009/main/data/Backup/intro.def")]
+        [InlineData("https://raw.githubusercontent.com/TheNegumProject/DragonBallMugenEdition2009/main/data/Backup/intro.def")]
         public async Task Should_Count_Number_Of_Scenes_And_Print_Details(string path)
         {
             this.InitializeContainer();