From 523baec814dfc6f4f7e7e055a50790b45f0b4030 Mon Sep 17 00:00:00 2001
From: "NGnius (Graham)" <ngniusness@gmail.com>
Date: Sun, 14 Jun 2020 12:49:10 -0400
Subject: [PATCH] Fix missing RC->GC colour mapping
---
Pixi/Common/ColorSpaceUtility.cs | 10 +++++-----
Pixi/Robots/CubeUtility.cs | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Pixi/Common/ColorSpaceUtility.cs b/Pixi/Common/ColorSpaceUtility.cs
index a9ef920..6a427c2 100644
--- a/Pixi/Common/ColorSpaceUtility.cs
+++ b/Pixi/Common/ColorSpaceUtility.cs
@@ -246,11 +246,11 @@ namespace Pixi.Common
botColorMap[18] = new BlockColor { Color = BlockColors.Purple, Darkness = 9 };
botColorMap[19] = new BlockColor { Color = BlockColors.Pink, Darkness = 9 };
botColorMap[20] = new BlockColor { Color = BlockColors.Orange, Darkness = 5 };
- botColorMap[20] = new BlockColor { Color = BlockColors.Yellow, Darkness = 3 };
- botColorMap[14] = new BlockColor { Color = BlockColors.Green, Darkness = 7 };
- botColorMap[21] = new BlockColor { Color = BlockColors.Lime, Darkness = 8 };
- botColorMap[22] = new BlockColor { Color = BlockColors.Green, Darkness = 6 };
- botColorMap[13] = new BlockColor { Color = BlockColors.Lime, Darkness = 5 };
+ botColorMap[14] = new BlockColor { Color = BlockColors.Yellow, Darkness = 3 };
+ botColorMap[21] = new BlockColor { Color = BlockColors.Green, Darkness = 7 };
+ botColorMap[22] = new BlockColor { Color = BlockColors.Lime, Darkness = 8 };
+ botColorMap[13] = new BlockColor { Color = BlockColors.Green, Darkness = 6 };
+ botColorMap[12] = new BlockColor { Color = BlockColors.Lime, Darkness = 5 };
// blue gang
botColorMap[23] = new BlockColor { Color = BlockColors.Blue, Darkness = 8 };
botColorMap[24] = new BlockColor { Color = BlockColors.Aqua, Darkness = 8 };
diff --git a/Pixi/Robots/CubeUtility.cs b/Pixi/Robots/CubeUtility.cs
index 38f4e61..713670f 100644
--- a/Pixi/Robots/CubeUtility.cs
+++ b/Pixi/Robots/CubeUtility.cs
@@ -188,6 +188,9 @@ namespace Pixi.Robots
{
// I hope these colours are accurate, I just guessed
// TODO colour accuracy (lol that won't ever happen)
+#if DEBUG
+ Logging.MetaLog($"Cube colour {colour}");
+#endif
BlockColor c = ColorSpaceUtility.QuantizeToBlockColor(colour);
result.color = c.Color;
result.darkness = c.Darkness;