Merge remote-tracking branch 'origin/interface2' into kinetic_text

game/scripts/gui/credits.rpy

@@ -34,7 +34,7 @@ define credits_images = [] # TODO: Add images once new chibis are in.
 #     (Transform("hj", zoom=2, crop=(225,200,200,235)), 25, 8, True),
 # )
 
-define credits_mods = "\n\n## Game Mods\n\n" + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else ""
+define credits_mods = _("\n\n## Game Mods\n\n") + "\n\n".join(["### " + i[1]["Name"] + "\n- " + i[1]["Author"] for i in mods_list.items()]) if mods_list else ""
 
 define credits = credits.convert(_(f"""{{image=game_logo}}{{vspace=10}}
 ## Development Team
@@ -172,6 +172,7 @@ define credits = credits.convert(_(f"""{{image=game_logo}}{{vspace=10}}
 - CaptainNemo
 - Darwin7
 - That one Disney employee
+- Johnny28
 
 ### Miscellaneous Sound Effects
 - LoafyLemon
@@ -324,4 +325,4 @@ screen credits():
 
     use player((0.025, 0.88))
 
-    timer duration+pauses action Hide("credits")
+    timer duration+pauses action [Hide("credits"), Function(achievements.unlock, "Credits")]

game/scripts/gui/misc.rpy

@@ -1,16 +1,5 @@
-#
-# Additional screens
-#
-
 init offset = -1
 
-# Confirm screen
-#
-# The confirm screen is called when Ren'Py wants to ask the player a yes or no
-# question.
-#
-# https://www.renpy.org/doc/html/screen_special.html#confirm
-
 screen confirm(message, yes_action=Return(True), no_action=Return(False)):
     modal True
     layer "interface"
@@ -23,13 +12,13 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
         at gui_modal_popup
 
         vbox:
-            text message
+            text message:
+                text_align 0.5
 
             hbox:
                 textbutton _("Yes") action yes_action
                 textbutton _("No") action no_action
 
-    ## Right-click and escape answer "no".
     key "game_menu" action no_action
 
 style confirm_frame is frame
@@ -43,13 +32,6 @@ style confirm_button_text is frame_button_text
 style confirm_text is frame_text:
     size 20
 
-# Skip indicator screen
-#
-# The skip_indicator screen is displayed to indicate that skipping is in
-# progress.
-#
-# https://www.renpy.org/doc/html/screen_special.html#skip-indicator
-
 screen skip_indicator():
     zorder 100
 
@@ -64,13 +46,6 @@ style skip_text is default:
     color "#fff"
     outlines [(1, "#00000080", 1, 0)]
 
-# Notify screen
-#
-# The notify screen is used to show the player a message. (For example, when
-# the game is quicksaved or a screenshot has been taken.)
-#
-# https://www.renpy.org/doc/html/screen_special.html#notify-screen
-
 screen notify(message):
     layer "interface"
     sensitive False
@@ -90,7 +65,6 @@ transform notify_appear:
     on hide:
         linear .5 alpha 0.0
 
-
 style notify_text is gui_text
 
 style notify_frame is empty:

game/scripts/gui/saves.rpy

@@ -47,7 +47,7 @@ screen file_slots(title):
                             action FileSave(i)
 
                         # FileSaveName sometimes returns an empty string regardless of 'empty' parameter. /shrugs
-                        $ file_name = (FileSaveName(i) or f"Slot {i}")
+                        $ file_name = (FileSaveName(i) or _(f"Slot {i}"))
                         text "[file_name]" style "file_description_text" ypos 2
 
                         vbox style "file_vbox":
@@ -58,7 +58,7 @@ screen file_slots(title):
                                 $ playtime = FileJson(i, "playtime", missing=0)
                                 $ minutes, seconds = divmod(int(playtime), 60)
                                 $ hours, minutes = divmod(minutes, 60)
-                                text f"Playtime: {hours}H {minutes}M {seconds}S" style "file_description_text"
+                                text _(f"Playtime: {hours}H {minutes}M {seconds}S") style "file_description_text"
 
 
     frame style "navigation_page_right":
@@ -93,7 +93,7 @@ screen file_slots(title):
                             action FileSave(i)
 
                         # FileSaveName sometimes returns an empty string regardless of 'empty' parameter. /shrugs
-                        $ file_name = (FileSaveName(i) or f"Slot {i}")
+                        $ file_name = (FileSaveName(i) or _(f"Slot {i}"))
                         text "[file_name]" style "file_description_text" ypos 2
 
                         vbox style "file_vbox":
@@ -104,7 +104,7 @@ screen file_slots(title):
                                 $ playtime = FileJson(i, "playtime", missing=0)
                                 $ minutes, seconds = divmod(int(playtime), 60)
                                 $ hours, minutes = divmod(minutes, 60)
-                                text f"Playtime: {hours}H {minutes}M {seconds}S" style "file_description_text"
+                                text _(f"Playtime: {hours}H {minutes}M {seconds}S") style "file_description_text"
 
 transform file_hover:
     on hover:

game/scripts/interface/achievements.rpy

@@ -243,7 +243,7 @@ screen achievements(xx, yy):
     zorder 15
     modal True
 
-    add "gui_fade"
+    # add "gui_fade"
 
     if renpy.mobile:
         use close_button_background