Added price overlay

josdemmers · Mar 6, 2022 · 37ef14c · 37ef14c
1 parent 8a2d127
commit 37ef14c
Show file tree

Hide file tree

Showing 39 changed files with 6,275 additions and 7,103 deletions.
diff --git a/NewWorldCompanion.Entities/CraftingRecipeJson.cs b/NewWorldCompanion.Entities/CraftingRecipeJson.cs
@@ -4,7 +4,7 @@ namespace NewWorldCompanion.Entities
 {
     public class CraftingRecipeJson
     {
-        /// <value>Matches SalvageAchievement from MasterItemDefinitionsCrafting</value> 
+        /// <value>Matches SalvageAchievement from MasterItemDefinitionsCraftingJson</value> 
         public string RequiredAchievementID { get; set; } = string.Empty;
         public string Tradeskill { get; set; } = string.Empty;
     }

diff --git a/NewWorldCompanion.Entities/MasterItemDefinitionsCraftingJson.cs b/NewWorldCompanion.Entities/MasterItemDefinitionsCraftingJson.cs
@@ -2,10 +2,13 @@
 {
     public class MasterItemDefinitionsCraftingJson
     {
+        /// <value>Website nwdb uses this to identify items</value>
         public string ItemID { get; set; } = string.Empty;
         /// <value>Contains master name for localisation</value> 
         public string Name { get; set; } = string.Empty;
-        /// <value>Matches RequiredAchievementID from CraftingRecipe</value> 
+        /// <value>Used to define if an item is tradable</value> 
+        public bool BindOnPickup { get; set; } = false;
+        /// <value>Matches RequiredAchievementID from CraftingRecipeJson</value> 
         public string SalvageAchievement { get; set; } = string.Empty;
     }
 }
diff --git a/NewWorldCompanion.Entities/NwmarketpriceJson.cs b/NewWorldCompanion.Entities/NwmarketpriceJson.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Entities
+{
+    public class NwmarketpriceJson
+    {
+        public string item_name { get; set; } = string.Empty;
+        public string last_checked { get; set; } = string.Empty;
+        public string recent_lowest_price { get; set; } = string.Empty;
+        //public double recent_lowest_price { get; set; } = 0.0;
+    }
+}
diff --git a/NewWorldCompanion.Entities/PriceServer.cs b/NewWorldCompanion.Entities/PriceServer.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Entities
+{
+    public class PriceServer
+    {
+        public string Name { get; set; } = string.Empty;
+        public string Id { get; set; } = string.Empty;
+    }
+}
diff --git a/NewWorldCompanion.Entities/SettingsNWC.cs b/NewWorldCompanion.Entities/SettingsNWC.cs
@@ -8,6 +8,12 @@ namespace NewWorldCompanion.Entities
 {
     public class SettingsNWC
     {
+        // App
+        public bool DebugModeActive { get; set; } = false;
+
+        // Overlay
+        public string ServerId { get; set; } = "1";
+
         // Shape detection
         public int EmguAreaLower { get; set; } = 10000;
         public int EmguAreaUpper { get; set; } = 15000;

diff --git a/NewWorldCompanion.Events/OverlayEvents.cs b/NewWorldCompanion.Events/OverlayEvents.cs
@@ -0,0 +1,17 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Events
+{
+    public class OverlayHideEvent : PubSubEvent
+    {
+    }
+
+    public class OverlayShowEvent : PubSubEvent
+    {
+    }
+}
diff --git a/NewWorldCompanion.Helpers/BoolConverter.cs b/NewWorldCompanion.Helpers/BoolConverter.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Helpers
+{
+    public class BoolConverter : JsonConverter<bool>
+    {
+        public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options) =>
+            writer.WriteBooleanValue(value);
+
+        public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
+            reader.TokenType switch
+            {
+                JsonTokenType.True => true,
+                JsonTokenType.False => false,
+                JsonTokenType.String => bool.TryParse(reader.GetString(), out var b) ? b : throw new JsonException(),
+                JsonTokenType.Number => reader.TryGetInt64(out long l) ? Convert.ToBoolean(l) : reader.TryGetDouble(out double d) ? Convert.ToBoolean(d) : false,
+                JsonTokenType.Null => false,
+                _ => throw new JsonException(),
+            };
+    }
+}
diff --git a/NewWorldCompanion.Helpers/ScreenCapture.cs b/NewWorldCompanion.Helpers/ScreenCapture.cs
@@ -47,7 +47,7 @@ public Bitmap GetScreenCapture(IntPtr windowHandle)
             return bitmap;
         }
 
-        public Bitmap? GetScreenCaptureMouse(IntPtr windowHandle)
+        public Bitmap? GetScreenCaptureMouse(IntPtr windowHandle, ref int offsetX, ref int offsetY)
         {
             Bitmap? bitmap = null;
 
@@ -73,6 +73,9 @@ public Bitmap GetScreenCapture(IntPtr windowHandle)
             yPos = Math.Min(Math.Max(yPos - height / 2, region.top), region.bottom - height);
             bool status = PInvoke.Gdi32.BitBlt(memoryDCHandle.DangerousGetHandle(), 0, 0, width, height, windowDCHandle.DangerousGetHandle(), xPos, yPos, SRCCOPY | CAPTUREBLT);
 
+            offsetX = xPos;
+            offsetY = yPos;
+
             try
             {
                 if (status)

diff --git a/NewWorldCompanion.Interfaces/ICraftingRecipeStore.cs b/NewWorldCompanion.Interfaces/ICraftingRecipeStore.cs
diff --git a/NewWorldCompanion.Interfaces/IHttpClientHandler.cs b/NewWorldCompanion.Interfaces/IHttpClientHandler.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Interfaces
+{
+    public interface IHttpClientHandler
+    {
+        Task<string> GetRequest(string uri);
+    }
+}
diff --git a/NewWorldCompanion.Interfaces/INewWorldDataStore.cs b/NewWorldCompanion.Interfaces/INewWorldDataStore.cs
@@ -0,0 +1,15 @@
+using NewWorldCompanion.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Interfaces
+{
+    public interface INewWorldDataStore
+    {
+        List<CraftingRecipe> GetCraftingRecipes();
+        bool IsBindOnPickup(string itemName);
+    }
+}
diff --git a/NewWorldCompanion.Interfaces/IOverlayHandler.cs b/NewWorldCompanion.Interfaces/IOverlayHandler.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Interfaces
+{
+    public interface IOverlayHandler
+    {
+    }
+}
diff --git a/NewWorldCompanion.Interfaces/IPriceManager.cs b/NewWorldCompanion.Interfaces/IPriceManager.cs
@@ -0,0 +1,17 @@
+using NewWorldCompanion.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace NewWorldCompanion.Interfaces
+{
+    public interface IPriceManager
+    {
+        List<PriceServer> Servers { get; }
+
+        NwmarketpriceJson GetPriceData(string itemName);
+        void UpdatePriceData(string itemName);
+    }
+}
diff --git a/NewWorldCompanion.Interfaces/IScreenCaptureHandler.cs b/NewWorldCompanion.Interfaces/IScreenCaptureHandler.cs
@@ -5,22 +5,12 @@ namespace NewWorldCompanion.Interfaces
 {
     public interface IScreenCaptureHandler
     {
-        Bitmap? CurrentScreen
-        {
-            get;
-        }
-
+        Bitmap? CurrentScreen { get; }
         bool IsActive { get; set; }
-
-        public string MouseCoordinates
-        {
-            get;
-        }
-
-        public string MouseCoordinatesScaled
-        {
-            get;
-        }
+        string MouseCoordinates { get; }
+        string MouseCoordinatesScaled { get; }
+        int OffsetX { get; }
+        int OffsetY { get; }
 
         BitmapSource? ImageSourceFromScreenCapture();
     }

diff --git a/NewWorldCompanion.Interfaces/IScreenProcessHandler.cs b/NewWorldCompanion.Interfaces/IScreenProcessHandler.cs
@@ -14,5 +14,10 @@ public interface IScreenProcessHandler
         Bitmap? ProcessedImage { get; }
         Bitmap? RoiImage { get; }
         Bitmap? OcrImage { get; }
+
+        int OverlayX { get; }
+        int OverlayY { get; }
+        int OverlayWidth { get; }
+        int OverlayHeigth { get; }
     }
 }
diff --git a/NewWorldCompanion.Services/CraftingRecipeManager.cs b/NewWorldCompanion.Services/CraftingRecipeManager.cs
@@ -12,21 +12,21 @@ namespace NewWorldCompanion.Services
     public class CraftingRecipeManager : ICraftingRecipeManager
     {
         private readonly IEventAggregator _eventAggregator;
-        private readonly ICraftingRecipeStore _craftingRecipeStore;
+        private readonly INewWorldDataStore _newWorldDataStore;
 
         private List<CraftingRecipe> _craftingRecipes = new List<CraftingRecipe>();
 
         // Start of Constructor region
 
         #region Constructor
 
-        public CraftingRecipeManager(IEventAggregator eventAggregator, ICraftingRecipeStore craftingRecipeStore)
+        public CraftingRecipeManager(IEventAggregator eventAggregator, INewWorldDataStore newWorldDataStore)
         {
             // Init IEventAggregator
             _eventAggregator = eventAggregator;
 
             // Init stores
-            _craftingRecipeStore = craftingRecipeStore;
+            _newWorldDataStore = newWorldDataStore;
 
             // Init recipes
             LoadRecipes();
@@ -64,7 +64,7 @@ private void LoadRecipes()
             }
 
             // Update recipe list
-            var recipesJson = _craftingRecipeStore.GetCraftingRecipes();
+            var recipesJson = _newWorldDataStore.GetCraftingRecipes();
             foreach (var recipeJson in recipesJson)
             {
                 var recipe = _craftingRecipes.FirstOrDefault(r => r.Id.Equals(recipeJson.Id));