Cavemanon/SnootGame
24
0
Fork 16
Code Issues 4 Pull Requests 3 Projects Releases 6 Wiki Activity

""" -> # & merge fix

Browse Source
This commit is contained in:
Nutbuster 2021-10-09 20:26:33 +11:00
parent bb4c08017f
commit d4a517f63b
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/script.rpy
View File

@ -335,16 +335,15 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru
image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True) image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True)
image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True) image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True)
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True) image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
"""
double surprised
<<<<<<< B's
image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
=======
image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
image naser surprised = "naser/naserintermediaryshocked.png"
>>>>>>> N's #double surprised
""" #<<<<<<< B's
#image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True)
#=======
#image naser surprised flip = im.Flip("naser/naserintermediaryshocked.png", horizontal=True)
#image naser surprised = "naser/naserintermediaryshocked.png"
#
#>>>>>>> N's
#other flips #other flips
image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True) image spears happy flip = im.Flip("spears/spears happy.png", horizontal=True)

11
game/src/cg_gallery.rpy
View File

@ -158,17 +158,18 @@ screen cg_gallery(flag, __yoffset = 0, origin = 'CG'):
textbutton _(cp['name']) text_color gui.selected_color text_xalign 0.5 textbutton _(cp['name']) text_color gui.selected_color text_xalign 0.5
else: else:
if cp['eval'] is None: if cp['eval'] is None:
textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
elif eval(cp['eval']): elif eval(cp['eval']):
textbutton _(cp['name']) action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5 textbutton _(cp['name']) activate_sound "audio/ui/uiClick.wav" action ShowMenu('cg_gallery_'+flag, 0, cp['name']) text_xalign 0.5
else: else:
textbutton _(cp['name']) text_xalign 0.5 textbutton _(cp['name']) text_xalign 0.5
textbutton _("Return") action ShowMenu('main_menu') text_xalign 0.5 textbutton _("Return") activate_sound "audio/ui/uiBack.wav" action ShowMenu('main_menu') text_xalign 0.5
if _in_replay: if _in_replay:
textbutton _("End Replay") action EndReplay(confirm=True) textbutton _("End Replay") activate_sound "audio/ui/uiBack.wav" action EndReplay(confirm=True)
elif not main_menu: elif not main_menu:
textbutton _("Main Menu") action MainMenu() textbutton _("Main Menu") activate_sound "audio/ui/uiBack.wav" action MainMenu()
transform: transform:
zoom 0.95 zoom 0.95

4
game/src/mod_menu.rpy
View File

@ -10,6 +10,10 @@ screen mod_menu_button(filename, label, function):
xmaximum 600 xmaximum 600
ymaximum 129 ymaximum 129
action function action function
if 'Back' in label or 'Return' in label or 'Quit' in label or 'Main Menu' in label:
activate_sound "audio/ui/uiBack.wav"
else:
activate_sound "audio/ui/uiClick.wav"
fixed: fixed:
add filename xalign 0.5 yalign 0.5 zoom 0.9 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 xanchor 0.5 size 34