Skip to content

Commit 8b186e6

Browse files
GoogleFrogGoogleFrog
committed
Lobby-side support for cmd alpha.
1 parent 3331649 commit 8b186e6

2 files changed

Lines changed: 152 additions & 0 deletions

File tree

‎LuaMenu/configs/gameConfig/zk/cmdcolors/cmdcolors_source.txt‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
////////////////////////////////////////////////////////////////
2+
//
3+
// Selected Unit Boxes
4+
//
5+
6+
unitBoxLineWidth 1.49
7+
unitBox 0.0 1.0 0.0 0.6
8+
buildBox 0.0 1.0 0.0 0.6
9+
allyBuildBox 0.8 0.8 0.2 0.6
10+
buildBoxesOnShift 1
11+
12+
13+
////////////////////////////////////////////////////////////////
14+
//
15+
// Mouse Selection Box
16+
//
17+
18+
mouseBoxLineWidth 1.49
19+
mouseBox 0.45 0.95 1.0 0.8
20+
mouseBoxBlendSrc src_alpha
21+
mouseBoxBlendDst one_minus_src_alpha
22+
23+
// best choice for non-grey maps
24+
//
25+
//mouseBoxBlendSrc one_minus_dst_color
26+
//mouseBoxBlendDst zero
27+
28+
29+
////////////////////////////////////////////////////////////////
30+
//
31+
// Command Queue Rendering
32+
//
33+
34+
alwaysDrawQueue 1
35+
36+
useQueueIcons 1
37+
queueIconAlpha __QUEUE_ICON_ALPHA__
38+
queueIconScale 1.0
39+
40+
useColorRestarts 1
41+
useRestartColor 0
42+
restartAlpha 1.0
43+
44+
queuedLineWidth 2.0
45+
queuedBlendSrc src_alpha
46+
queuedBlendDst one_minus_src_alpha
47+
stipplePattern 0xffcc
48+
stippleFactor 1
49+
stippleSpeed 1.0
50+
51+
start 1.0 1.0 1.0 __CMD_ALPHA__
52+
restart 0.4 0.4 0.4 __CMD_ALPHA__
53+
54+
stop 0.0 0.0 0.0 __CMD_ALPHA__
55+
wait 0.5 0.5 0.5 __CMD_ALPHA__
56+
build 0.0 1.0 0.0 __CMD_ALPHA__
57+
move 0.5 1.0 0.5 __CMD_ALPHA__
58+
attack 1.0 0.2 0.2 __CMD_ALPHA__
59+
fight 0.6 0.6 1.0 __CMD_ALPHA_DARK__
60+
guard 0.4 0.4 1.0 __CMD_ALPHA_DARK__
61+
patrol 0.3 0.3 1.0 __CMD_ALPHA__
62+
capture 1.0 1.0 0.3 __CMD_ALPHA__
63+
repair 0.3 1.0 1.0 __CMD_ALPHA__
64+
reclaim 1.0 0.2 1.0 __CMD_ALPHA__
65+
restore 0.0 1.0 0.0 __CMD_ALPHA__
66+
resurrect 0.2 0.6 1.0 __CMD_ALPHA__
67+
load 0.3 1.0 1.0 __CMD_ALPHA__
68+
unload 1.0 1.0 0.0 __CMD_ALPHA__
69+
deathWatch 0.5 0.5 0.5 __CMD_ALPHA__
70+
71+
72+
////////////////////////////////////////////////////////////////
73+
//
74+
// Selected Range Rendering
75+
//
76+
77+
selectedLineWidth 2.0
78+
selectedBlendSrc src_alpha
79+
selectedBlendDst one_minus_src_alpha
80+
81+
rangeAttack 1.0 0.3 0.3 0.4
82+
rangeBuild 0.3 1.0 0.3 0.4
83+
rangeRadar 0.3 1.0 0.3 0.4
84+
rangeSonar 0.3 0.3 1.0 0.4
85+
rangeSeismic 0.8 0.1 0.8 0.4
86+
rangeJammer 1.0 0.3 0.3 0.4
87+
rangeSonarJammer 1.0 0.3 0.3 0.4
88+
rangeShield 0.8 0.8 0.3 0.4
89+
rangeDecloak 0.3 0.3 1.0 0.4
90+
rangeExtract 1.0 0.3 0.3 0.4
91+
rangeKamikaze 0.8 0.8 0.1 0.4
92+
rangeSelfDestruct 0.8 0.1 0.1 0.4
93+
rangeInterceptorOn 1.0 1.0 1.0 0.4
94+
rangeInterceptorOff 0.0 0.0 0.0 0.4

