Fix Tag Definition Handling

MtnDewIt · MtnDewIt · commit 8115daaae39c · 2026-02-24T18:16:51.000+11:00
If we have a null definition type, then the definition doesn't exist
diff --git a/TagTool/Shaders/ShaderMatching/ShaderMatcher.cs b/TagTool/Shaders/ShaderMatching/ShaderMatcher.cs
@@ -283,14 +283,6 @@ public Rmt2Descriptor RebuildRmt2Options(Rmt2Descriptor srcRmt2Descriptor, strin
 
                         if (PortingCache.Version == CacheVersion.HaloReach)
                         {
-                            switch ($"{methodName}") 
-                            {
-                                // #TODO: Figure out way around this - I hit the sampler limit :/
-                                case "alpha_blend_source" when srcRmt2Descriptor.Type == "shader":
-                                    optionName = "from_albedo_alpha_without_fresnel";
-                                    break;
-                            }
-
                             switch ($"{methodName}\\{optionName}") 
                             {
                                 // keep in sync with cubemap conversion - not needed anymore?
diff --git a/TagTool/Tags/TagDefinitions.cs b/TagTool/Tags/TagDefinitions.cs
@@ -57,7 +57,7 @@ public bool TagDefinitionExists(TagGroup group)
 
         public bool TagDefinitionExists(Tag tag)
         {
-			return Definitions.TagToTypeLookup.ContainsKey(tag);
+			return Definitions.TagToTypeLookup.TryGetValue(tag, out var val) && val != null;
         }
 
         public Type GetTagDefinitionType(TagGroup group)

Original file line number	Diff line number	Diff line change
`@@ -283,14 +283,6 @@ public Rmt2Descriptor RebuildRmt2Options(Rmt2Descriptor srcRmt2Descriptor, strin`
`283`	`283`
`284`	`284`	`if (PortingCache.Version == CacheVersion.HaloReach)`
`285`	`285`	`{`
`286`		`- switch ($"{methodName}")`
`287`		`- {`
`288`		`- // #TODO: Figure out way around this - I hit the sampler limit :/`
`289`		`- case "alpha_blend_source" when srcRmt2Descriptor.Type == "shader":`
`290`		`- optionName = "from_albedo_alpha_without_fresnel";`
`291`		`- break;`
`292`		`- }`
`293`		`-`
`294`	`286`	`switch ($"{methodName}\\{optionName}")`
`295`	`287`	`{`
`296`	`288`	`// keep in sync with cubemap conversion - not needed anymore?`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public bool TagDefinitionExists(TagGroup group)`
`57`	`57`
`58`	`58`	`public bool TagDefinitionExists(Tag tag)`
`59`	`59`	`{`
`60`		`- return Definitions.TagToTypeLookup.ContainsKey(tag);`
	`60`	`+ return Definitions.TagToTypeLookup.TryGetValue(tag, out var val) && val != null;`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public Type GetTagDefinitionType(TagGroup group)`