Fix Festive Sandvich having crit glow stay forever

Thanks to Whurr for the report!
agrastiOs · Mar 27, 2021 · 196b878 · 196b878
1 parent 0a32607
commit 196b878
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 26 deletions.
diff --git a/TF2UltimateVisualFix/materials/models/weapons/c_items/c_sandwich_xmas.vmt b/TF2UltimateVisualFix/materials/models/weapons/c_items/c_sandwich_xmas.vmt
@@ -17,7 +17,9 @@
  	"$blendtintbybasealpha" "1" 
  	"$blendtintcoloroverbase" "0"  
 
-	"$color2" "{194 45 48}"
+	"$colortint_base" "{183 56 61}"  
+	"$colortint_tmp" "[0 0 0]" 
+	"$colortint" "[0 0 0]"
 
 	"$tempvar" "{256 256 256}"
 
@@ -46,23 +48,33 @@
 		"invis"
 		{
 		}
+  		"ItemTintColor"
+  		{
+   			"resultVar" "$colortint_tmp"
+  		}
 		"ModelGlowColor"
-        	{
+		{
          	   	"resultVar" "$glowcolor"
-        	}
-       	 	"Equals"
-        	{
+		}
+		"Equals"
+		{
 			"srcVar1"  "$glowcolor"
 			"resultVar" "$selfillumtint"
-        	}
+		}
+  		"SelectFirstIfNonZero"
+  		{
+   			"srcVar1" "$colortint_tmp"
+   			"srcVar2" "$colortint_base"
+   			"resultVar" "$colortint"
+  		}
 		"LessOrEqual"
-        	{
-               		"LessEqualVar" "$glowcolor"
-               		"greaterVar" "$color2"
-        	        "srcVar1" "$tempvar"
-       		     	"srcVar2" "$glowcolor"
-       		     	"resultVar" "$color2"
-        	}
+		{
+			"LessEqualVar" "$glowcolor"
+			"greaterVar" "$colortint"
+			"srcVar1" "$tempvar"
+			"srcVar2" "$glowcolor"
+			"resultVar" "$color2"
+		}
 		"YellowLevel"
 		{
 			"resultVar" "$yellow"

diff --git a/TF2UltimateVisualFix/materials/models/weapons/c_items/c_sandwich_xmas_blue.vmt b/TF2UltimateVisualFix/materials/models/weapons/c_items/c_sandwich_xmas_blue.vmt
@@ -17,7 +17,9 @@
  	"$blendtintbybasealpha" "1" 
  	"$blendtintcoloroverbase" "0"  
 
-	"$color2" "{56 93 125}"
+	"$colortint_base" "{56 93 125}"  
+	"$colortint_tmp" "[0 0 0]"
+	"$colortint" "[0 0 0]"
 
 	"$tempvar" "{256 256 256}"
 
@@ -46,23 +48,33 @@
 		"invis"
 		{
 		}
+  		"ItemTintColor"
+  		{
+   			"resultVar" "$colortint_tmp"
+  		}
 		"ModelGlowColor"
-        	{
+		{
          	   	"resultVar" "$glowcolor"
-        	}
-       	 	"Equals"
-        	{
+		}
+		"Equals"
+		{
 			"srcVar1"  "$glowcolor"
 			"resultVar" "$selfillumtint"
-        	}
+		}
+  		"SelectFirstIfNonZero"
+  		{
+   			"srcVar1" "$colortint_tmp"
+   			"srcVar2" "$colortint_base"
+   			"resultVar" "$colortint"
+  		}
 		"LessOrEqual"
-        	{
-               		"LessEqualVar" "$glowcolor"
-               		"greaterVar" "$color2"
-        	        "srcVar1" "$tempvar"
-       		     	"srcVar2" "$glowcolor"
-       		     	"resultVar" "$color2"
-        	}
+		{
+			"LessEqualVar" "$glowcolor"
+			"greaterVar" "$colortint"
+			"srcVar1" "$tempvar"
+			"srcVar2" "$glowcolor"
+			"resultVar" "$color2"
+		}
 		"YellowLevel"
 		{
 			"resultVar" "$yellow"