Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-14 14:15:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre-blend colors with white

Browse Source 
faster fetch
This commit is contained in:
Kurt
2020-04-07 13:40:39 -07:00
parent 25a162c187
commit 824d31719e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
NHSE.Sprites/Field/FieldItemSprite.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Drawing;
using System.Linq;
using NHSE.Core;
namespace NHSE.Sprites
@@ -56,13 +57,11 @@ private static Color GetItemColor(FieldItem item)
{
var kind = ItemInfo.GetItemKind(item);
if (kind == ItemKind.Unknown)
return Color.LimeGreen;
var known = Colors[(int)kind];
var color = Color.FromKnownColor(known);
// soften the colors a little
return ColorUtil.Blend(Color.White, color, 0.5d);
return item.DisplayItemId == FieldItem.NONE ? Color.LimeGreen : Color.DarkGreen;
return Colors[(int)kind];
}
private static readonly KnownColor[] Colors = (KnownColor[])Enum.GetValues(typeof(KnownColor));
private static readonly Color[] Colors = ((KnownColor[])Enum.GetValues(typeof(KnownColor)))
.Select(Color.FromKnownColor).Select(z => ColorUtil.Blend(Color.White, z, 0.5d)).ToArray();
}
}

9
NHSE.Sprites/Item/ItemSprite.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Drawing;
using System.Linq;
using NHSE.Core;
namespace NHSE.Sprites
@@ -108,12 +109,10 @@ private static Color GetItemColor(Item item)
var kind = ItemInfo.GetItemKind(item);
if (kind == ItemKind.Unknown)
return Color.LimeGreen;
var known = Colors[(int)kind];
var color = Color.FromKnownColor(known);
// soften the colors a little
return ColorUtil.Blend(Color.White, color, 0.5d);
return Colors[(int)kind];
}
private static readonly KnownColor[] Colors = (KnownColor[])Enum.GetValues(typeof(KnownColor));
private static readonly Color[] Colors = ((KnownColor[])Enum.GetValues(typeof(KnownColor)))
.Select(Color.FromKnownColor).Select(z => ColorUtil.Blend(Color.White, z, 0.5d)).ToArray();
}
}

1
NHSE.Sprites/Util/SpriteUtil.cs
View File

@@ -3,5 +3,6 @@
public static class SpriteUtil
{
public static readonly ItemSpriteDrawer Items = new ItemSpriteDrawer();
public static readonly FieldItemSpriteDrawer FieldItems = new FieldItemSpriteDrawer();
}
}