From 6877df0b5ac57aad8bfbd755c473e78041430c97 Mon Sep 17 00:00:00 2001
From: Tim Sarbin <tim.sarbin@gmail.com>
Date: Fri, 23 Nov 2018 16:38:21 -0500
Subject: [PATCH] Added hero label text. Added dictionary. Fixed text redraw
 bug

---
 .../Interfaces/ITextDictionary.cs             | 13 ++++
 OpenDiablo2.Common/OpenDiablo2.Common.csproj  |  1 +
 OpenDiablo2.Common/ResourcePaths.cs           |  5 +-
 OpenDiablo2.Core/AutofacModule.cs             |  2 +-
 OpenDiablo2.Core/OpenDiablo2.Core.csproj      |  1 +
 OpenDiablo2.Core/TextDictionary.cs            | 35 ++++++++++
 OpenDiablo2.SDL2/SDL2Label.cs                 |  4 +-
 OpenDiablo2.SDL2/SDL2Sprite.cs                | 13 +---
 OpenDiablo2.Scenes/SelectHeroClass.cs         | 65 ++++++++++++++++++-
 9 files changed, 119 insertions(+), 20 deletions(-)
 create mode 100644 OpenDiablo2.Common/Interfaces/ITextDictionary.cs
 create mode 100644 OpenDiablo2.Core/TextDictionary.cs

diff --git a/OpenDiablo2.Common/Interfaces/ITextDictionary.cs b/OpenDiablo2.Common/Interfaces/ITextDictionary.cs
new file mode 100644
index 00000000..28ab4b47
--- /dev/null
+++ b/OpenDiablo2.Common/Interfaces/ITextDictionary.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenDiablo2.Common.Interfaces
+{
+    public interface ITextDictionary
+    {
+        string Translate(string key);
+    }
+}
diff --git a/OpenDiablo2.Common/OpenDiablo2.Common.csproj b/OpenDiablo2.Common/OpenDiablo2.Common.csproj
index 688f729b..3bbf397d 100644
--- a/OpenDiablo2.Common/OpenDiablo2.Common.csproj
+++ b/OpenDiablo2.Common/OpenDiablo2.Common.csproj
@@ -85,6 +85,7 @@
     <Compile Include="Interfaces\ISceneManager.cs" />
     <Compile Include="Interfaces\ISprite.cs" />
     <Compile Include="Interfaces\IMouseInfoProvider.cs" />
+    <Compile Include="Interfaces\ITextDictionary.cs" />
     <Compile Include="Interfaces\ITextLabel.cs" />
     <Compile Include="Models\BitStream.cs" />
     <Compile Include="Models\ButtonLayout.cs" />
diff --git a/OpenDiablo2.Common/ResourcePaths.cs b/OpenDiablo2.Common/ResourcePaths.cs
index 19a33ce2..6d209cff 100644
--- a/OpenDiablo2.Common/ResourcePaths.cs
+++ b/OpenDiablo2.Common/ResourcePaths.cs
@@ -74,7 +74,6 @@ namespace OpenDiablo2.Common
         public static string CharacterSelectDruidForwardWalk = "data\\global\\ui\\FrontEnd\\druid\\DZFW.DC6";
         public static string CharacterSelectDruidBackWalk = "data\\global\\ui\\FrontEnd\\druid\\DZBW.DC6";
 
-
         // --- Mouse Pointers ---
         public static string CursorDefault = "data\\global\\ui\\CURSOR\\ohand.DC6";
 
@@ -90,11 +89,13 @@ namespace OpenDiablo2.Common
         public static string FontExocet10 = "data\\local\\font\\latin\\fontexocet10";
         public static string FontExocet8 = "data\\local\\font\\latin\\fontexocet8";
 
-
         // --- UI ---
         public static string WideButtonBlank = "data\\global\\ui\\FrontEnd\\WideButtonBlank.dc6";
         public static string MediumButtonBlank = "data\\global\\ui\\FrontEnd\\MediumButtonBlank.dc6";
         public static string CancelButton = "data\\global\\ui\\FrontEnd\\CancelButtonBlank.dc6";
 
+        // --- Data ---
+        // TODO: Doesn't sound right :)
+        public static string EnglishTable = "data\\local\\lng\\eng\\English.txt";
     }
 }
diff --git a/OpenDiablo2.Core/AutofacModule.cs b/OpenDiablo2.Core/AutofacModule.cs
index a536022a..2c2b3a03 100644
--- a/OpenDiablo2.Core/AutofacModule.cs
+++ b/OpenDiablo2.Core/AutofacModule.cs
@@ -20,7 +20,7 @@ namespace OpenDiablo2.Core
             builder.RegisterType<GameEngine>().AsImplementedInterfaces().SingleInstance();
             builder.RegisterType<MPQProvider>().As<IMPQProvider>().SingleInstance();
             builder.RegisterType<ResourceManager>().As<IResourceManager>().SingleInstance();
-
+            builder.RegisterType<TextDictionary>().As<ITextDictionary>().SingleInstance();
             builder.RegisterType<Button>().AsSelf().InstancePerDependency();
         }
     }
