diff --git a/assets/config.json b/assets/config.json index 901a86f..2b791e1 100644 --- a/assets/config.json +++ b/assets/config.json @@ -18,8 +18,8 @@ }, "work_computer": {"path": "assets/work_computer-1024.png", - "frame_width": 1024, - "frame_height": 1024 + "frame_width": 1280, + "frame_height": 720 }, "clicker_treat_bone": {"path": "assets/clicker_treat_bone.png", diff --git a/assets/work_computer-1024.png b/assets/work_computer-1024.png index 295b8ee..749d9ae 100644 Binary files a/assets/work_computer-1024.png and b/assets/work_computer-1024.png differ diff --git a/main.cpp b/main.cpp index 0b3c7e5..a94ab15 100644 --- a/main.cpp +++ b/main.cpp @@ -77,7 +77,7 @@ struct ClickerUI { "[FoodBowl|_|*%(300,400)clicker|_|_|_]" "[WaterBowl|_|_ |_|_|_]" "[Mood|_|_ |_|_|_]" - "[_|_|_ |_|_|_]" + "[Money|_|_ |_|_|_]" "[Treat|Food|Water|Pet|Work]"); } @@ -160,13 +160,15 @@ struct WorkComputerUI { WorkComputerUI() { $gui.position(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); - $gui.layout("[_|*%(300)computer|_|_|_]"); + $gui.layout("[computer]"); } void init() { + $gui.set($gui.MAIN, {$gui.$parser}); + auto computer = $gui.entity("computer"); - $gui.set(computer, {"work_computer"}); $gui.set(computer, {L"Work Computer"}); + $gui.set(computer, {"work_computer"}); $gui.set(computer, { [&](auto, auto) { GO_TO_WORK = false; fmt::println("Leaving Work!");