Pomi108/SnootGame
1
Fork 0
forked from Cavemanon/SnootGame
Code Pull Requests Activity

Merge branch 'master' into wani_mod_menu

Browse Source
This commit is contained in:
Mappening
2024-10-06 14:29:47 -05:00
parent aa0eff4377 2269086430
commit 5eb39a7c3c
14 changed files with 902 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
game/src/cg_gallery.rpy
View File

@@ -13,12 +13,10 @@ init 2 python:
CG_PATHS = []
#path: folder, name: shows up in gallery, eval: runs eval() on string
"""
Data structure that holds the data for each cg and button
item is name, cg is the image definition
{ item: str; cg: Displayable; }
(reference in this init python, actually used in screens)
"""
# Data structure that holds the data for each cg and button
# item is name, cg is the image definition
# { item: str; cg: Displayable; }
# (reference in this init python, actually used in screens)
gallery_dic = {}
@@ -89,10 +87,10 @@ init 2 python:
# Bullshit for the scrollbar to reset back to the beggining. Bless the renpy Discord :pray:
default adjust = ui.adjustment()
"""
CG Gallery screen - A screen that shows the image gallery
Built-in Gallery Object has terrible defaults, so I just wrote my own stuff
"""
# CG Gallery screen - A screen that shows the image gallery
# Built-in Gallery Object has terrible defaults, so I just wrote my own stuff
screen cg_gallery(origin = 'CG'):
if main_menu:
@@ -162,9 +160,8 @@ screen cg_gallery(origin = 'CG'):
for i in range(0, empty_spaces):
null height 20
"""
if/else flow control & extra parameters for Buttons
"""
# if/else flow control & extra parameters for Buttons
screen flag_button(item, origin):
$ flag = renpy.seen_image(item['item'])
@@ -200,9 +197,8 @@ screen view_movie(item, _origin):
[ "Return", _origin ]
] )
"""
view_image, Loads the image in fullscreen with viewport control.
"""
# view_image, Loads the image in fullscreen with viewport control.
screen view_image(item, _origin):
tag menu
key "game_menu" action (Hide('view_image'), _origin)
@@ -211,7 +207,7 @@ screen view_image(item, _origin):
viewport id "vie":
#Ren'Py isn't smart enough to not edgescroll while pressed,
#so we'll have to disable this for mobile
if renpy.variant("pc"):
if renpy.variant("pc") and persistent.gallery_edgescroll:
edgescroll (300, 1800)
draggable True
arrowkeys True

2
game/src/extra_chapters_menu.rpy
View File

@@ -31,7 +31,7 @@ screen ex_ch_button(filename, label, function):
activate_sound "audio/ui/uiClick.wav"
fixed:
add filename xalign 0.5 yalign 0.5 zoom 0.9
text label xalign 0.5 yalign 0.5 xanchor 0.5 size 34
text label xalign 0.5 yalign 0.5 size 34
# label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
# Reuse the same image string and keep things 'neat'.

2
game/src/image_definitions.rpy
View File

@@ -1063,7 +1063,7 @@ image naomi prom lessblurred = im.Flip(im.Blur('images/naomi/naomi prom neutral.
#image emptyroomnight = "images/backgrounds/emptyroomnight.webp"
#image naomifangcg = "images/cgs/naomifangcg.webp"
image naomifangcg blur = im.Blur("images/cgs/naomifangcg.webp", 1.5)
#image naomifangcg blur = im.Blur("images/cgs/naomifangcg.webp", 1.5)
image naomiletter = 'images/cgs/naomiletter.webp'
#image ending_d_cg = 'images/cgs/golden ending.webp'

7
game/src/misc_definitions.rpy
View File

@@ -132,7 +132,7 @@ transform rright:
#misc transforms
transform shudder:
subpixel True
around (.5, .5) alignaround (.5, .5) xalign .5 yalign .5
alignaround (.5, .5) xalign .5 yalign .5
rotate 0
linear 0.0 rotate -0.75
block:
@@ -175,8 +175,7 @@ screen mousedetect():
zoom 0.8
rotate 12.5
mousearea:
ypos -75
area(432, 0, 795, 1100)
area(432, -75, 795, 1100)
# xalign 0.5 yanchor 0 ypos 0
hovered Hide("prompt" )
unhovered Show("prompt")
@@ -198,7 +197,7 @@ screen textscroll():
yinitial 1.0
imagebutton auto "fangbutton%s" xalign 0.53 yalign 0.5:
imagebutton auto "fangbutton%s" xalign 0.53 yanchor 0.5:
ypos 65+(int(107/2))
xsize 284
ysize 107