Fix name scan after BSG magnifier change and language switch race

.gitignore

@@ -1,6 +1,9 @@
 ## Custom ignores
-# Static icon data
+# Static icon data (downloaded from RatScannerData releases for local dev)
 RatScanner/[Dd]ata/*
+# Shipped with the app: updated magnifier template for BSG's post-patch inspect UI.
+# RatEye 4.x no longer embeds this asset; Name Scan loads it from Data/icon_search.png.
+!RatScanner/[Dd]ata/icon_search.png
 
 # publish folder
 publish/

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"name": "RatScanner (Debug)",
+			"type": "coreclr",
+			"request": "launch",
+			"preLaunchTask": "build",
+			"program": "${workspaceFolder}/RatScanner/bin/Debug/net10.0-windows10.0.22621.0/RatScanner.exe",
+			"args": [],
+			"cwd": "${workspaceFolder}/RatScanner/bin/Debug/net10.0-windows10.0.22621.0",
+			"console": "integratedTerminal",
+			"stopAtEntry": false
+		}
+	]
+}

.vscode/tasks.json

@@ -0,0 +1,40 @@
+{
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"label": "build",
+			"command": "dotnet",
+			"type": "process",
+			"args": [
+				"build",
+				"${workspaceFolder}/RatScanner/RatScanner.csproj",
+				"/property:GenerateFullPaths=true",
+				"/consoleloggerparameters:NoSummary"
+			],
+			"group": {
+				"kind": "build",
+				"isDefault": true
+			},
+			"problemMatcher": "$msCompile"
+		},
+		{
+			"label": "publish",
+			"command": "dotnet",
+			"type": "process",
+			"args": [
+				"publish",
+				"${workspaceFolder}/RatScanner/RatScanner.csproj",
+				"-c",
+				"Release",
+				"-o",
+				"${workspaceFolder}/publish",
+				"--runtime",
+				"win-x64",
+				"-p:PublishSingleFile=true",
+				"--self-contained",
+				"true"
+			],
+			"problemMatcher": "$msCompile"
+		}
+	]
+}

RatScanner/RatConfig.cs

@@ -44,6 +44,7 @@ internal static class Paths {
 		internal static string ItemData = Path.Combine(Data, "items.json");
 		internal static string TrainedData = Path.Combine(Data, "traineddata");
 		internal static string UnknownIcon = Path.Combine(Data, "unknown.png");
+		internal static string SearchIcon = Path.Combine(Data, "icon_search.png");
 		internal static string ConfigFile = Path.Combine(Base, "config.cfg");
 		internal static string Debug = Path.Combine(Base, "Debug");
 		internal static string Updater = Path.Combine(Base, "RatUpdater.exe");

RatScanner/RatScanner.csproj

@@ -7,7 +7,7 @@
 		<UseWindowsForms>True</UseWindowsForms>
 		<ApplicationIcon>Resources\RatLogoSmall.ico</ApplicationIcon>
 		<StartupObject>RatScanner.App</StartupObject>
-		<Version>3.9.3</Version>
+		<Version>3.9.4</Version>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
 		<RootNamespace>RatScanner</RootNamespace>

RatScanner/RatScannerMain.cs

@@ -51,6 +51,8 @@ public class RatScannerMain : INotifyPropertyChanged {
 
 	internal RatEyeEngine RatEyeEngine;
 
+	private Bitmap? _searchMarker;
+
 	public event PropertyChangedEventHandler? PropertyChanged;
 
 	internal ItemQueue ItemScans = new();
@@ -205,10 +207,31 @@ private RatEye.Config GetRatEyeConfig(bool highlighted = true) {
 				InventoryConfig = new Config.Processing.Inventory() {
 					OptimizeHighlighted = highlighted,
 				},
+				InspectionConfig = CreateInspectionConfig(),
 			},
 		};
 	}
 
+	private Config.Processing.Inspection CreateInspectionConfig() {
+		if (_searchMarker == null) {
+			string path = RatConfig.Paths.SearchIcon;
+			if (!File.Exists(path)) {
+				Logger.LogError(
+					$"Search icon not found at: {path}\n\n" +
+					"Name scan requires Data/icon_search.png. Reinstall or update RatScanner so the full package is present.");
+			}
+
+			_searchMarker = new Bitmap(path);
+			Logger.LogInfo($"Loaded name-scan marker {_searchMarker.Width}x{_searchMarker.Height} from {path}");
+		}
+
+		// MarkerItemScale is calibrated to template width: in-game icon is ~16px at 1080p
+		return new Config.Processing.Inspection() {
+			Marker = _searchMarker,
+			MarkerItemScale = 16f / _searchMarker.Width,
+		};
+	}
+
 	private Database RatStashDatabaseFromTarkovDev() {
 		List<Item> rsItems = new();
 		if (!TarkovDevAPI.TryGetCachedItems(out TarkovDev.GraphQL.Item[] items) || items.Length == 0) {
@@ -298,17 +321,25 @@ internal void NameScan(Vector2 position) {
 			toolTipPosition += new Vector2(-(int)(marker.Width * scale), (int)(marker.Height * scale));
 			toolTipPosition += position;
 
-			ItemNameScan tempNameScan = new(
-				inspection,
-				toolTipPosition,
-				RatConfig.ToolTip.Duration);
-
-			ItemScans.Enqueue(tempNameScan);
+			if (!TryEnqueueNameScan(inspection, toolTipPosition)) return;
 
 			RefreshOverlay();
 		}
 	}
 
+	private bool TryEnqueueNameScan(RatEye.Processing.Inspection inspection, Vector2 toolTipPosition) {
+		if (!TarkovDevAPI.TryGetItemById(inspection.Item!.Id, out _)) {
+			Logger.LogWarning($"Skipping name scan: item {inspection.Item.Id} is not in cache yet.");
+			return false;
+		}
+
+		ItemScans.Enqueue(new ItemNameScan(
+			inspection,
+			toolTipPosition,
+			RatConfig.ToolTip.Duration));
+		return true;
+	}
+
 	/// <summary>
 	/// Perform a name scan over the entire active screen
 	/// </summary>
@@ -333,12 +364,7 @@ internal void NameScanScreen(object? _ = null) {
 				Bitmap marker = RatEyeEngine.Config.ProcessingConfig.InspectionConfig.Marker;
 				toolTipPosition += new Vector2(0, (int)(marker.Height * scale));
 
-				ItemNameScan tempNameScan = new(
-						inspection,
-						toolTipPosition,
-						RatConfig.ToolTip.Duration);
-
-				ItemScans.Enqueue(tempNameScan);
+				TryEnqueueNameScan(inspection, toolTipPosition);
 			}
 			RefreshOverlay();
 		}
@@ -364,6 +390,10 @@ internal void IconScan(Vector2 position) {
 			RatEye.Processing.Icon? icon = inventory.LocateIcon();
 
 			if (icon?.DetectionConfidence <= 0 || icon?.Item == null) return;
+			if (!TarkovDevAPI.TryGetItemById(icon.Item.Id, out _)) {
+				Logger.LogWarning($"Skipping icon scan: item {icon.Item.Id} is not in cache yet.");
+				return;
+			}
 
 			Vector2 toolTipPosition = position;
 			toolTipPosition += icon.Position + icon.ItemPosition;

RatScanner/Scan/ItemIconScan.cs

@@ -1,8 +1,8 @@
 using RatEye;
 using RatStash;
 using System;
-using System.Linq;
 using Icon = RatEye.Processing.Icon;
+using TarkovItem = RatScanner.TarkovDev.GraphQL.Item;
 
 namespace RatScanner.Scan;
 
@@ -16,7 +16,11 @@ public class ItemIconScan : ItemScan {
 	public ItemIconScan(Icon icon, Vector2 toolTipPosition, int duration) {
 		Icon = icon;
 		RatStash.Item iconItem = icon.Item;
-		Item = TarkovDevAPI.GetItems().FirstOrDefault(item => item.Id == iconItem.Id) ?? throw new Exception($"Unknown item: {icon.Item.Id}");
+		if (!TarkovDevAPI.TryGetItemById(iconItem.Id, out TarkovItem? tarkovItem) || tarkovItem is null) {
+			throw new Exception($"Unknown item: {iconItem.Id}");
+		}
+
+		Item = tarkovItem;
 		ItemExtraInfo = icon.ItemExtraInfo;
 		Confidence = icon.DetectionConfidence;
 		Rotated = icon.Rotated;

RatScanner/Scan/ItemNameScan.cs

@@ -1,7 +1,7 @@
 using RatEye;
 using RatEye.Processing;
 using System;
-using System.Linq;
+using TarkovItem = RatScanner.TarkovDev.GraphQL.Item;
 
 namespace RatScanner.Scan;
 
@@ -10,7 +10,11 @@ public class ItemNameScan : ItemScan {
 
 	public ItemNameScan(Inspection inspection, Vector2 toolTipPosition, int duration) {
 		RatStash.Item inspectionItem = inspection.Item;
-		Item = TarkovDevAPI.GetItems().FirstOrDefault(item => item.Id == inspectionItem.Id) ?? throw new Exception($"Unknown item: {inspection.Item.Id}");
+		if (!TarkovDevAPI.TryGetItemById(inspectionItem.Id, out TarkovItem? tarkovItem) || tarkovItem is null) {
+			throw new Exception($"Unknown item: {inspectionItem.Id}");
+		}
+
+		Item = tarkovItem;
 		Confidence = inspection.MarkerConfidence;
 		IconPath = inspection.IconPath;
 		_toolTipPosition = toolTipPosition;

RatScanner/TarkovDevAPI.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Json;
@@ -306,6 +307,12 @@ private static bool IsCacheExpired(string baseQueryKey, long time) {
 	/// Full cache initialization - waits for all requests to complete
 	/// </summary>
 	public static async Task InitializeCache() {
+		// Preload offline cache for the current language so scans do not fail during fetch
+		TryLoadFromOfflineCache<Item>(ItemsQueryKey(), RatConfig.MediumTTL);
+		TryLoadFromOfflineCache<TTask>(TasksQueryKey(), RatConfig.LongTTL);
+		TryLoadFromOfflineCache<HideoutStation>(HideoutStationsQueryKey(), RatConfig.LongTTL);
+		TryLoadFromOfflineCache<Map>(MapsQueryKey(), RatConfig.LongTTL);
+
 		await Task.WhenAll(
 			QueueRequest<Item>(ItemsQueryKey(), ItemsQuery, RatConfig.MediumTTL),
 			QueueRequest<TTask>(TasksQueryKey(), TasksQuery, RatConfig.LongTTL),
@@ -316,6 +323,35 @@ await Task.WhenAll(
 
 	public static Item[] GetItems(LanguageCode language, GameMode gameMode) => GetCached<Item>(ItemsQueryKey(language, gameMode), () => ItemsQuery(language, gameMode), RatConfig.MediumTTL);
 	public static Item[] GetItems() => GetCached<Item>(ItemsQueryKey(), ItemsQuery, RatConfig.MediumTTL);
+
+	/// <summary>
+	/// Looks up an item by id in loaded caches for the current game mode (no network).
+	/// Prefers the active language, then other languages of the same mode.
+	/// </summary>
+	public static bool TryGetItemById(string id, out Item? item) {
+		item = null;
+		if (string.IsNullOrEmpty(id)) return false;
+
+		if (Cache.TryGetValue(ItemsQueryKey(), out (long expire, object response) current)
+			&& current.response is Item[] currentItems) {
+			item = currentItems.FirstOrDefault(i => i.Id == id);
+			if (item != null) return true;
+		}
+
+		string modeSuffix = $"_{RatConfig.GameMode}";
+		foreach (KeyValuePair<string, (long expire, object response)> entry in Cache) {
+			if (!entry.Key.StartsWith("items_", StringComparison.Ordinal)) continue;
+			if (!entry.Key.EndsWith(modeSuffix, StringComparison.Ordinal)) continue;
+			if (entry.Value.response is not Item[] items) continue;
+
+			item = items.FirstOrDefault(i => i.Id == id);
+			if (item != null) return true;
+		}
+
+		item = null;
+		return false;
+	}
+
 	public static bool TryGetCachedItems(out Item[] items) {
 		if (Cache.TryGetValue(ItemsQueryKey(), out (long expire, object response) cached)) {
 			items = (Item[])cached.response;