Some subtlization of commands / lines / icons

beyond-all-reason · Jan 16, 2023 · 5c82e1f · 5c82e1f
1 parent 867a026
commit 5c82e1f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 31 deletions.
diff --git a/cmdcolors_icexuick.txt b/cmdcolors_icexuick.txt
@@ -36,8 +36,8 @@ mouseBoxBlendDst   one_minus_src_alpha
 alwaysDrawQueue   1
 
 useQueueIcons     1
-queueIconAlpha    0.5   
-queueIconScale    1.0
+queueIconAlpha    0.48   
+queueIconScale    0.9
 
 useColorRestarts  1
 useRestartColor   0
@@ -61,16 +61,17 @@ attack      1.0  0.2  0.2  0.3
 fight       1.0  0.2  1.0  0.3
 guard       0.6  1.0  1.0  0.3
 patrol      0.2  0.5  1.0  0.3
-capture     1.0  1.0  0.3  0.7
-repair      1.0  0.9  0.2  0.7
+capture     1.0  1.0  0.3  0.6
+repair      1.0  0.9  0.2  0.6
 reclaim     0.5  1.0  0.4  0.3
 restore     0.0  1.0  0.0  0.3
-resurrect   0.9  0.5  1.0  0.7
+resurrect   0.9  0.5  1.0  0.5
 load        0.4  0.9  0.9  0.7
 unload      1.0  0.8  0.0  0.7
 deathWatch  0.5  0.5  0.5  0.7
 
 
+
 ////////////////////////////////////////////////////////////////
 //
 //  Selected Range Rendering

diff --git a/luarules/gadgets/unit_target_on_the_move.lua b/luarules/gadgets/unit_target_on_the_move.lua
@@ -673,8 +673,8 @@ else
 	local _, fullview = spGetSpectatingState()
 
 	local lineWidth = 1.4
-	local queueColour = { 1, 0.75, 0, 0.7 }
-	local commandColour = { 1, 0.5, 0, 0.7 }
+	local queueColour = { 1, 0.75, 0, 0.3 }
+	local commandColour = { 1, 0.5, 0, 0.3 }
 
 	local drawAllTargets = {}
 	local drawTarget = {}

diff --git a/luaui/Widgets/gui_commands_fx.lua b/luaui/Widgets/gui_commands_fx.lua
@@ -118,72 +118,72 @@ local CONFIG = {
 	[CMD_ATTACK] = {
 		sizeMult = 1.4,
 		endSize = 0.28,
-		colour = { 1.00, 0.20, 0.20, 0.30 },
+		colour = { 1.0, 0.2, 0.2, 0.30 },
 	},
 	[CMD_CAPTURE] = {
 		sizeMult = 1.4,
 		endSize = 0.28,
-		colour = { 1.00, 1.00, 0.30, 0.30 },
+		colour = { 1.0, 1.0, 0.3, 0.30 },
 	},
 	[CMD_FIGHT] = {
 		sizeMult = 1.2,
 		endSize = 0.24,
-		colour = { 0.30, 0.50, 1.00, 0.25 },
+		colour = { 1.0, 0.2, 1.0, 0.25 },
 	},
 	[CMD_GUARD] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.10, 0.10, 0.50, 0.25 },
+		colour = { 0.6, 1.0, 1.0, 0.25 },
 	},
 	[CMD_LOAD_ONTO] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.30, 1.00, 1.00, 0.25 },
+		colour = { 0.4, 0.9, 0.9, 0.25 },
 	},
 	[CMD_LOAD_UNITS] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.30, 1.00, 1.00, 0.30 },
+		colour = { 0.4, 0.9, 0.9, 0.30 },
 	},
 	[CMD_MANUALFIRE] = {
 		sizeMult = 1.4,
 		endSize = 0.28,
-		colour = { 1.00, 0.00, 0.00, 0.30 },
+		colour = { 1.0, 0.0, 0.0, 0.30 },
 	},
 	[CMD_MOVE] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.00, 1.00, 0.00, 0.25 },
+		colour = { 0.1, 1.0, 0.1, 0.25 },
 	},
 	[CMD_RAW_MOVE] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.00, 1.00, 0.00, 0.25 },
