diff --git a/Aardwolf_Clock V2/Aardwolf_Clock.xml b/Aardwolf_Clock V2/Aardwolf_Clock.xml index ae6fd4b..60ef468 100644 --- a/Aardwolf_Clock V2/Aardwolf_Clock.xml +++ b/Aardwolf_Clock V2/Aardwolf_Clock.xml @@ -6,7 +6,7 @@ - + @@ -45,7 +45,7 @@ clock_seasons = { Sun = {138, 3, 19, 1, "Light"}, - Scourge = {168, 9, 18, 2, "Disease"}, + Scourge = {162, 9, 18, 2, "Disease"}, River = {138, 7, 18, 3, "Water"}, Song = {150, 6, 19, 4, "Sonic"}, Energy = {148, 6, 20, 5, "Energy"}, @@ -195,7 +195,7 @@ local tcx = (startx + endx)/2 -- + startx local tcy = (starty + endy)/2 -- + starty local left, top, right, bottom = tcx - r, tcy - r, tcx + r, tcy + r - + return {l = left, t = top, r = right, b = bottom} end @@ -211,7 +211,7 @@ local suns = ((tonumber(clock_seasons[clock_current.Season][3]) - 12) or 12) .. "pm" WindowText(win, font, sunr, x, font_height*1.5, 0, 0, ColourNameToRGB(textColour)) - + local cdiml, cdimt = font_width, font_height*2.5 local cdimr, cdimb = cdiml + font_width*2, cdimt + (font_width*2) @@ -221,13 +221,13 @@ cdimr = cdiml + font_width*2 WindowText(win, font, suns, ((WindowInfo(win, 3) -5) - font_width*4), font_height*1.5, 0, 0, ColourNameToRGB(textColour)) - + WindowCircleOp(win, 1, cdiml, cdimt, cdimr, cdimb, ColourNameToRGB("orangered"), 2, 1, ColourNameToRGB("orangered"), 0) - + sqdim = circleDraw(cx, cy, 68) WindowCircleOp(win, 1, sqdim.l, sqdim.t, sqdim.r, sqdim.b, ColourNameToRGB(handColour), 0, 1, 0, 1) - + sqdim = circleDraw(cx, cy, 70) WindowCircleOp(win, 1, sqdim.l, sqdim.t, sqdim.r, sqdim.b, ColourNameToRGB(handColour), 0, 1, 0, 1) @@ -238,7 +238,7 @@ sqdim = circleDraw(cx, cy, 72) - WindowCircleOp(win, 1, sqdim.l, sqdim.t, sqdim.r, sqdim.b, ColourNameToRGB(handColour), 0, 1, 0, 1) + WindowCircleOp(win, 1, sqdim.l, sqdim.t, sqdim.r, sqdim.b, ColourNameToRGB(handColour), 0, 1, 0, 1) for _,v in ipairs(clock_numbers) do WindowText(win, font, v.text, v.pos.posx, v.pos.posy, 0, 0, ColourNameToRGB(textColour)) @@ -427,11 +427,11 @@ for i = 1,12 do table.insert(clock_numbers, {text = i, pos = findPos(i)}) end - + local endy = clock_numbers[6].pos.posy local starty = clock_numbers[12].pos.posy local window_height = font_height + 5 + endy + starty + (font_height * (#footer_text + 2)) -- font_height * 10 - + WindowCreate(win, windowinfo.window_left, windowinfo.window_top, window_width, window_height, windowinfo.window_mode, windowinfo.window_flags + miniwin.create_keep_hotspots, ColourNameToRGB("black")) movewindow.add_drag_handler (win, 0, 0, 0, window_height) end