diff --git a/OpenDiablo2.Core/OpenDiablo2.Core.csproj b/OpenDiablo2.Core/OpenDiablo2.Core.csproj
index 3d9ef30e..e36509eb 100644
--- a/OpenDiablo2.Core/OpenDiablo2.Core.csproj
+++ b/OpenDiablo2.Core/OpenDiablo2.Core.csproj
@@ -77,6 +77,7 @@
     <Compile Include="MPQProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ResourceManager.cs" />
+    <Compile Include="TextDictionary.cs" />
     <Compile Include="UI\Button.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/OpenDiablo2.Core/TextDictionary.cs b/OpenDiablo2.Core/TextDictionary.cs
new file mode 100644
index 00000000..4c295f6b
--- /dev/null
+++ b/OpenDiablo2.Core/TextDictionary.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OpenDiablo2.Common;
+using OpenDiablo2.Common.Interfaces;
+
+namespace OpenDiablo2.Core
+{
+    public sealed class TextDictionary : ITextDictionary
+    {
+        private readonly IMPQProvider mpqProvider;
+
+        private Dictionary<string, string> lookupTable = new Dictionary<string, string>();
+
+        public TextDictionary(IMPQProvider mpqProvider)
+        {
+            this.mpqProvider = mpqProvider;
+            LoadDictionary();
+        }
+
+        private void LoadDictionary()
+        {
+            var text = mpqProvider.GetTextFile(ResourcePaths.EnglishTable).First();
+
+            var rowstoLoad = text.Where(x => x.Split(',').Count() == 3).Select(x => x.Split(',').Select(z => z.Trim()).ToArray());
+            foreach(var row in rowstoLoad)
+                lookupTable[row[1]] = !(row[2].StartsWith("\"") && row[2].EndsWith("\"")) ? row[2] : row[2].Substring(1, row[2].Length - 2);
+
+        }
+
+        public string Translate(string key) => lookupTable[key];
+    }
+}
diff --git a/OpenDiablo2.SDL2/SDL2Label.cs b/OpenDiablo2.SDL2/SDL2Label.cs
index 46027e0f..cee260e3 100644
--- a/OpenDiablo2.SDL2/SDL2Label.cs
+++ b/OpenDiablo2.SDL2/SDL2Label.cs
@@ -79,15 +79,15 @@ namespace OpenDiablo2.SDL2_
 
             TextArea = CalculateSize();
             textureSize = new Size(Pow2(TextArea.Width), Pow2(TextArea.Height));
-            texture = SDL.SDL_CreateTexture(renderer, SDL.SDL_PIXELFORMAT_ARGB8888, (int)SDL.SDL_TextureAccess.SDL_TEXTUREACCESS_TARGET, textureSize.Width, textureSize.Height);
 
+            texture = SDL.SDL_CreateTexture(renderer, SDL.SDL_PIXELFORMAT_ARGB8888, (int)SDL.SDL_TextureAccess.SDL_TEXTUREACCESS_TARGET, textureSize.Width, textureSize.Height);
             if (texture == IntPtr.Zero)
                 throw new ApplicationException("Unaple to initialize texture.");
 
             SDL.SDL_SetTextureBlendMode(texture, SDL.SDL_BlendMode.SDL_BLENDMODE_BLEND);
             SDL.SDL_SetRenderTarget(renderer, texture);
             SDL.SDL_SetRenderDrawColor(renderer, 0, 0, 0, 0);
-            SDL.SDL_RenderFillRect(renderer, IntPtr.Zero);
+            SDL.SDL_RenderClear(renderer);
             SDL.SDL_SetRenderDrawColor(renderer, 255, 255, 255, 255);
 
             int cx = 0;
diff --git a/OpenDiablo2.SDL2/SDL2Sprite.cs b/OpenDiablo2.SDL2/SDL2Sprite.cs
index 8573d028..8fa7fe8d 100644
--- a/OpenDiablo2.SDL2/SDL2Sprite.cs
+++ b/OpenDiablo2.SDL2/SDL2Sprite.cs
@@ -90,15 +90,6 @@ namespace OpenDiablo2.SDL2_
 
         }
 
-        // TODO: Less dumb color correction
-        private Color AdjustColor(Color source)
-        => Color.FromArgb(
-                source.A,
-                (byte)Math.Min((float)source.R * 1.2, 255),
-                (byte)Math.Min((float)source.G * 1.2, 255),
-                (byte)Math.Min((float)source.B * 1.2, 255)
-            );
-
         private unsafe void LoadFrame(int index)
         {
             var frame = source.Frames[index];
@@ -124,9 +115,7 @@ namespace OpenDiablo2.SDL2_
                         }
 
                         
-                        var palColor = frame.GetColor(x, (int)(y - frameOffset), CurrentPalette);
-                        //var col = AdjustColor(palColor);
-                        data[x + (y * (pitch / 4))] = palColor;
+                        data[x + (y * (pitch / 4))] = frame.GetColor(x, (int)(y - frameOffset), CurrentPalette);
                     }
                 }
             }
