diff --git a/Applications.cfg b/Applications.cfg index 4f77cd1f..74e71fae 100644 --- a/Applications.cfg +++ b/Applications.cfg @@ -4,7 +4,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/OS.lua", type="Script", forceDownload=true, - version=4.10, + version=4.11, }, { path="/MineOS/Pictures/MoonTouch.pic", @@ -227,7 +227,7 @@ url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua", type="Library", preloadFile=true, - version=2.01, + version=2.02, }, { path="/lib/MineOSNetwork.lua", diff --git a/OS.lua b/OS.lua index 0eba2cb0..675b3bf4 100755 --- a/OS.lua +++ b/OS.lua @@ -251,9 +251,13 @@ local function changeWallpaper() MineOSInterface.mainContainer.background.wallpaperPosition.y = math.floor(1 + MineOSInterface.mainContainer.height / 2 - image.getHeight(MineOSInterface.mainContainer.background.wallpaper) / 2) end + local r, g, b for i = 3, #MineOSInterface.mainContainer.background.wallpaper, 4 do - MineOSInterface.mainContainer.background.wallpaper[i] = color.blend(MineOSInterface.mainContainer.background.wallpaper[i], 0x0, MineOSCore.properties.wallpaperBrightness) - MineOSInterface.mainContainer.background.wallpaper[i + 1] = color.blend(MineOSInterface.mainContainer.background.wallpaper[i + 1], 0x0, MineOSCore.properties.wallpaperBrightness) + r, g, b = color.HEXToRGB(MineOSInterface.mainContainer.background.wallpaper[i]) + MineOSInterface.mainContainer.background.wallpaper[i] = color.RGBToHEX(math.floor(r * MineOSCore.properties.wallpaperBrightness), math.floor(g * MineOSCore.properties.wallpaperBrightness), math.floor(b * MineOSCore.properties.wallpaperBrightness)) + + r, g, b = color.HEXToRGB(MineOSInterface.mainContainer.background.wallpaper[i + 1]) + MineOSInterface.mainContainer.background.wallpaper[i + 1] = color.RGBToHEX(math.floor(r * MineOSCore.properties.wallpaperBrightness), math.floor(g * MineOSCore.properties.wallpaperBrightness), math.floor(b * MineOSCore.properties.wallpaperBrightness)) end end end diff --git a/Wallpapers/Tatu.pic b/Wallpapers/Tatu.pic new file mode 100644 index 00000000..c016ae8d Binary files /dev/null and b/Wallpapers/Tatu.pic differ diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index f6c7b89c..4f9c79e8 100755 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -77,9 +77,9 @@ function MineOSCore.loadPropeties() iconWidth = 12, iconHeight = 6, showExtension = false, - wallpaper = MineOSPaths.pictures .. "Girl.pic", + wallpaper = MineOSPaths.pictures .. "Tatu.pic", wallpaperMode = 2, - wallpaperBrightness = 0.6, + wallpaperBrightness = 1.0, screensaver = "Matrix", screensaverDelay = 20, timezone = 3,