From f267528d4f707ba00e70dd1abbdc953a294ade15 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 17 Apr 2024 19:23:53 +0100 Subject: [PATCH] Wheelmenu placeholders --- .../interface/wheelmenu/wheelmenu_button.png | 3 +++ game/scripts/interface/wheelmenu.rpy | 4 ++-- game/scripts/rooms/main_room/init.rpy | 14 +++++++------- 3 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 game/images/interface/wheelmenu/wheelmenu_button.png diff --git a/game/images/interface/wheelmenu/wheelmenu_button.png b/game/images/interface/wheelmenu/wheelmenu_button.png new file mode 100644 index 00000000..484e4085 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_button.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8ef42045b39479a327a4187dbecaad137a1d70c1eb012cb06f738f8c32644fc +size 55086 diff --git a/game/scripts/interface/wheelmenu.rpy b/game/scripts/interface/wheelmenu.rpy index 207d6fae..7e5df132 100644 --- a/game/scripts/interface/wheelmenu.rpy +++ b/game/scripts/interface/wheelmenu.rpy @@ -76,8 +76,8 @@ style wheelmenu_window is empty: anchor (0.5, 0.5) style wheelmenu_button is empty: - background "#ffffffc0" - hover_background "#ffffffff" + background Transform("wheelmenu_button", xysize=(48,48)) + hover_background At(Transform("wheelmenu_button", xysize=(48,48)), pulse_hover) xysize (48, 48) anchor (0.5, 0.5) diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy index afe034f7..9fddf1be 100644 --- a/game/scripts/rooms/main_room/init.rpy +++ b/game/scripts/rooms/main_room/init.rpy @@ -10,8 +10,8 @@ default phoenix_OBJ = RoomObject( focus_mask="phoenix_idle", background="phoenix_feather", action={ - "Feed": (Text("Feed"), Jump("phoenix_feed"), "True"), - "Pet": (Text("Pet"), Jump("phoenix_pet"), "True") + "Feed": (Text("🍔", align=(0.5, 0.5)), Jump("phoenix_feed"), "True"), + "Pet": (Text("🖐️", align=(0.5, 0.5)), Jump("phoenix_pet"), "True") }, tooltip="Phoenix" ) @@ -25,11 +25,11 @@ default desk_OBJ = RoomObject( hover="ch_gen sit_behind_desk_hover", focus_mask="ch_gen sit_behind_desk", action={ - "Sleep": (Text("Slee"), If(game.daytime, Return("night_start"), Return("day_start")), "True"), - "Jerk Off": (Text("Jerk"), Jump("jerk_off"), "True"), - "Do Paperwork": (Text("Work"), Jump("paperwork"), "True"), - "Open Inventory": (Text("Inve"), Jump("inventory"), "True"), - "Open Deck Builder": (Text("Deck"), Jump("deck_builder"), "states.cardgame.unlocked"), + "Sleep": (Text("💤", align=(0.5, 0.5)), If(game.daytime, Return("night_start"), Return("day_start")), "True"), + "Jerk Off": (Text("🍆", align=(0.5, 0.5)), Jump("jerk_off"), "True"), + "Do Paperwork": (Text("📝", align=(0.5, 0.5)), Jump("paperwork"), "True"), + "Open Inventory": (Text("🎒", align=(0.5, 0.5)), Jump("inventory"), "True"), + "Open Deck Builder": (Text("🃏", align=(0.5, 0.5)), Jump("deck_builder"), "states.cardgame.unlocked"), }, hovered=Show( "gui_tooltip",