diff --git a/OpenDiablo2.Scenes/SelectHeroClass.cs b/OpenDiablo2.Scenes/SelectHeroClass.cs
index 83921545..9fefb3f1 100644
--- a/OpenDiablo2.Scenes/SelectHeroClass.cs
+++ b/OpenDiablo2.Scenes/SelectHeroClass.cs
@@ -52,11 +52,13 @@ namespace OpenDiablo2.Scenes
         private readonly IMouseInfoProvider mouseInfoProvider;
         private readonly IMusicProvider musicProvider;
         private readonly ISceneManager sceneManager;
+        private readonly ITextDictionary textDictionary;
 
+        private eHero? selectedHero = null;
         private float secondTimer;
         private ISprite backgroundSprite, campfireSprite;
         private IFont headingFont;
-        private ILabel headingLabel;
+        private ILabel headingLabel, heroClassLabel;
         private Button exitButton;
         private Dictionary<eHero, HeroRenderInfo> heroRenderInfo = new Dictionary<eHero, HeroRenderInfo>();
 
@@ -67,7 +69,8 @@ namespace OpenDiablo2.Scenes
             IMouseInfoProvider mouseInfoProvider,
             IMusicProvider musicProvider,
             ISceneManager sceneManager,
-            Func<eButtonType, Button> createButton
+            Func<eButtonType, Button> createButton,
+            ITextDictionary textDictionary
             )
         {
             this.renderWindow = renderWindow;
@@ -75,6 +78,7 @@ namespace OpenDiablo2.Scenes
             this.mpqProvider = mpqProvider;
             this.mouseInfoProvider = mouseInfoProvider;
             this.sceneManager = sceneManager;
+            this.textDictionary = textDictionary;
 
 
             backgroundSprite = renderWindow.LoadSprite(ResourcePaths.CharacterSelectBackground, Palettes.Fechar);
@@ -189,10 +193,15 @@ namespace OpenDiablo2.Scenes
             };
 
             headingFont = renderWindow.LoadFont(ResourcePaths.Font30, Palettes.Units);
+
             headingLabel = renderWindow.CreateLabel(headingFont);
-            headingLabel.Text = "Select Hero Class";
+            headingLabel.Text = textDictionary.Translate("strSelectHeroClass");
             headingLabel.Location = new Point(400 - (headingLabel.TextArea.Width / 2), 17);
 
+            heroClassLabel = renderWindow.CreateLabel(headingFont);
+            heroClassLabel.Text = "";
+            heroClassLabel.Location = new Point(400 - (heroClassLabel.TextArea.Width / 2), 65);
+
             exitButton = createButton(eButtonType.Medium);
             exitButton.Text = "EXIT";
             exitButton.Location = new Point(30, 540);
@@ -219,6 +228,8 @@ namespace OpenDiablo2.Scenes
 
             renderWindow.Draw(campfireSprite, (int)(campfireSprite.TotalFrames * secondTimer));
             renderWindow.Draw(headingLabel);
+            if (selectedHero.HasValue)
+                renderWindow.Draw(heroClassLabel);
             exitButton.Render();
         }
 
@@ -286,6 +297,11 @@ namespace OpenDiablo2.Scenes
             foreach (var hero in Enum.GetValues(typeof(eHero)).Cast<eHero>())
                 UpdateHeroSelectionHover(hero, ms, canSelect);
 
+            if (selectedHero.HasValue && heroRenderInfo.All(x => x.Value.Stance == eHeroStance.Idle))
+            {
+                selectedHero = null;
+            }
+
             exitButton.Update();
         }
 
@@ -353,10 +369,53 @@ namespace OpenDiablo2.Scenes
                     break;
                 }
 
+                selectedHero = hero;
+                UpdateHeroText();
+
                 return;
             }
 
             heroRenderInfo[hero].Stance = mouseHover ? eHeroStance.IdleSelected : eHeroStance.Idle;
+
+            if (selectedHero == null && mouseHover)
+            {
+                selectedHero = hero;
+                UpdateHeroText();
+            }
+
+        }
+
+        private void UpdateHeroText()
+        {
+            if (selectedHero == null)
+                return;
+
+            switch (selectedHero.Value)
+            {
+                case eHero.Barbarian:
+                    heroClassLabel.Text = textDictionary.Translate("strBarbarian");
+                    break;
+                case eHero.Necromancer:
+                    heroClassLabel.Text = textDictionary.Translate("strNecromancer");
+                    break;
+                case eHero.Paladin:
+                    heroClassLabel.Text = textDictionary.Translate("strPaladin");
+                    break;
+                case eHero.Assassin:
+                    heroClassLabel.Text = textDictionary.Translate("strAssassin");
+                    break;
+                case eHero.Sorceress:
+                    heroClassLabel.Text = textDictionary.Translate("strSorceress");
+                    break;
+                case eHero.Amazon:
+                    heroClassLabel.Text = textDictionary.Translate("strAmazon");
+                    break;
+                case eHero.Druid:
+                    heroClassLabel.Text = textDictionary.Translate("strDruid");
+                    break;
+            }
+
+            heroClassLabel.Location = new Point(400 - (heroClassLabel.TextArea.Width / 2), 65);
         }
 
         public void Dispose()