Downgrade duplicate sprite to a warning so we can parse some base gam…

…e files with duplicated sprites
skairunner · Jan 13, 2020 · 8c61137 · 8c61137
1 parent aac24cb
commit 8c61137
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/kanimal-cli/Program.cs b/kanimal-cli/Program.cs
@@ -115,7 +115,8 @@ private static void Convert(string inputFormat, string outputFormat, List<string
                 case "scml":
                     var scmlWriter = new ScmlWriter(reader)
                     {
-                        FillMissingSprites = !opt.Strict
+                        FillMissingSprites = !opt.Strict,
+                        AllowDuplicateSprites = !opt.Strict
                     };
                     scmlWriter.SaveToDir(Path.Join(opt.OutputPath));
                     break;

diff --git a/kanimal/Writer/ScmlWriter.cs b/kanimal/Writer/ScmlWriter.cs
@@ -22,6 +22,7 @@ public class ScmlWriter : Writer
         protected XmlElement Entity;
 
         public bool FillMissingSprites = true; // When true, if a file is referenced in frames but doesn't exist as a sprite, add it as a blank 1x1 sprite.
+        public bool AllowDuplicateSprites = true; // When true if a sprite is defined multiple times, only utilize the first definition.
 
         public ScmlWriter(Reader reader)
         {
@@ -97,7 +98,14 @@ protected virtual void AddFolderInfo()
                     var key = row.GetSpriteName().ToFilename();
                     if (filenameindex.ContainsKey(key))
                     {
-                        throw new Exception($"filenameindex already contains a key for the sprite {key.Value}!");
+                        if (AllowDuplicateSprites)
+                        {
+                            Logger.Warn($"Duplicate sprite for {key.Value}. This may be indicative of a problem with the source file.");
+                        }
+                        else
+                        {
+                            throw new Exception($"filenameindex already contains a key for the sprite {key.Value}! Try again without strict mode if you believe this is in error.");
+                        }
                     }
 
                     filenameindex[key] = fileIndex;