From ca64492beba5aa37458c8118b90fe9d75e8511b6 Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Wed, 15 Nov 2023 21:26:57 +0100 Subject: [PATCH] Further clean junk variable --- game/scripts/interface/topbar.rpy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/game/scripts/interface/topbar.rpy b/game/scripts/interface/topbar.rpy index 52f69181..c4108a9f 100644 --- a/game/scripts/interface/topbar.rpy +++ b/game/scripts/interface/topbar.rpy @@ -5,8 +5,6 @@ init python: else: return str(round(points/1000.0, 1))+"{size=-2}k{/size}" -default toggle_menu = False - label update_ui_points: # Debug @@ -34,6 +32,8 @@ screen ui_top_bar(): tag ui zorder 2 + default toggle_menu = False + if toggle_menu: use ui_menu @@ -53,7 +53,7 @@ screen ui_top_bar(): tooltip "Close menu" else: tooltip "Open menu" - action ToggleVariable("toggle_menu", True, False) + action ToggleScreenVariable("toggle_menu", True, False) # Sleep button imagebutton: @@ -191,7 +191,7 @@ style dark_ui_stats_text: screen ui_menu(): tag ui - button style "empty" action SetVariable("toggle_menu", False) keysym "game_menu" + button style "empty" action SetScreenVariable("toggle_menu", False) keysym "game_menu" button: ypos 34 @@ -215,14 +215,14 @@ screen ui_menu(): textbutton "Save" action ShowMenu("save") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] textbutton "Load" action ShowMenu("load") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] if game.cheats and game.difficulty <= 2 and game.day > 1: - textbutton "Cheats" action [SetVariable("toggle_menu", False), Jump("cheats")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] + textbutton "Cheats" action [SetScreenVariable("toggle_menu", False), Jump("cheats")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] if game.day > 1 and renpy.android: textbutton "Preferences" action ShowMenu("preferences") background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] if game.day > 1 and persistent.game_complete: - textbutton "Gallery" action [SetVariable("toggle_menu", False), Jump("scene_gallery")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] + textbutton "Gallery" action [SetScreenVariable("toggle_menu", False), Jump("scene_gallery")] background None xalign 0.5 text_outlines [ (2, "#00000080", 1, 0) ] #if game.day > 1 and config.developer: - # textbutton "{size=-11}Show Chars{/size}" action [SetVariable("toggle_menu", False), Jump("summon_characters")] background "#000" + # textbutton "{size=-11}Show Chars{/size}" action [SetScreenVariable("toggle_menu", False), Jump("summon_characters")] background "#000" hbox: pos (50, 185)