From 6bb893a7b8e3b314596b5f705da877ed5b934b35 Mon Sep 17 00:00:00 2001 From: GManon Date: Wed, 16 Nov 2022 22:37:49 -0300 Subject: [PATCH 1/2] Gallery fix --- ...ks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy | 3 ++- game/script/14A.KO_OP-ending.rpy | 4 +++- game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy index d62293e..636deb2 100644 --- a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy +++ b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy @@ -13,6 +13,7 @@ label chapter_13D: window auto pause .5 + $renpy.mark_image_seen("stair3") scene gold_fang_home_prom_stars with Dissolve(2) pause 1 @@ -3312,7 +3313,7 @@ label chapter_13D: with Dissolve(1) pause 1 - $ renpy.mark_image_seen('fullbody_christmas') + $ renpy.mark_image_seen('anonchristmasmorning') "I’m sitting in my bed, looking through one of my favorite presents." diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index 7de13c1..910ef85 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/game/script/14A.KO_OP-ending.rpy @@ -854,7 +854,8 @@ label chapter_14A: ypos 0 with Dissolve(2) - $ renpy.mark_image_seen('fullbody_fang_shooter') + $ renpy.mark_image_seen('fangshooter') + $ renpy.mark_image_seen("a12") F "A-Anon{cps=*.1}...{/cps} WHY ARE YOU-!" @@ -1157,6 +1158,7 @@ label chapter_14A: window auto pause .5 + $ renpy.mark_image_seen("a11") scene a11 with Dissolve(2) pause 1 diff --git a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy index 801ccc5..ab925b3 100644 --- a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy +++ b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy @@ -462,6 +462,7 @@ label chapter_9: "More pictures." "So many more pictures." + $ renpy.mark_image_seen("projector9") show projector9_blur behind reed, naser with Dissolve(.25) "Each one more and more embarrassing than the last." From caa824cefefd6f760854c3a154a0be1046d59e6a Mon Sep 17 00:00:00 2001 From: nutbuster Date: Thu, 17 Nov 2022 15:06:57 +1100 Subject: [PATCH 2/2] Jsonified --- game/src/cg_gallery.rpy | 41 ++++++++++++++--------------------- game/src/gallery_dataset.json | 16 ++++++++++++++ 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy index d82a058..dd2bcf3 100644 --- a/game/src/cg_gallery.rpy +++ b/game/src/cg_gallery.rpy @@ -13,14 +13,7 @@ init 2 python: DEFAULT_HEIGHT_SCALE_RATIO = round(float(PREFERRED_HEIGHT) / float(1080), 4) NOT_UNLOCKED_COVER = im.FactorScale("gui/gallery/unlocked_cg_button_cover.png", DEFAULT_WIDTH_SCALE_RATIO, DEFAULT_HEIGHT_SCALE_RATIO) ACCEPTED_EXTENSIONS = ["jpg", "png", "webm"] - CG_PATHS = [ - #CG doesn't really make sense - { 'path': "images/cgs/", 'name': "CG", 'eval': None }, - { 'path': "images/animations/", 'name': "Animations", 'eval': None }, - { 'path': "images/NotForKids!/", 'name': "Lewd", - 'eval': 'persistent.lewd == True' - } - ] + CG_PATHS = [] #path: folder, name: shows up in gallery, eval: runs eval() on string """ @@ -90,26 +83,11 @@ init 2 python: return # Call to loading the gallery - loadGallery() + #loadGallery() #renpy.start_predict_screen("cg_gallery") #sort - - # hard code the webm because renpy is really dumb and doesn't add Movies properly until much later - fang_webm = 'fang thumb' - - webm_rcg = Fixed(Color("#000"), Text("Fang", size=280, xalign=0.5, yalign=0.5), xsize=1920) - renpy.seen_label('fang_movie') - gallery_dic['Animations'] = [{ - "item": 'fang tail', - "fn": 'images/animations/fang tail.webm', - "cg": cg_('images/backgrounds/garden.jpg', None, 1920), - "ext": 'webm', - "wh": [1920, 1080] - }] - renpy.image("fang tail", Movie(loop=True,play='images/animations/fang tail.webm')) # Since we are hard-coding might as well. - #for zooming in and out zoom_arr = [0.25, 0.375, 0.5, 0.625, 0.75, 0.875, 1.0, 1.125, 1.25, 1.5, 1.75, 2.0] @@ -166,7 +144,7 @@ init 2 python: "wh": image_dimensions } gallery_dic[tab_name].append(item) - else: #folders + elif 'folders' in x.keys(): #folders for str in list_img: for cp in x['folders']: for ext in ACCEPTED_EXTENSIONS: @@ -182,6 +160,19 @@ init 2 python: jsonloadandpop() + # hard code the webm because renpy is really dumb and doesn't add Movies properly until much later + fang_webm = 'fang thumb' + + webm_rcg = Fixed(Color("#000"), Text("Fang", size=280, xalign=0.5, yalign=0.5), xsize=1920) + renpy.seen_label('fang_movie') + gallery_dic['Animations'] = [{ + "item": 'fang tail', + "fn": 'fang tail', + "cg": cg_('images/backgrounds/garden.jpg', None, 1920), + "ext": 'webm', + "wh": [1920, 1080] + }] + pass diff --git a/game/src/gallery_dataset.json b/game/src/gallery_dataset.json index 4269c12..a28bd5d 100644 --- a/game/src/gallery_dataset.json +++ b/game/src/gallery_dataset.json @@ -1,5 +1,21 @@ { "tabs":[ + { + "tab_name": "CG", + "folders": [ + "images/cgs/" + ] + }, + { + "tab_name": "Animations" + }, + { + "tab_name": "Lewd", + "eval": "persistent.lewd == True", + "folders": [ + "images/NotForKids!/" + ] + }, { "tab_name": "Full body Fang", "items": [