diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy index 523d322..142d9de 100644 --- a/game/src/cg_gallery.rpy +++ b/game/src/cg_gallery.rpy @@ -97,11 +97,14 @@ init 2 python: # hard code the webm because renpy is really dumb and doesn't add Movies properly until much later - fang_webm = 'images/animations/fang tail.webm' + 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_webm, - "cg": Movie(fang_webm),#cg(_str, 'webm', 1920), + "fn": 'fang tail', + "cg": cg_('images/backgrounds/garden.jpg', None, 1920), "ext": 'webm', "wh": [1920, 1080] }] @@ -296,15 +299,15 @@ if/else flow control & extra parameters for Buttons """ screen flag_button(item, yoffset, origin): python: - flag = renpy.seen_image(item['item']) + flag = True #renpy.seen_image(item['item']) if flag: button: if item['ext'] == "webm": action Replay('fang_movie')#ShowMenu('view_movie', item, ShowMenu('cg_gallery_0', yoffset, origin)) else: - #action ShowMenu('view_image_a', item, ShowMenu('cg_gallery_0', yoffset, origin)) - action Show('view_image', None, item, ShowMenu('cg_gallery_0', yoffset, origin), _zorder=1) + action ShowMenu('view_image_a', item, ShowMenu('cg_gallery_0', yoffset, origin)) + #action Show('view_image', None, item, ShowMenu('cg_gallery_0', yoffset, origin), _zorder=1) xcenter 0.5 ycenter 0.5 padding (1,0,1,2) vbox: @@ -334,15 +337,15 @@ view_image, Loads the image in fullscreen with viewport control. """ screen view_image(item, _origin, zoom = zoom_arr.index(1.0), flag='a'): python: - _origin = Show('cg_gallery') + #_origin = Show('cg_gallery_0', 0, _origin) zoom_a = zoom+1 zoom_a_f = ShowMenu('view_image_'+flag, item, _origin, zoom_a) zoom_b = zoom-1 zoom_b_f = ShowMenu('view_image_'+flag, item, _origin, zoom_b) tag menu - key "game_menu" action [Hide('view_image'), Show('cg_gallery_0')] #_origin - key "button_alternate" action [Hide('view_image'), Show('cg_gallery_0')] + key "game_menu" action [Hide('view_image'), _origin ] #Show('cg_gallery_0')] #_origin + key "button_alternate" action [Hide('view_image'), _origin ] # Show('cg_gallery_0')] #key "button_alternate" action _origin # mousewheel & insert+delete diff --git a/game/src/definitions.rpy b/game/src/definitions.rpy index 02c2835..4dcc3de 100644 --- a/game/src/definitions.rpy +++ b/game/src/definitions.rpy @@ -4,6 +4,17 @@ # fang full body init 1 python: + + + renpy.image('fang_thumb', Movie('images/animations/fang tail.webm')) + + + renpy.image('fullbody_hallpass', Composite( + (1920, 1080), + (0, 0), 'roof day', + (0, 0), 'hallpass') + ) + renpy.image('fullbody_hallpass', Composite( (1920, 1080), (0, 0), 'roof day',