Added four text colors: ice, fire, sapphire, teal

https://forum.zdoom.org/viewtopic.php?t=57942
This commit is contained in:
JimmyZD 2017-09-23 16:01:07 +08:00 committed by Christoph Oelckers
parent f174111128
commit abc8e4deac
8 changed files with 74 additions and 0 deletions

View file

@ -102,6 +102,8 @@ FBasicStartupScreen::FBasicStartupScreen(int maxProgress, bool showBar)
consoleWindow.AddText(TEXTCOLOR_DARKGREEN "TEXTCOLOR_DARKGREEN\n" TEXTCOLOR_DARKRED "TEXTCOLOR_DARKRED\n"); consoleWindow.AddText(TEXTCOLOR_DARKGREEN "TEXTCOLOR_DARKGREEN\n" TEXTCOLOR_DARKRED "TEXTCOLOR_DARKRED\n");
consoleWindow.AddText(TEXTCOLOR_DARKBROWN "TEXTCOLOR_DARKBROWN\n" TEXTCOLOR_PURPLE "TEXTCOLOR_PURPLE\n"); consoleWindow.AddText(TEXTCOLOR_DARKBROWN "TEXTCOLOR_DARKBROWN\n" TEXTCOLOR_PURPLE "TEXTCOLOR_PURPLE\n");
consoleWindow.AddText(TEXTCOLOR_DARKGRAY "TEXTCOLOR_DARKGRAY\n" TEXTCOLOR_CYAN "TEXTCOLOR_CYAN\n"); consoleWindow.AddText(TEXTCOLOR_DARKGRAY "TEXTCOLOR_DARKGRAY\n" TEXTCOLOR_CYAN "TEXTCOLOR_CYAN\n");
consoleWindow.AddText(TEXTCOLOR_ICE "TEXTCOLOR_ICE\n" TEXTCOLOR_FIRE "TEXTCOLOR_FIRE\n");
consoleWindow.AddText(TEXTCOLOR_SAPPHIRE "TEXTCOLOR_SAPPHIRE\n" TEXTCOLOR_TEAL "TEXTCOLOR_TEAL\n");
consoleWindow.AddText(TEXTCOLOR_NORMAL "TEXTCOLOR_NORMAL\n" TEXTCOLOR_BOLD "TEXTCOLOR_BOLD\n"); consoleWindow.AddText(TEXTCOLOR_NORMAL "TEXTCOLOR_NORMAL\n" TEXTCOLOR_BOLD "TEXTCOLOR_BOLD\n");
consoleWindow.AddText(TEXTCOLOR_CHAT "TEXTCOLOR_CHAT\n" TEXTCOLOR_TEAMCHAT "TEXTCOLOR_TEAMCHAT\n"); consoleWindow.AddText(TEXTCOLOR_CHAT "TEXTCOLOR_CHAT\n" TEXTCOLOR_TEAMCHAT "TEXTCOLOR_TEAMCHAT\n");
consoleWindow.AddText("----------------------------------------------------------------\n"); consoleWindow.AddText("----------------------------------------------------------------\n");

View file

@ -66,6 +66,10 @@ enum EColorRange : int
CR_PURPLE, CR_PURPLE,
CR_DARKGRAY, CR_DARKGRAY,
CR_CYAN, CR_CYAN,
CR_ICE,
CR_FIRE,
CR_SAPPHIRE,
CR_TEAL,
NUM_TEXT_COLORS, NUM_TEXT_COLORS,
}; };

View file

@ -68,6 +68,10 @@ struct FBrokenLines
#define TEXTCOLOR_PURPLE "\034T" #define TEXTCOLOR_PURPLE "\034T"
#define TEXTCOLOR_DARKGRAY "\034U" #define TEXTCOLOR_DARKGRAY "\034U"
#define TEXTCOLOR_CYAN "\034V" #define TEXTCOLOR_CYAN "\034V"
#define TEXTCOLOR_ICE "\034W"
#define TEXTCOLOR_FIRE "\034X"
#define TEXTCOLOR_SAPPHIRE "\034Y"
#define TEXTCOLOR_TEAL "\034Z"
#define TEXTCOLOR_NORMAL "\034-" #define TEXTCOLOR_NORMAL "\034-"
#define TEXTCOLOR_BOLD "\034+" #define TEXTCOLOR_BOLD "\034+"

View file

