From 9a50a836db55fab16c356e02ad15edc919b89444 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 7 Aug 2024 19:25:09 +0100 Subject: [PATCH] Update credits and bug fix --- game/gui/creamy_pumpkin_pie/studio_logo.png | 3 +++ game/gui/creamy_pumpkin_pie/website_logo.png | 4 ++-- game/scripts/gui/credits.rpy | 2 ++ game/scripts/interface/inventory.rpy | 23 ++++++++++---------- 4 files changed, 19 insertions(+), 13 deletions(-) create mode 100644 game/gui/creamy_pumpkin_pie/studio_logo.png diff --git a/game/gui/creamy_pumpkin_pie/studio_logo.png b/game/gui/creamy_pumpkin_pie/studio_logo.png new file mode 100644 index 00000000..19b69936 --- /dev/null +++ b/game/gui/creamy_pumpkin_pie/studio_logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec23f5788a05a848aa2141cb0089e922942fd1a2b530771d32c2438443bc0ba0 +size 650052 diff --git a/game/gui/creamy_pumpkin_pie/website_logo.png b/game/gui/creamy_pumpkin_pie/website_logo.png index d691ef20..95dd0402 100644 --- a/game/gui/creamy_pumpkin_pie/website_logo.png +++ b/game/gui/creamy_pumpkin_pie/website_logo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd05ffac9e0b0b1782512b6813b915a99d56cc81760c999f030d277edbbcdaae -size 234670 +oid sha256:736137a6955cd11fc9336aff30055996b4ec9c4c1aa48821307c6fe23cfa7b97 +size 307692 diff --git a/game/scripts/gui/credits.rpy b/game/scripts/gui/credits.rpy index ca1018ef..ca2e835a 100644 --- a/game/scripts/gui/credits.rpy +++ b/game/scripts/gui/credits.rpy @@ -23,6 +23,7 @@ init python in credits: return "\n".join(output_lines) image game_logo = Image("gui/creamy_pumpkin_pie/game_logo.png", oversample=8) +image studio_logo = Image("gui/creamy_pumpkin_pie/studio_logo.png", oversample=4) image engine_logo = Image("gui/creamy_pumpkin_pie/engine_logo.png", oversample=2) define credits_images = [] # TODO: Add images once new chibis are in. @@ -229,6 +230,7 @@ define credits = credits.convert(_(f"""{{image=game_logo}}{{vspace=10}} ### Ren'Py Engine v[renpy.version_only] - [renpy.license!t] {{vspace=400}} +{{image=studio_logo}} # Thank you for playing!{{vspace=400}} """)) diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy index 75ae5ef5..86f974a1 100644 --- a/game/scripts/interface/inventory.rpy +++ b/game/scripts/interface/inventory.rpy @@ -70,19 +70,20 @@ screen inventory(): ypos 32 xalign 0.5 for item in menu_items: - button: - xysize (48, 48) - if selected_item == item: - add "interface/achievements/glow.webp" align (0.5, 0.5) xysize (48, 48) alpha 0.7 at rotate_circular - add crop_image_zoom(item.get_image(), 48, 48, (item.owned <= 0 or (inventory_mode==1 and (not item.givable or not states.active_girl in item.usable_on)))) align (0.5, 0.5) + if item.owned > 0 or config.developer: + button: + xysize (48, 48) + if selected_item == item: + add "interface/achievements/glow.webp" align (0.5, 0.5) xysize (48, 48) alpha 0.7 at rotate_circular + add crop_image_zoom(item.get_image(), 48, 48, (item.owned <= 0 or (inventory_mode==1 and (not item.givable or not states.active_girl in item.usable_on)))) align (0.5, 0.5) - if item.used or (item.type=="decoration" and item.in_use): - add "interface/topbar/icon_check.webp" xysize (16, 16) offset (8, -8) - if item.owned > 1: - text "x[item.owned]" offset (-8, 34) size 12 + if item.used or (item.type=="decoration" and item.in_use): + add "interface/topbar/icon_check.webp" xysize (16, 16) offset (8, -8) + if item.owned > 1: + text "x[item.owned]" offset (-8, 34) size 12 - if (inventory_mode==0 or (inventory_mode==1 and (item.givable and states.active_girl in item.usable_on))): - action [SetScreenVariable("selected_item", item)] + if (inventory_mode==0 or (inventory_mode==1 and (item.givable and states.active_girl in item.usable_on))): + action [SetScreenVariable("selected_item", item)] if selected_item: vbox: