From 98d1797af43bac12e25875a1fabee7a873e46503 Mon Sep 17 00:00:00 2001 From: Black Ram <67595890+BlackRam-oss@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:53:49 +0200 Subject: [PATCH] Ren'Py Layered Image Masks --- game/images.rpy | 64 +++++++++++++++++--- game/nqtr_screens/screens_nqtr_component.rpy | 25 ++++---- game/screens_style | 2 +- 3 files changed, 70 insertions(+), 21 deletions(-) diff --git a/game/images.rpy b/game/images.rpy index 8398061..0282876 100644 --- a/game/images.rpy +++ b/game/images.rpy @@ -1,12 +1,60 @@ # rooms -image icon myroom = "location/myroom-icon.webp" -image icon aliceroom = "location/aliceroom-icon.webp" -image icon annroom = "location/annroom-icon.webp" -image icon bathroom = "location/bathroom-icon.webp" -image icon lounge = "location/lounge-icon.webp" -image icon terrace = "location/terrace-icon.webp" -image icon courtyard = "location/courtyard-icon.webp" -image icon gym = "location/gym-icon.webp" +image pre icon myroom = Transform("location/myroom-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon myroom = LayeredImageMask("pre icon myroom", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon aliceroom = Transform("location/aliceroom-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon aliceroom = LayeredImageMask("pre icon aliceroom", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon annroom = Transform("location/annroom-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon annroom = LayeredImageMask("pre icon annroom", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon bathroom = Transform("location/bathroom.webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon bathroom = LayeredImageMask("pre icon bathroom", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon lounge = Transform("location/lounge-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon lounge = LayeredImageMask("pre icon lounge", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon terrace = Transform("location/terrace-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon terrace = LayeredImageMask("pre icon terrace", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon courtyard = Transform("location/courtyard-[tm.timeslot_number].webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon courtyard = LayeredImageMask("pre icon courtyard", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) +image pre icon gym = Transform("location/gym.webp", xysize=(gui.sprite_size_x, gui.sprite_size)) +image icon gym = LayeredImageMask("pre icon gym", + Transform(crop=(gui.sprite_size_padding_x, 0, gui.sprite_size_x, gui.sprite_size_x)), + mask="sprite mask", + foreground="sprite foreground", + background="sprite background" +) # locations image icon map home = "/nqtr_interface/map-home.webp" diff --git a/game/nqtr_screens/screens_nqtr_component.rpy b/game/nqtr_screens/screens_nqtr_component.rpy index 830b566..ffdbc09 100644 --- a/game/nqtr_screens/screens_nqtr_component.rpy +++ b/game/nqtr_screens/screens_nqtr_component.rpy @@ -161,7 +161,7 @@ screen room_button(room, cur_room, i, find_ch = False): # Room icon imagebutton: - align (0.5, 0.0) + align (0, - 0.15) if room.is_button: idle room.button_icon selected_idle room.button_icon_selected @@ -176,23 +176,24 @@ screen room_button(room, cur_room, i, find_ch = False): ] at nqtr_button_room_transform + # Character icon if find_ch: hbox: - xalign 0.5 - yalign 0.99 - + align (0.5, 0.6) for comm in commitments_in_cur_location.values(): # If it is the selected room if room.id == comm.room_id: use character_icon_screen(comm.character_icon) - # Room name - text room.name: - size gui.dr_little_text_size - drop_shadow [(2, 2)] - xalign 0.5 - text_align 0.5 - line_leading 0 - line_spacing -2 + + # Room name + text room.name: + align (0.5, 0.99) + size gui.dr_little_text_size + drop_shadow [(2, 2)] + text_align 0.5 + line_leading 0 + line_spacing -2 + key str(i) action [ SetVariable('prev_room', cur_room), SetVariable('cur_room', room), diff --git a/game/screens_style b/game/screens_style index 451ddac..5091544 160000 --- a/game/screens_style +++ b/game/screens_style @@ -1 +1 @@ -Subproject commit 451ddac9ea8d85c87a000eb12c09105172e91829 +Subproject commit 509154416e552e2253a67a922fd0fcf5cb00681c