Merge branch 'main' into tool

Author: BlackRam-oss

game/nqtr_screens/screens_nqtr.rpy

@@ -17,16 +17,16 @@ screen room_navigation():
             use location_button(location)
 
     else:
-        # Rooms
-        use room_button_list(rooms, commitments_in_cur_location)
-
         # Action wich Picture in background
         for room in rooms:
             # Adds the button list of possible actions in that room
             if (cur_room and room.id == cur_room.id and not room.id in closed_rooms):
                 for act in current_picture_in_background_actions(actions= actions | df_actions, room = room, now_hour = tm.hour , current_day = tm.day, tm = tm, flags = flags):
                     use action_picture_in_background(act)
 
+        # Rooms
+        use room_button_list(rooms, commitments_in_cur_location)
+
         # Normal Actions (with side button)
         vbox:
             yalign 0.95

game/nqtr_screens/screens_nqtr_component.rpy

@@ -62,7 +62,8 @@ screen action_picture_in_background(act):
         ]
         if renpy.variant("pc"):
             tooltip act.name
-        at nqtr_button_action_picture_transform
+        if act.picture_in_background_selected == act.picture_in_background:
+            at nqtr_button_action_picture_transform
 
 screen action_talk_button(conversation, background):
     python: