finished migrating to new type registration system

Author: artyredd

MiniMapLibrary/Interactible/InteractableKind.cs

@@ -18,8 +18,12 @@ public enum InteractableKind
         Drone = 1 << 6,
         Barrel = 1 << 7,
         Enemy = 1 << 8,
-        Printer = 1 << 9,
-        LunarPod = 1 << 10,
-        All = 0b_1111_11
+        EnemyVoid = 1 << 9,
+        Ally = 1 << 10,
+        Printer = 1 << 11,
+        LunarPod = 1 << 12,
+        Shop = 1 << 13,
+        Equipment =  1 << 14,
+        All = 0xFFFF
     }
 }

…pLibrary/Scanner/TrackedObjectScanner.cs …niMapLibrary/Scanner/MultiKindScanner.csMiniMapLibrary/Scanner/TrackedObjectScanner.cs renamed to MiniMapLibrary/Scanner/MultiKindScanner.cs MiniMapLibrary/Scanner/TrackedObjectScanner.cs renamed to MiniMapLibrary/Scanner/MultiKindScanner.cs

@@ -5,17 +5,19 @@
 
 namespace MiniMapLibrary.Scanner
 {
-    public class TrackedObjectScanner<T> : ITrackedObjectScanner
+    public class MultiKindScanner<T> : ITrackedObjectScanner
     {
         private readonly IScanner<T> scanner;
         private readonly IInteractibleSorter<T> sorter;
         private readonly bool dynamic;
+        private readonly Range3D range;
 
-        public TrackedObjectScanner(bool dynamic, IScanner<T> scanner, IInteractibleSorter<T> sorter)
+        public MultiKindScanner(bool dynamic, IScanner<T> scanner, IInteractibleSorter<T> sorter, Range3D range)
         {
             this.scanner = scanner;
             this.sorter = sorter;
             this.dynamic = dynamic;
+            this.range = range;
         }
 
         public void ScanScene(IList<ITrackedObject> list)
@@ -31,6 +33,8 @@ public void ScanScene(IList<ITrackedObject> list)
                         ActiveChecker = activeChecker,
                         DynamicObject = dynamic
                     });
+
+                    range.CheckValue(gameObject.transform.position);
                 }
             }
         }

MiniMapLibrary/Scanner/SingleKindScanner.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using UnityEngine;
+
+#nullable enable
+namespace MiniMapLibrary.Scanner
+{
+    public class SingleKindScanner<T> : ITrackedObjectScanner where T : MonoBehaviour
+    {
+        private readonly IScanner<T> scanner;
+        private readonly bool dynamic;
+        private readonly Func<T, bool> activeChecker;
+        private readonly Func<T, GameObject> converter;
+        private readonly Func<T, bool> selector;
+        private readonly InteractableKind kind;
+        private readonly Range3D range;
+
+        public SingleKindScanner(InteractableKind kind, bool dynamic, IScanner<T> scanner, Range3D range, Func<T, GameObject> converter, Func<T, bool>? activeChecker = null, Func<T, bool>? selector = null)
+        {
+            this.scanner = scanner;
+            this.dynamic = dynamic;
+            this.kind = kind;
+            this.converter = converter;
+
+            // always return active if nothing is given
+            this.activeChecker = activeChecker ?? ((x) => true);
+
+            // always select if nothing is given
+            this.selector = selector ?? ((x) => true);
+
+            this.range = range;
+        }
+
+        public void ScanScene(IList<ITrackedObject> list)
+        {
+            IEnumerable<T> foundObjects = scanner.Scan();
+
+            foreach (var item in foundObjects)
+            {
+                if (selector(item))
+                {
+                    GameObject gameObject = converter(item);
+
+                    list.Add(new TrackedObject<T>(kind, converter(item), null)
+                    {
+                        BackingObject = item,
+                        ActiveChecker = activeChecker,
+                        DynamicObject = dynamic
+                    });
+
+                    range.CheckValue(gameObject.transform.position);
+                }
+            }
+        }
+    }
+}

MiniMapLibrary/Settings.cs

@@ -15,6 +15,17 @@ public enum LogLevel {
         all
     }
 
+    public static class Icons 
+    {
+        public const string Default = "";
+        public const string LootBag = "Textures/MiscIcons/texLootIconOutlined";
+        public const string Chest = "Textures/MiscIcons/texInventoryIconOutlined";
+        public const string Circle = "Textures/MiscIcons/texBarrelIcon";
+        public const string Shrine = "Textures/MiscIcons/texShrineIconOutlined";
+        public const string Boss = "Textures/MiscIcons/texTeleporterIconOutlined";
+        public const string Drone = "Textures/MiscIcons/texDroneIconOutlined";
+    }
+
     public static class Settings
     {
         public static Dimension2D MinimapSize { get; set; } = new Dimension2D(100, 100);
@@ -77,52 +88,70 @@ static void Add(InteractableKind type,
 
             Add(InteractableKind.Chest, 10, 8, 
                 description: "Chests, including shops", 
-                path: "Textures/MiscIcons/texInventoryIconOutlined");
+                path: Icons.Chest);
+
+            Add(InteractableKind.Equipment, 8, 6,
+                description: "Equipment barrels",
+                path: Icons.Chest);
 
             Add(InteractableKind.Shrine, 
                 description: "All shrines (excluding Newt)", 
-                path: "Textures/MiscIcons/texShrineIconOutlined");
+                path: Icons.Shrine);
 
             Add(InteractableKind.Teleporter, 15, 15, 
                 ActiveColor: Color.white, 
                 InactiveColor: Color.green, 
                 description: "Boss teleporters",
-                path: "Textures/MiscIcons/texTeleporterIconOutlined");
+                path: Icons.Boss);
 
             Add(InteractableKind.Player, 8, 8, 
                 ActiveColor: PlayerIconColor, 
                 InactiveColor: PlayerIconColor, 
-                description: "",
-                path: "Textures/MiscIcons/texBarrelIcon");
+                description: "Player, including friends",
+                path: Icons.Circle);
 
             Add(InteractableKind.Barrel, 5, 5, 
                 description: "Barrels", 
-                path: "Textures/MiscIcons/texBarrelIcon");
+                path: Icons.Circle);
 
             Add(InteractableKind.Drone, 7, 7, 
                 description: "Drones", 
-                path: "Textures/MiscIcons/texDroneIconOutlined");
+                path: Icons.Drone);
 
             Add(InteractableKind.Special, 7, 7, 
                 description: "Special interactibles such as the landing pod and fans",
-                path: DefaultResourcePath);
+                path: Icons.Default);
 
             Add(InteractableKind.Enemy, 3, 3, 
                 ActiveColor: Color.red, 
                 description: "Enemies",
-                path: "Textures/MiscIcons/texBarrelIcon");
+                path: Icons.Circle);
+
+            Add(InteractableKind.EnemyVoid, 3, 3,
+                ActiveColor: Color.magenta,
+                description: "Void touched enemies",
+                path: Icons.Circle);
+
+            Add(InteractableKind.Ally, 3, 3,
+                ActiveColor: Color.green,
+                description: "Allies and minions",
+                path: Icons.Circle);
 
             Add(InteractableKind.Utility, 
                 description: "Scrappers", 
-                path: "Textures/MiscIcons/texLootIconOutlined");
+                path: Icons.LootBag);
 
             Add(InteractableKind.Printer, 10, 8, 
                 description: "Printers",
-                path: "Textures/MiscIcons/texInventoryIconOutlined");
+                path: Icons.Chest);
 
             Add(InteractableKind.LunarPod, 7, 7, 
                 description: "Lunar pods (chests)",
-                path: "Textures/MiscIcons/texLootIconOutlined");
+                path: Icons.LootBag);
+
+            Add(InteractableKind.Shop, 7, 7,
+                description: "3 item shops",
+                path: Icons.Chest);
         }
 
         public static InteractibleSetting GetSetting(InteractableKind type)