Merge pull request #47 from DekuDesu/development

Development

Author: artyredd

MiniMapLibrary/Basic/Timer.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#nullable enable
+namespace MiniMapLibrary
+{
+    public class Timer
+    {
+        public float Duration { get; private set; } = 1.0f;
+        public float Value { get; set; }
+        public event Action<object?>? OnFinished;
+        public object? State { get; set; }
+        public bool AutoReset { get; set; }
+        public bool Started { get; set; } = true;
+        public bool Expired => Value <= 0;
+
+        public Timer(float duration, bool autoReset = true)
+        {
+            Duration = duration;
+            this.AutoReset = autoReset;
+        }
+
+        public void Update(float deltaTime)
+        {
+            if (Started)
+            {
+                Value -= deltaTime;
+
+                if (Expired)
+                {
+                    if (AutoReset)
+                    {
+                        Reset();
+                    }
+                    else 
+                    {
+                        Started = false;
+                    }
+
+                    OnFinished?.Invoke(State);
+                }
+            }
+        }
+
+        public void Start() => Started = true;
+
+        public void Reset()
+        {
+            Value = Duration;
+            Started = AutoReset;
+        }
+
+        public override string ToString()
+        {
+            return $"{typeof(Timer).Name} [{Value}/{Duration}s] [{nameof(AutoReset)}: {AutoReset}] [{nameof(Started)}: {Started}] [{nameof(Expired)}: {Expired}]";
+        }
+    }
+}

MiniMapLibrary/Interactible/InteractableKind.cs

@@ -26,6 +26,9 @@ public enum InteractableKind
         Minion = 1 << 14,
         Player = 1 << 15,
         Item =  1 << 16,
-        All = 0xFFFF
+        Portal = 1 << 17,
+        Totem = 1 << 18,
+        Neutral = 1 << 19,
+        All = int.MaxValue
     }
 }

MiniMapLibrary/Settings.cs

@@ -26,6 +26,28 @@ public static class Icons
             public const string Shrine = "Textures/MiscIcons/texShrineIconOutlined";
             public const string Boss = "Textures/MiscIcons/texTeleporterIconOutlined";
             public const string Drone = "Textures/MiscIcons/texDroneIconOutlined";
+            public const string Cross = "Textures/MiscIcons/texCriticallyHurtIcon";
+            public const string Lock = "Textures/MiscIcons/texUnlockIcon";
+            public const string Dice = "Textures/MiscIcons/texRuleMapIsRandom";
+            public const string Cube = "Textures/MiscIcons/texLunarPillarIcon";
+            public const string Wrench = "Textures/MiscIcons/texWIPIcon";
+            public const string Attack = "Textures/MiscIcons/texAttackIcon";
+            public const string Sprint = "Textures/MiscIcons/texSprintIcon";
+            public const string Arrow = "Textures/MiscIcons/texOptionsArrowLeft";
+            public const string Pencil = "Textures/MiscIcons/texEditIcon";
+            public const string Portal = "Textures/MiscIcons/texQuickplay";
+        }
+
+        public static class Colors
+        {
+            public static Color Yellow = new Color(255/255.0f, 219 / 255.0f, 88 / 255.0f);
+            public static Color Purple = new Color(122 / 255.0f, 105 / 255.0f, 244 / 255.0f);
+            public static Color DarkPurple = new Color(76 / 255.0f, 53 / 255.0f, 244 / 255.0f);
+            public static Color Teal = new Color(94 / 255.0f, 178 / 255.0f, 242 / 255.0f);
+            public static Color Pink = new Color(172 / 255.0f, 95 / 255.0f, 243 / 255.0f);
+            public static Color DarkPink = new Color(146 / 255.0f, 39 / 255.0f, 243 / 255.0f);
+            public static Color Orange = new Color(255 / 255.0f, 146 / 255.0f, 0 / 255.0f);
+            public static Color DarkTeal = new Color(94 / 255.0f, 178 / 255.0f, 242 / 255.0f);
         }
 
         public static Dimension2D MinimapSize { get; set; } = new Dimension2D(100, 100);
@@ -38,7 +60,7 @@ public static class Icons
 
         public static Color PlayerIconColor { get; set; } = Color.white;
 
-        public static Color DefaultActiveColor { get; set; } = Color.yellow;
+        public static Color DefaultActiveColor { get; set; } = Colors.Yellow;
 
         public static Color DefaultInactiveColor { get; set; } = Color.grey;
 
@@ -58,13 +80,13 @@ private static void InitializeDefaultSettings()
             static void Add(InteractableKind type, 
                 float width = -1, 
                 float height = -1, 
-                Color ActiveColor = default, 
-                Color InactiveColor = default, 
+                Color activeColor = default, 
+                Color inactiveColor = default, 
                 string description = "",
                 string path = Icons.Default)
             {
-                ActiveColor = ActiveColor == default ? DefaultActiveColor : ActiveColor;
-                InactiveColor = InactiveColor == default ? DefaultInactiveColor : InactiveColor;
+                activeColor = activeColor == default ? DefaultActiveColor : activeColor;
+                inactiveColor = inactiveColor == default ? DefaultInactiveColor : inactiveColor;
 
                 Dimension2D size = DefaultUIElementSize;
 
@@ -75,8 +97,8 @@ static void Add(InteractableKind type,
 
                 var setting = new InteractibleSetting()
                 {
-                    ActiveColor = ActiveColor,
-                    InactiveColor = InactiveColor,
+                    ActiveColor = activeColor,
+                    InactiveColor = inactiveColor,
                     Dimensions = size
                 };
 
@@ -86,83 +108,105 @@ static void Add(InteractableKind type,
                 InteractibleSettings.Add(type, setting);
             }
 
-            Add(InteractableKind.Chest, 10, 8,
+            Add(InteractableKind.Chest, 8, 6,
                 description: "Chests, Roulette Chests",
                 path: Icons.Chest);
 
-            Add(InteractableKind.Shop, 7, 7,
+            Add(InteractableKind.Shop, 7, 5,
+                activeColor: Colors.Teal,
                 description: "Shops",
                 path: Icons.Chest);
 
             Add(InteractableKind.Equipment, 8, 6,
+                activeColor: Colors.Orange,
                 description: "Equipment Barrels",
                 path: Icons.Chest);
 
             Add(InteractableKind.Printer, 10, 8,
+                activeColor: Colors.Purple,
                 description: "Printers",
                 path: Icons.Chest);
 
-            Add(InteractableKind.Utility,
+            Add(InteractableKind.Utility, 5, 5,
                 description: "Scrappers",
-                path: Icons.LootBag);
+                path: Icons.Wrench);
 
             Add(InteractableKind.LunarPod, 7, 7,
                 description: "Lunar pods (chests)",
+                activeColor: Color.cyan,
                 path: Icons.LootBag);
 
             Add(InteractableKind.Shrine,
                 description: "All shrines (excluding Newt)",
                 path: Icons.Shrine);
 
             Add(InteractableKind.Teleporter, 15, 15,
-                ActiveColor: Color.white,
-                InactiveColor: Color.green,
+                activeColor: Color.white,
+                inactiveColor: Color.green,
                 description: "Boss teleporters",
                 path: Icons.Boss);
 
-            Add(InteractableKind.Barrel, 5, 5,
+            Add(InteractableKind.Barrel, 3, 3,
                 description: "Barrels",
                 path: Icons.Circle);
 
             Add(InteractableKind.Drone, 7, 7,
                 description: "Drones",
                 path: Icons.Drone);
 
-            Add(InteractableKind.Special, 7, 7,
+            Add(InteractableKind.Special, 5, 5,
                 description: "Special interactibles such as the landing pod and fans",
                 path: Icons.Default);
 
             Add(InteractableKind.EnemyMonster, 3, 3,
-                ActiveColor: Color.red,
+                activeColor: Color.red,
                 description: "Enemies",
                 path: Icons.Circle);
 
             Add(InteractableKind.EnemyLunar, 3, 3,
-                ActiveColor: Color.red,
+                activeColor: Color.red,
                 description: "Lunar enemies",
                 path: Icons.Circle);
 
-            Add(InteractableKind.EnemyVoid, 3, 3,
-                ActiveColor: Color.magenta,
+            Add(InteractableKind.EnemyVoid, 12, 12,
+                activeColor: Color.magenta,
                 description: "Void touched enemies",
-                path: Icons.Circle);
+                path: Icons.Attack);
 
             Add(InteractableKind.Minion, 3, 3,
-                ActiveColor: Color.green,
+                activeColor: Color.green,
                 description: "Minions",
                 path: Icons.Circle);
 
             Add(InteractableKind.Player, 8, 8,
-                ActiveColor: PlayerIconColor,
-                InactiveColor: PlayerIconColor,
+                activeColor: PlayerIconColor,
+                inactiveColor: PlayerIconColor,
                 description: "Player, including friends",
-                path: Icons.Circle);
+                path: Icons.Sprint);
 
             Add(InteractableKind.Item, 3, 3,
-                ActiveColor: Color.cyan,
-                InactiveColor: Color.cyan,
+                activeColor: Colors.Teal,
+                inactiveColor: Color.cyan,
                 description: "Dropped items and lunar coins",
                 path: Icons.Circle);
+
+            Add(InteractableKind.Portal, 7, 7,
+               activeColor: DefaultActiveColor,
+               inactiveColor: DefaultInactiveColor,
+               description: "Portal markers, or objects that spawn portals when interacted with (excluding newt altar)",
+               path: Icons.Portal);
+
+            Add(InteractableKind.Totem, 7, 7,
+               activeColor: Colors.DarkTeal,
+               inactiveColor: DefaultInactiveColor,
+               description: "Totems, or totem adjacent objects",
+               path: Icons.Cube);
+
+            Add(InteractableKind.Neutral, 4, 4,
+               activeColor: Color.white,
+               inactiveColor: DefaultInactiveColor,
+               description: "Neutral objects or NPCs",
+               path: Icons.Circle);
         }
 
         public static InteractibleSetting GetSetting(InteractableKind type)

MiniMapLibrary/Sprites/SpriteManager.cs

@@ -12,6 +12,13 @@ public sealed class SpriteManager : IDisposable, ISpriteManager
     {
         private readonly Dictionary<string, Sprite> SpriteCache = new Dictionary<string, Sprite>();
 
+        private readonly ILogger logger;
+
+        public SpriteManager(ILogger logger)
+        {
+            this.logger = logger;
+        }
+
         public void Dispose()
         {
             SpriteCache.Clear();
@@ -49,7 +56,17 @@ public void Dispose()
             }
             else 
             {
-                throw new MissingComponentException($"MissingTextureException: {Path} does not exist within the streaming assets");
+                loaded = Resources.Load<Sprite>(Settings.Icons.Default);
+
+                if (loaded is null)
+                {
+                    logger.LogError($"Attempted to use default icon for non-existen texture at {Path} but default icon path of {Settings.Icons.Default} also failed to load from the streaming assets path.");
+                    return null;
+                }
+
+                logger.LogWarning($"Attempted to load icon texture at streaming asset path: {Path}, but it was not found, using default [?] instead.");
+
+                SpriteCache.Add(Path, loaded);
             }
 
             return loaded;