diff --git a/game/screens.rpy b/game/screens.rpy index 2a6b5ba..bc3deaa 100644 --- a/game/screens.rpy +++ b/game/screens.rpy @@ -194,7 +194,7 @@ screen input(prompt): window: add Image("gui/textbox_no_hitch.png", xalign=0.5, yalign=1.0, yoffset=gui.input_yoffset) #for mobile OSK vbox: - xalign gui.dialogue_text_xalign + xanchor gui.dialogue_text_xalign xpos gui.dialogue_xpos xsize gui.dialogue_width ypos gui.dialogue_ypos @@ -270,7 +270,7 @@ screen quick_button(filename, label, function): activate_sound "audio/ui/uiClick.wav" fixed: 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() ], .. ] # Reuse the same image string and keep things 'neat'. @@ -410,8 +410,8 @@ screen main_menu_button(filename, label, function): else: activate_sound "audio/ui/uiClick.wav" fixed: - add filename xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5 - text label xalign 0.5 yalign 0.5 xanchor 0.5 + add filename xalign 0.5 yalign 0.5 zoom 1 + text label xalign 0.5 yalign 0.5 image bonus_flash: @@ -437,23 +437,21 @@ image template_black: screen bonus_chapter_button(f="gui/button/menubuttons/template_idle.png"): #("gui/button/menubuttons/template_idle.png", "Bonus Chapters", ShowMenu("ex_ch_menu")) button: - xmaximum 500 - ymaximum 129 xysize (500, 129) action ShowMenu("ex_ch_menu") activate_sound "audio/ui/uiClick.wav" fixed: 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_bonus_chapters = persistent.bonus_chapters 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 $ 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() ], .. ] # Reuse the same image string and keep things 'neat'. diff --git a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy index 4b1afd6..f1f507e 100644 --- a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy +++ b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy @@ -2539,14 +2539,14 @@ label chapter_13C: easein_cubic 1 xalign 1.85 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 with None show naser rstained surprised hide chillicheesefries 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 with dissolve @@ -2554,7 +2554,7 @@ label chapter_13C: show naser rstained shocked 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 with Dissolve(.22) @@ -2635,7 +2635,7 @@ label chapter_13C: show naser fullystained shocked hide chillicheesefries 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 with Dissolve(.22) diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy index d3542da..d10bee6 100644 --- a/game/script/8.anon-and-fang-study-together.rpy +++ b/game/script/8.anon-and-fang-study-together.rpy @@ -335,7 +335,7 @@ label chapter_8: show reed happy flip: 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 hide reed with Dissolve(.25) play sound 'audio/effects/anonGardenFall.ogg' diff --git a/game/src/extra_chapters_menu.rpy b/game/src/extra_chapters_menu.rpy index e4c97b0..9ce2288 100644 --- a/game/src/extra_chapters_menu.rpy +++ b/game/src/extra_chapters_menu.rpy @@ -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'. diff --git a/game/src/misc_definitions.rpy b/game/src/misc_definitions.rpy index 8e5cda9..d2ffafa 100644 --- a/game/src/misc_definitions.rpy +++ b/game/src/misc_definitions.rpy @@ -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