+		colour = { 0.1, 1.0, 0.1, 0.25 },
 	},
 	[CMD_PATROL] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.10, 0.10, 1.00, 0.25 },
+		colour = { 0.2, 0.5, 1.0, 0.25 },
 	},
 	[CMD_RECLAIM] = {
 		sizeMult = 1,
 		endSize = 0,
-		colour = { 1.00, 0.20, 1.00, 0.4 },
+		colour = { 0.5, 1.00, 0.4, 0.4 },
 	},
 	[CMD_REPAIR] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.30, 1.00, 1.00, 0.4 },
+		colour = { 1.0, 0.9, 0.2, 0.4 },
 	},
 	[CMD_RESTORE] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.00, 0.50, 0.00, 0.25 },
+		colour = { 0.0, 0.5, 0.0, 0.25 },
 	},
 	[CMD_RESURRECT] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 0.20, 0.60, 1.00, 0.25 },
+		colour = { 0.9, 0.5, 1.0, 0.25 },
 	},
 	--[[
 	[CMD_SET_TARGET] = {
@@ -195,12 +195,12 @@ local CONFIG = {
 	[CMD_UNLOAD_UNIT] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 1.00, 1.00, 0.00, 0.25 },
+		colour = { 1.0, 0.8, 0.0, 0.25 },
 	},
 	[CMD_UNLOAD_UNITS] = {
 		sizeMult = 1,
 		endSize = 0.2,
-		colour = { 1.00, 1.00, 0.00, 0.25 },
+		colour = { 1.0, 0.8, 0.0, 0.25 },
 	},
 	[BUILD] = {
 		sizeMult = 1,
@@ -247,19 +247,19 @@ local MAX_UNITS = Game.maxUnits
 local function setCmdLineColors(alpha)
 	spLoadCmdColorsConfig('move        0.5  1.0  0.5  ' .. alpha)
 	spLoadCmdColorsConfig('attack      1.0  0.2  0.2  ' .. alpha)
-	spLoadCmdColorsConfig('fight       0.5  0.5  1.0  ' .. alpha)
+	spLoadCmdColorsConfig('fight       1.0  0.2  1.0  ' .. alpha)
 	spLoadCmdColorsConfig('wait        0.5  0.5  0.5  ' .. alpha)
 	spLoadCmdColorsConfig('build       0.0  1.0  0.0  ' .. alpha)
-	spLoadCmdColorsConfig('guard       0.3  0.3  1.0  ' .. alpha)
+	spLoadCmdColorsConfig('guard       0.6  1.0  1.0  ' .. alpha)
 	spLoadCmdColorsConfig('stop        0.0  0.0  0.0  ' .. alpha)
-	spLoadCmdColorsConfig('patrol      0.3  0.3  1.0  ' .. alpha)
+	spLoadCmdColorsConfig('patrol      0.2  0.5  1.0  ' .. alpha)
 	spLoadCmdColorsConfig('capture     1.0  1.0  0.3  ' .. alpha)
-	spLoadCmdColorsConfig('repair      0.3  1.0  1.0  ' .. alpha)
-	spLoadCmdColorsConfig('reclaim     1.0  0.2  1.0  ' .. alpha)
+	spLoadCmdColorsConfig('repair      1.0  0.9  0.2  ' .. alpha)
+	spLoadCmdColorsConfig('reclaim     0.5  1.0  0.4  ' .. alpha)
 	spLoadCmdColorsConfig('restore     0.0  1.0  0.0  ' .. alpha)
-	spLoadCmdColorsConfig('resurrect   0.2  0.6  1.0  ' .. alpha)
-	spLoadCmdColorsConfig('load        0.3  1.0  1.0  ' .. alpha)
-	spLoadCmdColorsConfig('unload      1.0  1.0  0.0  ' .. alpha)
+	spLoadCmdColorsConfig('resurrect   0.9  0.5  1.0  ' .. alpha)
+	spLoadCmdColorsConfig('load        0.4  0.9  0.9  ' .. alpha)
+	spLoadCmdColorsConfig('unload      1.0  0.8  0.0  ' .. alpha)
 	spLoadCmdColorsConfig('deathWatch  0.5  0.5  0.5  ' .. alpha)
 end