Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-01-22 17:26:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflicting properties

Browse source
This commit is contained in:
Map 2024-10-05 08:49:05 -05:00
parent 84240297e5
commit ffccaff704
5 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
game/screens.rpy
View file

@ -194,7 +194,7 @@ screen input(prompt):
window: window:
add Image("gui/textbox_no_hitch.png", xalign=0.5, yalign=1.0, yoffset=gui.input_yoffset) #for mobile OSK add Image("gui/textbox_no_hitch.png", xalign=0.5, yalign=1.0, yoffset=gui.input_yoffset) #for mobile OSK
vbox: vbox:
xalign gui.dialogue_text_xalign xanchor gui.dialogue_text_xalign
xpos gui.dialogue_xpos xpos gui.dialogue_xpos
xsize gui.dialogue_width xsize gui.dialogue_width
ypos gui.dialogue_ypos ypos gui.dialogue_ypos
@ -270,7 +270,7 @@ screen quick_button(filename, label, function):
activate_sound "audio/ui/uiClick.wav" activate_sound "audio/ui/uiClick.wav"
fixed: fixed:
add filename xalign 0.5 yalign 0.5 zoom 1 add filename xalign 0.5 yalign 0.5 zoom 1
text label xalign 0.5 yalign 0.5 xanchor 0.5 size 22 style "quick_button_text" text label xalign 0.5 yalign 0.5 size 22 style "quick_button_text"
# label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ] # label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
# Reuse the same image string and keep things 'neat'. # Reuse the same image string and keep things 'neat'.
@ -410,8 +410,8 @@ screen main_menu_button(filename, label, function):
else: else:
activate_sound "audio/ui/uiClick.wav" activate_sound "audio/ui/uiClick.wav"
fixed: fixed:
add filename xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 add filename xalign 0.5 yalign 0.5 zoom 1
text label xalign 0.5 yalign 0.5 xanchor 0.5 text label xalign 0.5 yalign 0.5
image bonus_flash: image bonus_flash:
@ -437,23 +437,21 @@ image template_black:
screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"): screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"):
#("gui/button/menubuttons/template_idle.png", "Bonus Chapters", ShowMenu("ex_ch_menu")) #("gui/button/menubuttons/template_idle.png", "Bonus Chapters", ShowMenu("ex_ch_menu"))
button: button:
xmaximum 500
ymaximum 129
xysize (500, 129) xysize (500, 129)
action ShowMenu("ex_ch_menu") action ShowMenu("ex_ch_menu")
activate_sound "audio/ui/uiClick.wav" activate_sound "audio/ui/uiClick.wav"
fixed: fixed:
if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)): if (persistent.old_endings != persistent.endings) or (persistent.bonus_chapters != persistent.old_bonus_chapters and (persistent.bonus_chapters == 0b111111111)):
add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1
$ persistent.old_endings = persistent.endings $ persistent.old_endings = persistent.endings
#$ persistent.old_bonus_chapters = persistent.bonus_chapters #$ persistent.old_bonus_chapters = persistent.bonus_chapters
else: else:
add f xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 add f xalign 0.5 yalign 0.5 zoom 1
if (persistent.old_bonus_chapters != persistent.bonus_chapters): #just in case if (persistent.old_bonus_chapters != persistent.bonus_chapters): #just in case
$ persistent.old_bonus_chapters = persistent.bonus_chapters $ persistent.old_bonus_chapters = persistent.bonus_chapters
text "Bonus Chapters" xalign 0.5 yalign 0.5 xanchor 0.5 text "Bonus Chapters" xalign 0.5 yalign 0.5
# label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ] # label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
# Reuse the same image string and keep things 'neat'. # Reuse the same image string and keep things 'neat'.

8
game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy
View file

@ -2539,14 +2539,14 @@ label chapter_13C:
easein_cubic 1 xalign 1.85 easein_cubic 1 xalign 1.85
show chillicheesefries: show chillicheesefries:
rotate 130 xalign 0.5 yalign 0.4 xpos 0.77 ypos 0.425 rotate 130 xanchor 0.5 yanchor 0.4 xpos 0.77 ypos 0.425
easein_cubic 1 xpos 0.795 easein_cubic 1 xpos 0.795
with None with None
show naser rstained surprised show naser rstained surprised
hide chillicheesefries hide chillicheesefries
show chillicheesefries_hack: show chillicheesefries_hack:
rotate 130 xalign 0.5 yalign 0.4 xpos 0.765 ypos 0.425 rotate 130 xanchor 0.5 yanchor 0.4 xpos 0.765 ypos 0.425
easein_cubic 1 xpos 0.79 easein_cubic 1 xpos 0.79
with dissolve with dissolve
@ -2554,7 +2554,7 @@ label chapter_13C:
show naser rstained shocked show naser rstained shocked
show chillicheesefries: show chillicheesefries:
rotate 140 xalign 0.5 yalign 0.4 xpos 0.805 ypos 0.4 rotate 140 xanchor 0.5 yanchor 0.4 xpos 0.805 ypos 0.4
hide chillicheesefries_hack hide chillicheesefries_hack
with Dissolve(.22) with Dissolve(.22)
@ -2635,7 +2635,7 @@ label chapter_13C:
show naser fullystained shocked show naser fullystained shocked
hide chillicheesefries hide chillicheesefries
show chillicheesefries_hack: show chillicheesefries_hack:
rotate 140 xalign 0.75 yalign 0.5 xpos 0.905 ypos 0.45 rotate 140 xanchor 0.75 yanchor 0.5 xpos 0.905 ypos 0.45
easein_cubic 1 xpos 0.93 easein_cubic 1 xpos 0.93
with Dissolve(.22) with Dissolve(.22)

2
game/script/8.anon-and-fang-study-together.rpy
View file

@ -335,7 +335,7 @@ label chapter_8:
show reed happy flip: show reed happy flip:
yalign 0.238 yalign 0.238
easeout_cubic .5 rotate 90 yalign -0.01 ypos 0.5 easeout_cubic .5 rotate 90 yanchor -0.01 ypos 0.5
pause .15 pause .15
hide reed with Dissolve(.25) hide reed with Dissolve(.25)
play sound 'audio/effects/anonGardenFall.ogg' play sound 'audio/effects/anonGardenFall.ogg'

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" 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 size 34
# label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ] # label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
# Reuse the same image string and keep things 'neat'. # Reuse the same image string and keep things 'neat'.

7
game/src/misc_definitions.rpy
View file

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