diff --git a/game/src/cg_gallery.rpy b/game/src/cg_gallery.rpy index e6a2cd37..523d322d 100644 --- a/game/src/cg_gallery.rpy +++ b/game/src/cg_gallery.rpy @@ -5,7 +5,7 @@ init 2 python: # CONST PARAMS ALLOW_ZOOM = False - GALLERY_COLS = 3 + GALLERY_COLS = 4 PREFERRED_WIDTH = 432 #px (1920 * 0.225) PREFERRED_HEIGHT = 243 #px (1080 * 0.225) PREFERRED_ASPECT_RATIO = 16.0/9.0 # 1.7777.. @@ -123,42 +123,6 @@ init 2 python: zoom_arr.sort() """ - class CaveGallery: #incase it confilcts with renpy's gallery - FPS = 1/60 - class GalleryButton(renpy.Displayable): - def __init__(self, x, y, *childs, **kwargs): - super(CaveGallery.GalleryButton, self).__init__(**kwargs) - pass - - def render(self, width, height, st, at): - render = renpy.Render(self.width, self.height) - for x in self.childs: - t = Transform(child=x) - child_render = renpy.render(t, self.width, self.height, st, at) - render.place(x, 0, 0, None, None, st, at) - return render - def event(self, ev, ex, ey, st): #getting clicked on - global CaveGallery - if (renpy.map_event(ev, 'mouseup_1')): #1026 - pass - return - def visit(self): - return self.childs - - @staticmethod - def render_cavegallery(st, at): - global CaveGallery - - return CaveGallery.FPS - pass - - - """ - renpy.image( fullbody_fangguitar = Composite( - (1920, 1080), - (0, 0), 'fangroom', - (0, 0), 'fangguitar')) - """ def jsonloadandpop(): #CACHE_PATH = config.basedir.replace("\\","/") + "/game/cache/" @@ -213,6 +177,7 @@ init 2 python: pass jsonloadandpop() + pass @@ -331,7 +296,7 @@ if/else flow control & extra parameters for Buttons """ screen flag_button(item, yoffset, origin): python: - flag = True #renpy.seen_image(item['item']) + flag = renpy.seen_image(item['item']) if flag: button: diff --git a/game/src/translation.rpy b/game/src/translation.rpy index ac78f524..3ecf2f8a 100644 --- a/game/src/translation.rpy +++ b/game/src/translation.rpy @@ -93,11 +93,6 @@ init python: def visit(self): return [self.child] - @staticmethod - def render(): - global LangButton - - pass @staticmethod def render_langcave(st, at):