Skip to content

Commit

Permalink
Remove old chicken defs
Browse files Browse the repository at this point in the history 
Rebalance ground forces of Zaal
Add new default fonts
  • Loading branch information
@ForbodingAngel
ForbodingAngel committed Sep 9, 2019
1 parent 0632e1f commit 7f30164
Show file tree
Hide file tree
Showing 98 changed files with 234 additions and 7,299 deletions.
30 changes: 29 additions & 1 deletion Gamedata/configs/damageTypes.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,35 @@ local damageClasses = {
BUILDING = 0,
},
-- End Buildings


-- Start Zaal
zlightswarm = {
ARMORED = 0.5,
LIGHT = 1,
BUILDING = 0.5,
},
zmedswarm = {
ARMORED = 1,
LIGHT = 0.5,
BUILDING = 0.5,
},
zskirmisher = {
ARMORED = 1,
LIGHT = 1,
BUILDING = 1,
},
zpyro = {
ARMORED = 0,
LIGHT = 0,
BUILDING = 1,
},
zarty = {
ARMORED = 0,
LIGHT = 0,
BUILDING = 1,
},
-- End Zaal

-- Start Miscellaneous
queenbeam = {
ARMORED = 0.1,
Expand Down
2 changes: 1 addition & 1 deletion LuaIntro/Addons/main.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -393,4 +393,4 @@ end

function addon.Shutdown()
gl.DeleteFont(font)
end
end
Binary file added LuaUI/Fonts/JosefinSans-Bold.ttf
View file
Binary file not shown.
Binary file added LuaUI/Fonts/JosefinSans-Regular.ttf
View file
Binary file not shown.
Binary file added LuaUI/Fonts/JosefinSans-SemiBold.ttf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/camera_player_tv.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function widget:GetInfo()
}
end

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 32
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/chili/skins/Evolved/skin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ local skin = {
}
}

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")

--//=============================================================================
--//
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/chili/skins/Lima/skin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ local skin = {
}
}

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")

--//=============================================================================
--//
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/chili/skins/default/skin.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ local skin = {
}
}

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")

--//=============================================================================
--// Render Helpers
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gfx_move_window_position.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function widget:GetInfo()
}
end

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 50
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gfx_snow.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/gui_advplayerslist.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ local lockcameraHideEnemies = true -- specfullview
local lockcameraLos = true -- togglelos
local collapsable = false

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.35
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local fontfileScale2 = fontfileScale * 1.25
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale2, fontfileOutlineSize*fontfileScale2, fontfileOutlineStrength)

Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_advplayerslist_displayinfo.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_allySelectedUnits.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function widget:GetInfo()
}
end

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_ally_cursors.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ end

-- configs

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_build_eta.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_com_nametags.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ local scaleFontAmount = 120
local fontShadow = true -- only shows if font has a white outline
local shadowOpacity = 0.35

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 50
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/gui_commands_info.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ end

local loadedFontSize = 32

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.4
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfileScale2 = fontfileScale * 1.2
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale2, fontfileOutlineSize*fontfileScale2, fontfileOutlineStrength)

local bgcorner = "LuaUI/Images/bgcorner.png"
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_damage_cursortip.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ local drawString = false
local attackText = ""
local defendText = ""

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_discord.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local discordLink = 'discord.me/evolutionrts'
local iconTexture = ":n:LuaUI/Images/discord.png"
local iconSize = 32

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_display_dps.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_evo_tooltip.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ end

local ui_opacity = tonumber(Spring.GetConfigFloat("ui_opacity",0.66) or 0.66)

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_faction_change.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ end
local wWidth, wHeight = Spring.GetWindowGeometry()
local px, py = 50, 0.55*wHeight

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/gui_gameinfo.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ function widget:GetInfo()
}
end

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.4
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local loadedFontSize = fontfileSize*fontfileScale

Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_idle_builders.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/gui_keybind_info.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ return {
}
end

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.4
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)

local bgcorner = "LuaUI/Images/bgcorner.png"
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_mapinfo.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ local fadeStartHeight = 800
local fadeEndHeight = 4800
local dlistAmount = 20 -- amount of dlists created, one for each opacity value

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_mapmarks_fx.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ end
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_musicPlayer_Dynamic_Advanced.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ end
local pauseWhenPaused = false


local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 36
Expand Down
8 changes: 4 additions & 4 deletions LuaUI/Widgets_Evo/gui_options.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ local selecthoverclick = 'LuaUI/Sounds/hover.wav'
local toggleonclick = 'LuaUI/Sounds/switchon.wav'
local toggleoffclick = 'LuaUI/Sounds/switchoff.wav'

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.4
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfileScale2 = fontfileScale * 1.2
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale2, fontfileOutlineSize*fontfileScale2, fontfileOutlineStrength)

local bgcorner = "LuaUI/Images/bgcorner.png"
Expand Down Expand Up @@ -2475,12 +2475,12 @@ function init()

options[getOptionByID('font')].options = fonts
options[getOptionByID('font')].optionsFont = fontsFull
local fname = Spring.GetConfigString("ui_font", "ComicSans.ttf"):lower()
local fname = Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf"):lower()
options[getOptionByID('font')].value = getSelectKey(getOptionByID('font'), string.sub(fname, 1, string.len(fname) - 4))

options[getOptionByID('font2')].options = fonts
options[getOptionByID('font2')].optionsFont = fontsFull
local fname = Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf"):lower()
local fname = Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf"):lower()
options[getOptionByID('font2')].value = getSelectKey(getOptionByID('font2'), string.sub(fname, 1, string.len(fname) - 4))
end

Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_replaybuttons.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ end

local bgcorner = "LuaUI/Images/bgcorner.png"

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
4 changes: 2 additions & 2 deletions LuaUI/Widgets_Evo/gui_resourceBar.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ end

local ui_opacity = tonumber(Spring.GetConfigFloat("ui_opacity",0.66) or 0.66)

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
local fontfileOutlineSize = 6
local fontfileOutlineStrength = 1.33
local font = gl.LoadFont(fontfile, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "ComicSans-Bold.ttf")
local fontfile2 = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font2", "JosefinSans-Bold.ttf")
local font2 = gl.LoadFont(fontfile2, fontfileSize*fontfileScale, fontfileOutlineSize*fontfileScale, fontfileOutlineStrength)


Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_selected_units_buttons.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ end

-- Automatically generated local definitions

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_selfd_icons.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ local unitConf = {}
--------------------------------------------------------------------------------
--------------------------------------------------------------------------------

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 45
Expand Down
2 changes: 1 addition & 1 deletion LuaUI/Widgets_Evo/gui_tooltip.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ local usedFontSize = 15
local xOffset = 35
local yOffset = -35-usedFontSize

local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "ComicSans.ttf")
local fontfile = LUAUI_DIRNAME .. "fonts/" .. Spring.GetConfigString("ui_font", "JosefinSans-SemiBold.ttf")
local vsx,vsy = Spring.GetViewGeometry()
local fontfileScale = (0.5 + (vsx*vsy / 5700000))
local fontfileSize = 25
Expand Down
Loading

0 comments on commit 7f30164

Please sign in to comment.