From f7da19b66761fbab07ffd86a89a994bbedac5a14 Mon Sep 17 00:00:00 2001 From: Misa Date: Wed, 1 Jul 2020 03:03:35 -0700 Subject: [PATCH] Make text() colors consistent with setblockcolour() It seems a bit strange to have two separate color indexes that are mostly the same, don'tcha think? --- desktop_version/src/Script.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp index a9102c53..b5027952 100644 --- a/desktop_version/src/Script.cpp +++ b/desktop_version/src/Script.cpp @@ -366,12 +366,24 @@ void scriptclass::run() g = 134; b = 255; } + else if (words[1] == "white") + { + r = 244; + g = 244; + b = 244; + } else if (words[1] == "gray") { r = 174; g = 174; b = 174; } + else if (words[1] == "orange") + { + r = 255; + g = 130; + b = 20; + } else { //use a gray