Merge branch 'main' into tool

# Conflicts: # .github/FUNDING.yml # CHANGELOG.md # README.md # game/images.rpy # game/images/Alice/roomsleep0A.webp # game/images/Alice/terrace0A.webp # game/images/Alice/terrace0At.webp # game/images/icon/Alice.webp # game/images/location/aliceroom-0.webp # game/images/location/aliceroom-1.webp # game/images/location/aliceroom-2.webp # game/images/location/aliceroom-3.webp # game/images/location/annroom-0.webp # game/images/location/annroom-1.webp # game/images/location/annroom-2.webp # game/images/location/annroom-3.webp # game/images/location/bathroom.webp # game/images/location/lounge-0.webp # game/images/location/lounge-1.webp # game/images/location/lounge-2.webp # game/images/location/lounge-3.webp # game/images/location/myroom-0.webp # game/images/location/myroom-1.webp # game/images/location/myroom-2.webp # game/images/location/myroom-3.webp # game/images/location/terrace-0.webp # game/images/location/terrace-1.webp # game/images/location/terrace-2.webp # game/images/location/terrace-3.webp # game/script.rpy
DRincs-Productions · Dec 29, 2023 · ac15e60 · ac15e60
2 parents 83254be + bd8b426
commit ac15e60
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 39 deletions.
diff --git a/game/nqtr_screens/screens_memo.rpy b/game/nqtr_screens/screens_memo.rpy
@@ -3,7 +3,7 @@ default cur_task_menu = ""
 # quest level based on the task selected in the menu
 default cur_quest_menu = ""
 
-screen menu_memo():
+screen menu_memo(close_actions = [ Hide("menu_memo") ]):
 
     roll_forward True
     tag menu
@@ -20,7 +20,7 @@ screen menu_memo():
     # Synchronize number_stages_completed_in_quest with quests
     $ update_quests_levels()
 
-    use close_button("menu_memo")
+    use close_button(close_actions)
 
     frame:
         ypos gui.dr_drawer_ypos
@@ -123,6 +123,3 @@ screen menu_memo():
                 SetVariable('cur_quest_menu', cur_quest_menu + 1),
             ]
             at dr_button_next_transform(0)
-
-    key 'K_ESCAPE' action Hide('menu_memo')
-    key 'mouseup_3' action Hide('menu_memo')
diff --git a/game/nqtr_screens/screens_nqtr_component.rpy b/game/nqtr_screens/screens_nqtr_component.rpy
@@ -161,7 +161,7 @@ screen room_button(room, cur_room, i, find_ch = False):
 
                 # Room icon
                 imagebutton:
-                    align (0.5, 0.0)
+                    align (0, - 0.15)
                     if room.is_button:
                         idle room.button_icon
                     selected_idle room.button_icon_selected
@@ -176,23 +176,24 @@ screen room_button(room, cur_room, i, find_ch = False):
                     ]
                     at nqtr_button_room_transform
 
+                # Character icon
                 if find_ch:
                     hbox:
-                        xalign 0.5
-                        yalign 0.99
-
+                        align (0.5, 0.6)
                         for comm in commitments_in_cur_location.values():
                             # If it is the selected room
                             if room.id == comm.room_id:
                                 use character_icon_screen(comm.character_icon)
-            # Room name
-            text room.name:
-                size gui.dr_little_text_size
-                drop_shadow [(2, 2)]
-                xalign 0.5
-                text_align 0.5
-                line_leading 0
-                line_spacing -2
+
+                # Room name
+                text room.name:
+                    align (0.5, 0.99)
+                    size gui.dr_little_text_size
+                    drop_shadow [(2, 2)]
+                    text_align 0.5
+                    line_leading 0
+                    line_spacing -2
+
         key str(i) action [
             SetVariable('prev_room', cur_room),
             SetVariable('cur_room', room),

diff --git a/game/screens_style b/game/screens_style
diff --git a/game/script.rpy b/game/script.rpy
@@ -1,21 +1,21 @@
-# The script of the game goes in this file.
-
-# Declare characters used by this game. The color argument colorizes the
-# name of the character.
-
-
-# The game starts here.
-
-label start:
-
-    # enable a notify screen
-    call enable_notifyEx
-
-    # the first time it opens room navigation screen use after_spending_time
-    # for update routine, event...
-    call after_spending_time
-    # open the room navigation screen
-    call screen room_navigation
-    return
-tion
-    return
+# The script of the game goes in this file.
+
+# Declare characters used by this game. The color argument colorizes the
+# name of the character.
+
+
+# The game starts here.
+
+label start:
+
+    # enable a notify screen
+    call enable_notifyEx
+
+    # the first time it opens room navigation screen use after_spending_time
+    # for update routine, event...
+    call after_spending_time
+    # open the room navigation screen
+    call screen room_navigation
+    return
+tion
+    return