Commit: 63869fc81778186eb5e9987cce05a0d579e41b3d - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: 63869fc81778186eb5e9987cce05a0d579e41b3d (tree)
• l'heure: 2020-08-10 08:49:27
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Added implicit color conversion routines, for ease of use.

Change Summary

• modified: ElementalTools/ColorHelper.cs
• modified: ElementalTools/Items/SteelItem.cs

Modification

--- a/ElementalTools/ColorHelper.cs
+++ b/ElementalTools/ColorHelper.cs
@@ -46,7 +46,10 @@ namespace ElementalTools
 		Alpha = a;
 		}
 
-
+		public static implicit operator int(RGBAColor_Int32 input)
+		{
+		return input.IntegerValue;
+		}
 	}
 
 	[StructLayout(LayoutKind.Explicit, Size = 4, Pack = 1)]
@@ -85,7 +88,10 @@ namespace ElementalTools
 		Alpha = a;
 		}
 
-
+		public static implicit operator int(BGRAColor_Int32 input)
+		{
+		return input.IntegerValue;
+		}
 	}
 
 

--- a/ElementalTools/Items/SteelItem.cs
+++ b/ElementalTools/Items/SteelItem.cs
@@ -554,25 +554,25 @@ namespace ElementalTools
 
 		switch (edge) {
 		case SharpnessState.Rough:
-			return this.color_Rough.IntegerValue;
+			return this.color_Rough;
 
 		case SharpnessState.Dull:
-			return this.color_Dull.IntegerValue;
+			return this.color_Dull;
 
 		case SharpnessState.Honed:
-			return this.color_Honed.IntegerValue;
+			return this.color_Honed;
 
 		case SharpnessState.Keen:
-			return this.color_Keen.IntegerValue;
+			return this.color_Keen;
 
 		case SharpnessState.Sharp:
-			return this.color_Sharp.IntegerValue;
+			return this.color_Sharp;
 
 		case SharpnessState.Razor:
-			return this.color_Razor.IntegerValue;
+			return this.color_Razor;
 		}
 
-		return this.color_Default.IntegerValue;
+		return this.color_Default;
 		}
 
 		#endregion