chore: re-added have_a_coffee discussion, fixed text readability, fixed centering of texts, new system.ui functions for drawing in contour, fixed ddr types, fixed meter drawing
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
This commit is contained in:
@@ -36,13 +36,13 @@ Screen.register({
|
||||
|
||||
Sprite.draw_at("norman", norman_x, norman_y)
|
||||
|
||||
Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
|
||||
Print.text_center_contour("day " .. Context.day_count, cx, 10, Config.colors.black)
|
||||
|
||||
local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
|
||||
local narrative = "reflecting on my past and present...\nboth eventually flushed..."
|
||||
local wrapped = UI.word_wrap(narrative, 38)
|
||||
local text_y = 24
|
||||
for _, line in ipairs(wrapped) do
|
||||
Print.text_center(line, cx, text_y, Config.colors.light_grey)
|
||||
Print.text_center_contour(line, cx, text_y, Config.colors.black)
|
||||
text_y = text_y + 8
|
||||
end
|
||||
|
||||
@@ -56,26 +56,26 @@ Screen.register({
|
||||
local meter_start_y = text_y + 10
|
||||
|
||||
local meter_list = {
|
||||
{ key = "wpm", label = "Work Productivity Meter" },
|
||||
{ key = "ism", label = "Impostor Syndrome Meter" },
|
||||
{ key = "bm", label = "Burnout Meter" },
|
||||
{ key = "wpm", label = "Work Productivity Meter", color = Meter.COLOR_WPM },
|
||||
{ key = "ism", label = "Impostor Syndrome Meter", color = Meter.COLOR_ISM },
|
||||
{ key = "bm", label = "Burnout Meter", color = Meter.COLOR_BM },
|
||||
}
|
||||
|
||||
for i, meter in ipairs(meter_list) do
|
||||
local y = meter_start_y + (i - 1) * 20
|
||||
|
||||
Print.text_center(meter.label, cx, y, Config.colors.white)
|
||||
Print.text_center_contour(meter.label, cx, y, meter.color, false, 1, Config.colors.white)
|
||||
|
||||
local bar_y = y + 8
|
||||
local fill_w = math.max(0, math.floor((m[meter.key] / max_val) * bar_w))
|
||||
rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
|
||||
if fill_w > 0 then
|
||||
rect(bar_x, bar_y, fill_w, bar_h, Config.colors.blue)
|
||||
rect(bar_x, bar_y, fill_w, bar_h, meter.color)
|
||||
end
|
||||
|
||||
local decay_w = print(decay_text, 0, -6, 0, false, 1)
|
||||
Print.text(decay_text, bar_x - decay_w - 4, bar_y, Config.colors.light_blue)
|
||||
Print.text(mult_text, bar_x + bar_w + 4, bar_y, Config.colors.light_blue)
|
||||
Print.text_contour(decay_text, bar_x - decay_w - 4, bar_y, Config.colors.light_blue, false, 1, Config.colors.white)
|
||||
Print.text_contour(mult_text, bar_x + bar_w + 4, bar_y, Config.colors.light_blue, false, 1, Config.colors.white)
|
||||
end
|
||||
|
||||
if Ascension.get_level() > 0 then
|
||||
|
||||
Reference in New Issue
Block a user