Skip to content

Commit

Permalink
Add a new modernized Chobby skin
Browse files Browse the repository at this point in the history
  • Loading branch information
completesomething committed Jun 24, 2023
1 parent c9cae6e commit 36c0373
Show file tree
Hide file tree
Showing 44 changed files with 51 additions and 43 deletions.
Binary file modified LuaMenu/images/battle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed LuaMenu/images/battle.psd
Binary file not shown.
Binary file modified LuaMenu/images/ingame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/link.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/lock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/ranks/player.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/ranks/robot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/ready.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed LuaMenu/images/ready.psd
Binary file not shown.
Binary file modified LuaMenu/images/runningBattle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/images/top-background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LuaMenu/images/top-background.png~
Binary file not shown.
Binary file modified LuaMenu/images/unready.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/combobox_wnd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/editbox_border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/panel2_border.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 23 additions & 14 deletions LuaMenu/widgets/chili/skins/Evolved/skin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ skin.button = {
tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom
padding = {10, 10, 10, 10},

backgroundColor = {0.04, 0.3, 0.55, 0.84},
focusColor = {0.94, 0.50, 0.23, 0.72},
borderColor = {1,1,1,0},
--backgroundColor = {0.04, 0.55, 0.55, 0.60},
--focusColor = {0.04, 0.55, 0.55, 0.95},
--borderColor = {1,1,1,0},

backgroundColor = {0.17, 0.16, 0.20, 0.9},
focusColor = {0.20, 0.45, 0.80, 0.9},
borderColor = {0.18, 0.16, 0.20, 0.15},

DrawControl = DrawButton,
}
Expand Down Expand Up @@ -118,9 +122,13 @@ skin.action_button = {
tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom
padding = {10, 10, 10, 10},

backgroundColor = {0.98, 0.48, 0.26, 0.65},
focusColor = {0.98, 0.48, 0.26, 0.9},
borderColor = {0.98, 0.48, 0.26, 0.15},
--backgroundColor = {0.98, 0.48, 0.26, 0.65},
--focusColor = {0.98, 0.48, 0.26, 0.9},
--borderColor = {0.98, 0.48, 0.26, 0.15},

backgroundColor = {247/255, 114/255, 42/255, 0.65},
focusColor = {247/255, 114/255, 42/255, 0.9},
borderColor = {247/255, 114/255, 42/255, 0.15},

DrawControl = DrawButton,
}
Expand All @@ -131,9 +139,9 @@ skin.option_button = {
tiles = {20, 14, 20, 14}, --// tile widths: left,top,right,bottom
padding = {10, 10, 10, 10},

backgroundColor = {0.21, 0.53, 0.60, 0.65},
focusColor = {0.21, 0.53, 0.60, 0.9},
borderColor = {0.21, 0.53, 0.60, 0.15},
backgroundColor = {0.15, 0.46, 0.72, 0.65},
focusColor = {0.15, 0.46, 0.72, 0.9},
borderColor = {0.15, 0.46, 0.72, 0.15},

DrawControl = DrawButton,
}
Expand Down Expand Up @@ -166,7 +174,7 @@ skin.positive_button = {

skin.battle_default_button = { --Blue
TileImageBK = ":cl:tech_button_bk.png",
TileImageFG = ":cl:tech_button_bright_small_fg.png",
TileImageFG = ":cl:tech_button_bright_small_fg2.png",
tiles = {20, 20, 20, 20}, --// tile widths: left,top,right,bottom
padding = {10, 10, 10, 10},

Expand Down Expand Up @@ -323,13 +331,14 @@ skin.overlay_panel = {
skin.progressbar = {
TileImageFG = ":cl:tech_progressbar_full.png",
TileImageBK = ":cl:tech_progressbar_empty.png",
tiles = {10, 10, 10, 10},
tiles = {10, 1, 10, 1}, --// tile widths: left,top,right,bottom

font = {
shadow = true,
},

backgroundColor = {0,0,0,0.5},
color = {0.15, 0.46, 0.72, 1},

DrawControl = DrawProgressbar,
}
Expand Down Expand Up @@ -438,7 +447,7 @@ skin.window = {
}

skin.main_window = {
TileImage = ":c:tech_mainwindow_darker.png",
TileImage = ":c:tech_mainwindow_darker2.png",
tiles = {176, 64, 176, 64}, --// tile widths: left,top,right,bottom
padding = {13, 13, 13, 13},
hitpadding = {4, 4, 4, 4},
Expand All @@ -462,7 +471,7 @@ skin.main_window = {
}

skin.main_window_large = {
TileImage = ":c:tech_mainwindow_darker.png",
TileImage = ":c:tech_mainwindow_darker2.png",
tiles = {176, 64, 176, 64}, --// tile widths: left,top,right,bottom
padding = {5, 4, 5, 2},
hitpadding = {4, 4, 4, 4},
Expand Down Expand Up @@ -563,7 +572,7 @@ skin.line = {
tiles = {0, 0, 0, 0},
TileImageV = ":cl:tech_line_vert.png",
tilesV = {0, 0, 0, 0},
borderColor = {50/255, 125/255, 141/255, 1},
borderColor = {162/255, 162/255, 162/255, 1},
DrawControl = DrawLine,
}

Expand Down
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_button_bk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_button_bright_fg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_button_small_square_bk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_line_vert.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_progressbar_full.png
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar.png
Binary file modified LuaMenu/widgets/chili/skins/Evolved/tech_scrollbar_knob.png
Binary file modified LuaMenu/widgets/chili/skins/Evolved/trackbar.png
Binary file modified LuaMenu/widgets/chili/skins/Evolved/trackbar_step.png
Binary file modified LuaMenu/widgets/chili/skins/Evolved/trackbar_thumb.png
12 changes: 6 additions & 6 deletions LuaMenu/widgets/chobby/components/battle/battle_list_window.lua
Original file line number Diff line number Diff line change
Expand Up @@ -706,17 +706,17 @@ function BattleListWindow:UpdateButtonColor(battleID)
if battle == nil then return end

local oldbuttonstyle = items.battleButton.backgroundColor
local battlebuttonstyle = {0.10, 0.10, 0.95, 0.65} --blue
local battlebuttonstyle = {0.10, 0.30, 0.65, 0.60} --blue
if battle.passworded then
battlebuttonstyle = {0.60, 0.10, 0.85, 0.65} --violet
battlebuttonstyle = {0.35, 0.10, 0.50, 0.60} --violet
elseif battle.isMatchMaker then
battlebuttonstyle = {0.90, 0.10, 0.10, 0.65} --red
battlebuttonstyle = {0.65, 0.10, 0.20, 0.60} --red
elseif lobby:GetBattlePlayerCount(battleID) < 1 then
battlebuttonstyle = {0.10, 0.10, 0.95, 0.65} --blue
battlebuttonstyle = {0.10, 0.30, 0.65, 0.60} --blue
elseif battle.isRunning then
battlebuttonstyle = {0.70, 0.60, 0.1, 0.65} --yellow
battlebuttonstyle = {0.60, 0.45, 0.2, 0.60} --yellow
else
battlebuttonstyle = {0.10, 0.50, 0.10, 0.65} --green
battlebuttonstyle = {0.15, 0.50, 0.25, 0.60} --green
end
local colorChanged = false
for i, c in ipairs(oldbuttonstyle) do
Expand Down
26 changes: 14 additions & 12 deletions LuaMenu/widgets/chobby/components/configuration.lua
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function Configuration:init()
self.normalColor = "\255\255\255\255"
self.successColor = "\255\0\255\0"
self.partialColor = "\255\190\210\50"
self.selectedColor = "\255\99\184\255"
self.selectedColor = "\255\255\255\255"
self.highlightedColor = "\255\125\255\0"
self.meColor = "\255\0\190\190"

Expand All @@ -102,7 +102,7 @@ function Configuration:init()
self.userNameColor = {1, 1, 1, 1}

self.buttonFocusColor = {0.54,0.72,1,0.3}
self.buttonSelectedColor = {0.54,0.72,1,0.95}--{1.0, 1.0, 1.0, 1.0}
self.buttonSelectedColor = {0.30, 0.55, 0.85, 0.9}--{1.0, 1.0, 1.0, 1.0}

self.loadLocalWidgets = false
self.displayBots = false
Expand Down Expand Up @@ -263,12 +263,12 @@ function Configuration:init()

self.fontName = "LuaMenu/widgets/chili/skins/Evolved/fonts/n019003l.pfb"
self.fontRaw = {
[0] = {size = 10, shadow = false},
[1] = {size = 14, shadow = false},
[2] = {size = 18, shadow = false},
[3] = {size = 22, shadow = false},
[4] = {size = 32, shadow = false},
[5] = {size = 48, shadow = false},
[0] = {size = 10, shadow = true},
[1] = {size = 14, shadow = true},
[2] = {size = 18, shadow = true},
[3] = {size = 22, shadow = true},
[4] = {size = 32, shadow = true},
[5] = {size = 48, shadow = true},
}

self.fontSpecial = {}
Expand All @@ -280,7 +280,7 @@ function Configuration:init()
color = {1,1,1,1},
outlineColor = {0.05,0.05,0.05,0.9},
outline = false,
shadow = false,
shadow = true,
}
end

Expand Down Expand Up @@ -783,9 +783,11 @@ end
function Configuration:GetButtonFont(sizeScale, specialName, specialData, rawSize)
specialName = (specialName or "") .. "_button_" .. sizeScale
specialData = specialData or {}
specialData.outline = true
specialData.outlineWidth = 3
specialData.outlineHeight = 3
-- specialData.outline = true
specialData.outline = false
-- specialData.outlineWidth = 3
-- specialData.outlineHeight = 3
specialData.shadow = true
return self:GetFont(sizeScale, specialName, specialData, rawSize)
end

Expand Down
5 changes: 4 additions & 1 deletion LuaMenu/widgets/chobby/components/interface_root.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
local statusButtonWidth = 290
local statusButtonWidthSmall = 290

local topBarHeight = 86
local topBarHeight = 75

-- Switch to single panel mode when below the minimum screen width
local minScreenWidth = 1360
Expand Down Expand Up @@ -887,6 +887,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
right = 3,
width = 108,
height = 38,
classname = "option_button",
name = "switchToMenuButton",
caption = "Menu",
objectOverrideFont = WG.Chobby.Configuration:GetFont(3),
Expand All @@ -906,6 +907,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
right = "30%",
y = 3,
bottom = 11,
classname = "option_button",
name = "switchToGameButton",
caption = "Return to Battle",
objectOverrideFont = WG.Chobby.Configuration:GetFont(4),
Expand All @@ -925,6 +927,7 @@ function GetInterfaceRoot(optionsParent, mainWindowParent, fontFunction)
right = "50.12%",
y = 3,
bottom = 11,
classname = "negative_button",
name = "leaveGameButton",
caption = "Leave Battle",
objectOverrideFont = WG.Chobby.Configuration:GetFont(4),
Expand Down
Binary file modified LuaMenu/widgets/chobby/images/left.png
Binary file removed LuaMenu/widgets/chobby/images/left.psd
Diff not rendered.
Binary file modified LuaMenu/widgets/chobby/images/lock.png
12 changes: 2 additions & 10 deletions LuaMenu/widgets/chobby/utilities/buttons.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,7 @@ function ButtonUtilities.SetButtonSelected(button)

button:SetCaption(Configuration:GetSelectedColor() .. button.oldCaption .. "\b")
button.font = Configuration:GetFont(button.oldFont.size, "button_highlight", {
outlineWidth = 6,
outlineHeight = 6,
outline = true,
outlineColor = {0,0,0,0.8},
autoOutlineColor = false,
color = {1,1,1,1},
}, true)

if COLOR_CLASS[button.classname] then
Expand Down Expand Up @@ -58,11 +54,7 @@ function ButtonUtilities.SetButtonHighlighted(button)

button:SetCaption(Configuration:GetHighlightedColor() .. button.oldCaption .. "\b")
button.font = Configuration:GetFont(button.oldFont.size, "button_highlight", {
outlineWidth = 6,
outlineHeight = 6,
outline = true,
outlineColor = {0,0,0,0.8},
autoOutlineColor = false,
color = {1,1,1,1},
}, true)

--button.backgroundColor = Configuration:GetButtonSelectedColor()
Expand Down
2 changes: 2 additions & 0 deletions LuaMenu/widgets/gui_settings_window.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1020,6 +1020,7 @@ local function GetLobbyTabControls()
y = offset,
width = COMBO_WIDTH,
height = 30,
classname = "negative_button",
caption = "Apply",
tooltip = "Clears chat history displayed in the lobby, does not affect the chat history files saved to your computer.",
objectOverrideFont = Configuration:GetFont(2),
Expand Down Expand Up @@ -1047,6 +1048,7 @@ local function GetLobbyTabControls()
y = offset,
width = COMBO_WIDTH,
height = 30,
classname = "negative_button",
caption = "Apply",
tooltip = "Deletes path cache. May solve desync.",
objectOverrideFont = Configuration:GetFont(2),
Expand Down

0 comments on commit 36c0373

Please sign in to comment.