Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 149 insertions, 174 deletions

diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index aa200d6..67ddbc9 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -1,190 +1,166 @@
 Scheme
 {
 	Colors
-	{	
-		//rayshud colors
-		"Tutorial Color"				"0 255 0 128"
-		"Ammo In Clip"					"48 255 48 255"
-		"Ammo In Reserve"				"72 255 255 255"
-		"Ammo In Clip Low"				"255 42 130 255"
-		"Ammo In Reserve Low"			"255 128 28 255"
-		"Health Normal"					"235 226 202 255"
-		"Health Buff"					"48 255 48 255"
-		"Health Hurt"					"255 153 0 255"
-		"Uber Bar Color"				"235 226 202 255"
-		"Solid Color Uber"				"255 50 25 255"
-		"Flashing Uber Color1"			"255 165 0 255"
-		"Flashing Uber Color2"			"255 69 0 255"
-		"Heal Numbers"					"48 255 48 255"
-		"Damage Numbers"				"72 255 255 255"
-		"Crosshair"						"242 242 242 255"
-		"CrosshairDamage"				"255 0 0 255"
-		
-		//refers to watching stvs/killcam shots
-		"Spec Health Normal"			"235 226 202 255"
-		"Spec Health Buff"				"48 255 48 255"			
-		"Spec Health Hurt"				"255 153 0 255"
-		
-		//alternate colors for flashing values
-		"Alternate Spec Health Normal"	"235 226 202 255"
-		"Alternate Spec Health Buff"	"48 255 48 255"			
-		"Alternate Spec Health Hurt"	"255 153 0 255"
-		
-		//alternate colors for flashing values
-		"Alternate Health Normal"		"235 226 202 255"
-		"Alternate Health Buff"			"48 255 48 255"			
-		"Alternate Health Hurt"			"255 153 0 255"
-		
-		//'Last DamageHeal Info' refers to the number that appears above hp
-		"Last DamageHeal Info"			"72 255 255 255"
-		
-		//Menu/Color scheme colors
-		"TransparentPanelBG"			"25 25 25 128"
-		"Base Color"					"15 255 255 255"
-		"Button Color"					"72 255 255 255"	
-		
-		"Inactive Tab"					"15 100 100 255"	
-		
-		"StatBar1"						"15 255 255 128"
-		"StatBar2"						"15 225 225 128"
-		"StatBar3"						"15 195 195 128"
-		"StatBar4"						"15 165 165 128"
-		"StatBar5"						"15 135 135 128"
-		"StatBar6"						"15 105 105 128"
-		"StatBar7"						"15 85 85 128"
-		"StatBar8"						"15 65 65 128"
-		"StatBar9"						"15 45 45 128"
-		
-		//item backdrop color, refers to background color when mousing over items
-		"ItemPanelBG"					"50 50 50 255"
-		
-		//Rainbow Uber Colors
-		"ColorRed"						"255 0 0 255"
-		"ColorVermillion"				"255 64 0 255"
-		"ColorOrange"					"255 128 0 255"
-		"ColorYellow"					"255 255 0 255"
-		"ColorLime"						"128 255 0 255"
-		"ColorGreen"					"0 255 0 255"
-		"ColorTeal"						"0 255 128 255"
-		"ColorCyan"						"0 255 255 255"
-		"ColorAqua"						"0 128 255 255"
-		"ColorBlue"						"0 0 255 255"
-		"ColorPurple"					"128 0 255 255"
-		"ColorMagenta"					"255 0 255 255"
-		"ColorRuby"						"255 0 128 255"
-		"ColorBlack"					"0 0 0 255"
-		"ColorGreyDark"					"64 64 64 255"
-		"ColorGreyMid"					"128 128 128 255"
-		"ColorGreyLight"				"192 192 192 255"
-		"ColorWhite"					"255 255 255 255"
-		
-		"Transparent"					"0 0 0 0"
-		"TextColor"						"117 107 94 255"
-		"DarkGrey"						"27 27 27 255"
-		"DarkerGrey"					"22 22 22 255"
-		
-		"Grey"							"51 47 46 255"
-		//end rayshud colors
-		
-		// base colors
-		"Orange"						"Base Color"
-		"OrangeDim"						"Base Color"
-		"LightOrange"					"188 112 0 128"
-		"GoalOrange"					"255 133 0"
-		"TFOrange"						"145 73 59 255"
-		"Purple"						"137 69 99 255"
-		
-		"QuestGold"						"208 147 75 255"
-		"HalloweenThemeColor2015_Light"	"238 126 17 255"
-		"HalloweenThemeColor2015"		"135 54 16 255"
-		"HalloweenThemeColor2015_Dark"	"108 49 21 255"
-		"QuestUncommitted"				"183 147 100 255"
+	{
+		// HUD COLORS
+		//---------------------------------------------
+		"ColorRed"					"255 0 0 255"
+		"ColorVermillion"			"255 64 0 255"
+		"ColorOrange"				"255 128 0 255"
+		"ColorYellow"				"255 255 0 255"
+		"ColorLime"					"128 255 0 255"
+		"ColorGreen"				"0 255 0 255"
+		"ColorTeal"					"0 255 128 255"
+		"ColorCyan"					"15 255 255 255"
+		"ColorAqua"					"0 128 255 255"
+		"ColorBlue"					"0 0 255 255"
+		"ColorPurple"				"128 0 255 255"
+		"ColorMagenta"				"255 0 255 255"
+		"ColorRuby"					"255 0 128 255"
+		"ColorBlack"				"0 0 0 255"
+		"ColorGreyDark"				"64 64 64 255"
+		"ColorGreyMid"				"128 128 128 255"
+		"ColorGreyLight"			"192 192 192 255"
+		"ColorWhite"				"255 255 255 255"
+		"Grey"						"51 47 46 255"
+		"DarkGrey"					"27 27 27 255"
+		"DarkerGrey"				"22 22 22 255"
+		"TextColor"					"117 107 94 255"
+		"DullWhite"					"132 132 132 255"
+		//---------------------------------------------
+		// Gameplay
+		"Ammo In Clip"				"48 255 48 255"
+		"Ammo In Reserve"			"72 255 255 255"
+		"Ammo In Clip Low"			"255 42 130 255"
+		"Ammo In Reserve Low"		"255 128 28 255"
+		"Health Normal"				"235 226 202 255"
+		"Health Buff"				"48 255 48 255"
+		"Health Hurt"				"255 153 0 255"
+		"Heal Numbers"				"48 255 48 255"
+		"Last DamageHeal Info"		"72 255 255 255"
+		"TransparentPanelBG"		"25 25 25 148"
+		"ItemPanelBG"				"50 50 50 255"
+		"Button Color"				"72 255 255 255"
+		//---------------------------------------------
+		// Crosshair Colors
+		"Crosshair"					"242 242 242 255"
+		"CrosshairDamage"			"255 0 0 255"
+		//---------------------------------------------
+		// Ubercharge
+		"Uber Bar Color"			"235 226 202 255"
+		"Solid Color Uber"			"255 50 25 255"
+		"Flashing Uber Color1"		"255 165 0 255"
+		"Flashing Uber Color2"		"255 69 0 255"
+		//---------------------------------------------
+		// Player Stats
+		"StatBar1"					"15 255 255 128"
+		"StatBar2"					"15 225 225 128"
+		"StatBar3"					"15 195 195 128"
+		"StatBar4"					"15 165 165 128"
+		"StatBar5"					"15 135 135 128"
+		"StatBar6"					"15 105 105 128"
+		"StatBar7"					"15 85 85 128"
+		"StatBar8"					"15 65 65 128"
+		"StatBar9"					"15 45 45 128"
+		//---------------------------------------------
+		// DEFAULT COLORS
+		//---------------------------------------------
+		"Orange"								"ColorCyan"
+		"OrangeDim"								"ColorCyan"
+		"LightOrange"							"188 112 0 128"
+		"GoalOrange"							"255 133 0 255"
+		"TFOrange"								"145 73 59 255"
+		"Purple"								"137 69 99 255"
 
-		"QuestMap_Bonus"				"222 217 166 255"
-		"QuestMap_ActiveOrange"			"212 127 25 255"
-		"QuestMap_InactiveGrey"			"100 100 100 255"
-		"QuestMap_BGImages"				"56 58 60 255"
+		"HalloweenThemeColor2015_Light"			"238 126 17 255"
+		"HalloweenThemeColor2015"				"135 54 16 255"
+		"HalloweenThemeColor2015_Dark"			"108 49 21 255"
 
-		"PartyMember1"					"124 173 255 255"
-		"PartyMember2"					"99  232 167 255"
-		"PartyMember3"					"229 255 121 255"
-		"PartyMember4"					"232 184 99  255"
-		"PartyMember5"					"255 118 108 255"
-		"PartyMember6"					"255 133 255 255"
-		
-		"White"							"235 235 235 255"
-		"Red"							"192 28 0 140"
-		"RedSolid"						"192 28 0 255"
-		"Blue"							"0 28 162 140"
-		"Yellow"						"251 235 202 255"
-		"TransparentYellow"				"251 235 202 140"
-		//"Black"						"0 0 0 255"
-		"GreenSolid"					"76 107 34 255"	
-		
-		"Black"							"46 43 42 255"
-		"TransparentBlack"				"0 0 0 196"
-		"TransparentLightBlack"			"0 0 0 90"
-		"FooterBGBlack"					"52 48 55 255"
-		
-		"HUDBlueTeam"					"104 124 155 127"
-		"HUDRedTeam"					"180 92 77 127"
-		"HUDSpectator"					"124 124 124 127"
-		"HUDBlueTeamSolid"				"104 124 155 255"
-		"HUDRedTeamSolid"				"180 92 77 255"
-		"HUDDeathWarning"				"255 0 0 255"
-		"HudWhite"						"255 255 255 255"
-		"HudOffWhite"					"200 187 161 255"
-		"HudBlack"						"65 65 65 255"
-		"ProgressBarBlue"				"91 122 142 255"
-		
-		"CreditsGreen"					"94 150 49 255"
-		
-		"Gray"							"178 178 178 255"
+		"QuestGold"								"208 147 75 255"
+		"QuestUncommitted"						"183 147 100 255"
+		"QuestMap_Bonus"						"222 217 166 255"
+		"QuestMap_ActiveOrange"					"212 127 25 255"
+		"QuestMap_InactiveGrey"					"100 100 100 255"
+		"QuestMap_BGImages"						"56 58 60 255"
 
-		"Blank"							"0 0 0 0"
-		"ForTesting"					"255 0 0 32"
-		"ForTesting_Magenta"			"0 255 0 255"
-		"ForTesting_MagentaDim"			"0 255 0 120"
+		"PartyMember1"							"124 173 255 255"
+		"PartyMember2"							"99  232 167 255"
+		"PartyMember3"							"229 255 121 255"
+		"PartyMember4"							"232 184 99  255"
+		"PartyMember5"							"255 118 108 255"
+		"PartyMember6"							"255 133 255 255"
+		
+		"White"									"242 242 242 255"
+		"Red"									"192 28 0 140"
+		"RedSolid"								"192 28 0 255"
+		"Blue"									"0 28 162 140"
+		"Yellow"								"251 235 202 255"
+		"TransparentYellow"						"251 235 202 140"
+		//"Black"								"0 0 0 255"
+		"GreenSolid"							"76 107 34 255"
+		
+		"Black"									"46 43 42 255"
+		"Transparent"							"0 0 0 0"
+		"TransparentBlack"						"0 0 0 196"
+		"TransparentLightBlack"					"0 0 0 90"
+		"FooterBGBlack"							"52 48 55 255"
+		
+		"HUDBlueTeam"							"104 124 155 127"
+		"HUDRedTeam"							"180 92 77 127"
+		"HUDSpectator"							"124 124 124 127"
+		"HUDBlueTeamSolid"						"104 124 155 255"
+		"HUDRedTeamSolid"						"180 92 77 255"
+		"HUDDeathWarning"						"255 0 0 255"
+		"HudWhite"								"255 255 255 255"
+		"HudOffWhite"							"200 187 161 255"
+		"HudBlack"								"65 65 65 255"
+		"ProgressBarBlue"						"91 122 142 255"
+		"CreditsGreen"							"94 150 49 255"
+		
+		"Gray"									"178 178 178 255"
+		"Blank"									"0 0 0 0"
+		"ForTesting"							"255 0 0 32"
+		"ForTesting_Magenta"					"0 255 0 255"
+		"ForTesting_MagentaDim"					"0 255 0 120"
 
-		"HudPanelForeground"			"123 110 59 184"
-		"HudPanelBackground"			"123 110 59 184"
-		"HudPanelBorder"				"255 255 255 102"
+		"HudPanelForeground"					"123 110 59 184"
+		"HudPanelBackground"					"123 110 59 184"
+		"HudPanelBorder"						"255 255 255 102"
 
-		"HudProgressBarActive"			"240 207 78 255"
-		"HudProgressBarInActive"		"140 120 73 255"
-		"HudProgressBarActiveLow"		"240 30 30 255"
-		"HudProgressBarInActiveLow"		"240 30 30 99"	
+		"HudProgressBarActive"					"240 207 78 255"
+		"HudProgressBarInActive"				"140 120 73 255"
+		"HudProgressBarActiveLow"				"240 30 30 255"
+		"HudProgressBarInActiveLow"				"240 30 30 99"	
 
-		"HudTimerProgressActive"		"251 235 202 255"
-		"HudTimerProgressInActive"		"52 48 45 255"
-		"HudTimerProgressWarning"		"240 30 30 255"
+		"HudTimerProgressActive"				"251 235 202 255"
+		"HudTimerProgressInActive"				"52 48 45 255"
+		"HudTimerProgressWarning"				"240 30 30 255"
 
-		// training
-		"HudTrainingHint"				"212 160 23 255"
+		// Training
+		"HudTrainingHint"						"212 160 23 255"
 		
-		"TanDark"						"117 107 94 255"
-		"TanLight"						"235 226 202 255"
-		"TanDarker"						"46 43 42 255"
+		"TanDark"								"117 107 94 255"
+		"TanLight"								"235 226 202 255"
+		"TanDarker"								"46 43 42 255"
 		
-		"StoreDarkTan"					"131 121 104 255"
-		"StoreGreen"					"76 107 34 255"
+		"StoreDarkTan"							"131 121 104 255"
+		"StoreGreen"							"76 107 34 255"
 		
 		// Building HUD Specific
-		"LowHealthRed"					"255 0 0 255"
-		"ProgressOffWhite"				"251 235 202 255"
-		"ProgressBackground"			"250 234 201 51"
-		"HealthBgGrey"					"72 71 69 255"
-		
-		"ProgressOffWhiteTransparent"	"251 235 202 128"
+		"LowHealthRed"							"255 0 0 255"
+		"ProgressOffWhite"						"251 235 202 255"
+		"ProgressBackground"					"250 234 201 51"
+		"HealthBgGrey"							"72 71 69 255"
 		
-		"LabelDark"						"48 43 42 255"
-		"LabelTransparent"				"109 96 80 180"
+		"LabelDark"								"48 43 42 255"
+		"LabelTransparent"						"109 96 80 180"
 		
-		"BuildMenuActive"				"248 231 198 255"
+		"BuildMenuActive"						"248 231 198 255"
 		
-		"DisguiseMenuIconRed"			"192 56 63 255"
-		"DisguiseMenuIconBlue"			"92 128 166 255"
+		"DisguiseMenuIconRed"					"192 56 63 255"
+		"DisguiseMenuIconBlue"					"92 128 166 255"
 
+		"ProgressOffWhiteTransparent"			"251 235 202 128"
  		"MatchmakingDialogTitleColor"			"15 255 255 255"
  		"MatchmakingMenuItemBackground"			"46 43 42 255"
  		"MatchmakingMenuItemBackgroundActive"	"15 255 255 255"	
@@ -206,12 +182,11 @@ Scheme
 		"ItemLimitedUse"						"0 160 0 255"
 		"ItemFlags"								"117 107 94 255"
 		"ItemLimitedQuantity"					"225 209 0 255"
-	
 		
 		"QualityColorNormal"					"178 178 178 255"
 		"QualityColorrarity1"					"77 116 85 255"
 		"QualityColorrarity2"					"141 131 75 255"
-		"QualityColorrarity3"					"112 85 15 255"
+		"QualityColorrarity3"					"204 204 250 255"
 		"QualityColorrarity4"					"134 80 172 255"
 		"QualityColorVintage"					"71 98 145 255"
 		"QualityColorUnique"					"255 215 0 255"
@@ -240,6 +215,7 @@ Scheme
 		"ItemRarityMythical_GreyedOut"			"45 24 85 255"
 		"ItemRarityLegendary_GreyedOut"			"70 15 77 255"
 		"ItemRarityAncient_GreyedOut"			"78 25 25 255"
+
 		"QualityColorNormal_GreyedOut"			"44 44 44 255"
 		"QualityColorrarity1_GreyedOut"			"20 29 21 255"
 		"QualityColorrarity2_GreyedOut"			"35 33 19 255"
@@ -248,7 +224,7 @@ Scheme
 		"QualityColorVintage_GreyedOut"			"18 25 36 255"
 		"QualityColorUnique_GreyedOut"			"64 54 0  255"
 		"QualityColorCommunity_GreyedOut"		"28 44 19 255"
-		"QualityColorDeveloper_GreyedOut"		"41 4  30  255"
+		"QualityColorDeveloper_GreyedOut"		"41 4  30 255"
 		"QualityColorSelfMade_GreyedOut"		"28 44 74 255"
 		"QualityColorCustomized_GreyedOut"		"71 98 19 255"
 		"QualityColorStrange_GreyedOut"			"52 27 13 255"
@@ -258,7 +234,6 @@ Scheme
 		"QualityColorPaintkitWeapon_GreyedOut"	"60 60 60 255"
 		
 		"SaleGreen"								"76 107 34 255"
-		
 		"LightRed"								"200 80 60 255"
 		"LighterRed"							"220 100 80 255"
 		"LighterDarkBrown"						"59 54 48 255"
@@ -275,4 +250,4 @@ Scheme
 		"UpgradeDisabledFg"						"64 59 52 255"
 		"UpgradeDisabledBg"						"79 77 68 255"
 	}
-}
+}
\ No newline at end of file