@ -2405,6 +2405,10 @@ C_DARKBROWN = "\csdark brown";
C_PURPLE = "\ctpurple"; C_PURPLE = "\ctpurple";
C_DARKGRAY = "\cudark gray"; C_DARKGRAY = "\cudark gray";
C_CYAN = "\cvcyan"; C_CYAN = "\cvcyan";
C_ICE = "\cwice";
C_FIRE = "\cxfire";
C_SAPPHIRE = "\cysapphire";
C_TEAL = "\czteal";
// Option Strings // Option Strings
OPTSTR_SIMPLEARROW = "Simple arrow"; OPTSTR_SIMPLEARROW = "Simple arrow";
OPTSTR_HERETIC = "Heretic"; OPTSTR_HERETIC = "Heretic";

View file

@ -823,6 +823,10 @@ OptionValue TextColors
19.0, "$C_PURPLE" 19.0, "$C_PURPLE"
20.0, "$C_DARKGRAY" 20.0, "$C_DARKGRAY"
21.0, "$C_CYAN" 21.0, "$C_CYAN"
22.0, "$C_ICE"
23.0, "$C_FIRE"
24.0, "$C_SAPPHIRE"
25.0, "$C_TEAL"
} }
OptionValue Crosshairs OptionValue Crosshairs

View file

@ -218,3 +218,47 @@ Console:
Flat: Flat:
#00DDDD #00DDDD
} }
Ice
{
#343450 #7C7C98 0 94
#7C7C98 #E0E0E0 95 256
Console:
#343450 #7C7C98 0 127
#7C7C98 #E0E0E0 128 256
Flat:
#7C7C98
}
Fire
{
#660000 #D57604 0 104
#D57604 #FFFF00 105 256
Console:
#6F0000 #D57604 0 127
#D57604 #FFFF00 128 256
Flat:
#D57604
}
Sapphire
{
#000468 #506CFC 0 94
#506CFC #50ECFC 95 256
Console:
#000468 #506CFC 0 127
#506CFC #50ECFC 128 256
Flat:
#506CFC
}
Teal
{
#001F1F #236773 0 90
#236773 #7BB3C3 91 256
Console:
#001F1F #236773 0 127
#236773 #7BB3C3 128 256
Flat:
#236773
}

View file

@ -210,6 +210,10 @@ struct Font native
CR_PURPLE, CR_PURPLE,
CR_DARKGRAY, CR_DARKGRAY,
CR_CYAN, CR_CYAN,
CR_ICE,
CR_FIRE,
CR_SAPPHIRE,
CR_TEAL,
NUM_TEXT_COLORS NUM_TEXT_COLORS
}; };
@ -236,6 +240,10 @@ struct Font native
const TEXTCOLOR_PURPLE = "\034T"; const TEXTCOLOR_PURPLE = "\034T";
const TEXTCOLOR_DARKGRAY = "\034U"; const TEXTCOLOR_DARKGRAY = "\034U";
const TEXTCOLOR_CYAN = "\034V"; const TEXTCOLOR_CYAN = "\034V";
const TEXTCOLOR_ICE = "\034W";
const TEXTCOLOR_FIRE = "\034X";
const TEXTCOLOR_SAPPHIRE = "\034Y";
const TEXTCOLOR_TEAL = "\034Z";
const TEXTCOLOR_NORMAL = "\034-"; const TEXTCOLOR_NORMAL = "\034-";
const TEXTCOLOR_BOLD = "\034+"; const TEXTCOLOR_BOLD = "\034+";

View file

@ -1150,6 +1150,10 @@ const TEXTCOLOR_DARKBROWN = "\034S";
const TEXTCOLOR_PURPLE = "\034T"; const TEXTCOLOR_PURPLE = "\034T";
const TEXTCOLOR_DARKGRAY = "\034U"; const TEXTCOLOR_DARKGRAY = "\034U";
const TEXTCOLOR_CYAN = "\034V"; const TEXTCOLOR_CYAN = "\034V";
const TEXTCOLOR_ICE = "\034W";
const TEXTCOLOR_FIRE = "\034X";
const TEXTCOLOR_SAPPHIRE = "\034Y";
const TEXTCOLOR_TEAL = "\034Z";
const TEXTCOLOR_NORMAL = "\034-"; const TEXTCOLOR_NORMAL = "\034-";
const TEXTCOLOR_BOLD = "\034+"; const TEXTCOLOR_BOLD = "\034+";