‎LuaMenu/configs/gameConfig/zk/settingsMenu.lua‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ local TRUE = "true"
44
local FALSE = "false"
55

66
local lupsFileTarget = "lups.cfg"
7+
local cmdcolorsFileTarget = "cmdcolors.txt"
78

89
local function UpdateLups(_, conf)
910
conf = conf or (WG.Chobby and WG.Chobby.Configuration)
@@ -34,6 +35,43 @@ local function UpdateLups(_, conf)
3435
settingsFile:close()
3536
end
3637

38+
local function UpdateCmdcolors(_, conf)
39+
conf = conf or (WG.Chobby and WG.Chobby.Configuration)
40+
local settings = conf and conf.settingsMenuValues
41+
if not settings then
42+
return
43+
end
44+
45+
local cmdAlpha = (settings.CommandAlpha or 70)/100
46+
local cmdAlphaDark
47+
if cmdAlpha >= 0.7 then
48+
cmdAlphaDark = cmdAlpha + 0.1
49+
elseif cmdAlpha >= 0.6 then
50+
cmdAlphaDark = cmdAlpha + 0.05
51+
else
52+
cmdAlphaDark = cmdAlpha + 0.02
53+
end
54+
55+
local queueIconAlpha = (settings.QueueIconAlpha or 50)/100
56+
57+
local cmdcolorsFileName = "LuaMenu/configs/gameConfig/zk/cmdcolors/cmdcolors_source.txt"
58+
local sourceFile = VFS.LoadFile(cmdcolorsFileName)
59+
60+
sourceFile = sourceFile:gsub("__CMD_ALPHA__", cmdAlpha)
61+
sourceFile = sourceFile:gsub("__CMD_ALPHA_DARK__", cmdAlphaDark)
62+
sourceFile = sourceFile:gsub("__QUEUE_ICON_ALPHA__", queueIconAlpha)
63+
64+
local settingsFile = io.open(cmdcolorsFileTarget, "w")
65+
settingsFile:write(sourceFile)
66+
settingsFile:close()
67+
68+
return {
69+
CmdAlpha = cmdAlpha,
70+
CmdAlphaDark = cmdAlphaDark,
71+
CmdIconAlpha = queueIconAlpha,
72+
}
73+
end
74+
3775
local function GetUiScaleParameters()
3876
local realWidth, realHeight = Spring.Orig.GetViewSizes()
3977
local defaultUiScale = math.floor(math.max(1, realHeight/950))*100
@@ -893,6 +931,8 @@ local settingsConfig = {
893931
InvertZoom = "Off",
894932
TextToSpeech = "On",
895933
EdgeScroll = "On",
934+
CommandAlpha = 70,
935+
QueueIconAlpha = 50,
896936
MiddlePanSpeed = 15,
897937
CameraPanSpeed = 50,
898938
NetworkSettings = "Balanced",
@@ -1021,6 +1061,22 @@ local settingsConfig = {
10211061
},
10221062
},
10231063
},
1064+
{
1065+
name = "CommandAlpha",
1066+
humanName = "Command Line Alpha (%)",
1067+
isNumberSetting = true,
1068+
minValue = 10,
1069+
maxValue = 100,
1070+
applyFunction = UpdateCmdcolors
1071+
},
1072+
{
1073+
name = "QueueIconAlpha",
1074+
humanName = "Command Icon Alpha (%)",
1075+
isNumberSetting = true,
1076+
minValue = 10,
1077+
maxValue = 100,
1078+
applyFunction = UpdateCmdcolors
1079+
},
10241080
{
10251081
name = "MiddlePanSpeed",
10261082
humanName = "Middle Click Pan Speed",
@@ -1148,6 +1204,8 @@ local settingsDefault = {
11481204
InvertZoom = "Off",
11491205
TextToSpeech = "On",
11501206
EdgeScroll = "On",
1207+
CommandAlpha = 70,
1208+
QueueIconAlpha = 50,
11511209
MiddlePanSpeed = 15,
11521210
CameraPanSpeed = 50,
11531211
NetworkSettings = "Balanced",

0 commit comments

Comments
 (0)