SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

Convert ball_hint to a screen variable

Browse Source 
no leak

(cherry picked from commit 4ec94d28f5)
This commit is contained in:
Gouvernathor 2023-11-15 00:17:26 +01:00 committed by LoafyLemon
parent 415c90d11c
commit f941b77409
2 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
game/scripts/interface/map.rpy
View File

File diff suppressed because it is too large Load Diff

33
game/scripts/rooms/main_room/objects/desk.rpy
View File

@ -34,9 +34,6 @@ label desk:
else: else:
jump main_room_menu jump main_room_menu
#Define hints variable
$ ball_hint = None
# TODO: Refactor. Low priority. # TODO: Refactor. Low priority.
call update_character_map_locations call update_character_map_locations
@ -148,6 +145,8 @@ screen desk_menu():
zorder 5 zorder 5
default ball_hint = None
#Background #Background
add "interface/desk/_bg_.webp" add "interface/desk/_bg_.webp"
@ -157,7 +156,7 @@ screen desk_menu():
# Ugly hands # Ugly hands
# add "interface/desk/_hands_.webp" xpos 0 ypos -30 # add "interface/desk/_hands_.webp" xpos 0 ypos -30
use crystal_ball use crystal_ball(ball_hint)
use watch use watch
#Book #Book
@ -169,9 +168,9 @@ screen desk_menu():
xalign 1.0 xalign 1.0
idle "interface/desk/book.webp" idle "interface/desk/book.webp"
hover "interface/desk/book_hover.webp" hover "interface/desk/book_hover.webp"
hovered SetVariable("ball_hint", "book") hovered SetScreenVariable("ball_hint", "book")
keysym "inventory" keysym "inventory"
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
action Return("inventory") action Return("inventory")
#Tissue Box #Tissue Box
@ -182,9 +181,9 @@ screen desk_menu():
xalign 1.0 xalign 1.0
idle "interface/desk/tissues.webp" idle "interface/desk/tissues.webp"
hover "interface/desk/tissues_hover.webp" hover "interface/desk/tissues_hover.webp"
hovered SetVariable("ball_hint", "jerk_off") hovered SetScreenVariable("ball_hint", "jerk_off")
keysym "fap" keysym "fap"
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
action Return("jerk_off") action Return("jerk_off")
#Work #Work
@ -195,9 +194,9 @@ screen desk_menu():
xalign 0.0 xalign 0.0
idle "interface/desk/work.webp" idle "interface/desk/work.webp"
hover "interface/desk/work_hover.webp" hover "interface/desk/work_hover.webp"
hovered SetVariable("ball_hint", "work") hovered SetScreenVariable("ball_hint", "work")
keysym "work" keysym "work"
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
action Return("paperwork") action Return("paperwork")
#Cards #Cards
@ -209,8 +208,8 @@ screen desk_menu():
yalign 1.0 yalign 1.0
idle "interface/desk/cards.webp" idle "interface/desk/cards.webp"
hover "interface/desk/cards_hover.webp" hover "interface/desk/cards_hover.webp"
hovered SetVariable("ball_hint", "cards") hovered SetScreenVariable("ball_hint", "cards")
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
action Return("deck_builder") action Return("deck_builder")
#exit #exit
@ -221,8 +220,8 @@ screen desk_menu():
ypos 600 ypos 600
idle "interface/desk/exit_mask.webp" idle "interface/desk/exit_mask.webp"
hover "interface/desk/exit.webp" hover "interface/desk/exit.webp"
hovered SetVariable("ball_hint", "exit") hovered SetScreenVariable("ball_hint", "exit")
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
action Return("Close") action Return("Close")
#Night Overlay #Night Overlay
@ -232,7 +231,7 @@ screen desk_menu():
use close_button use close_button
screen crystal_ball(): screen crystal_ball(ball_hint):
tag desk_interface tag desk_interface
zorder 8 zorder 8
@ -250,9 +249,9 @@ screen watch():
ypos 0 ypos 0
idle "interface/desk/watch.webp" idle "interface/desk/watch.webp"
hover "interface/desk/watch_hover.webp" hover "interface/desk/watch_hover.webp"
unhovered SetVariable("ball_hint", None) unhovered SetScreenVariable("ball_hint", None)
keysym "sleep" keysym "sleep"
hovered If(game.daytime, SetVariable("ball_hint", "doze_off"), SetVariable("ball_hint", "sleep")) hovered If(game.daytime, SetScreenVariable("ball_hint", "doze_off"), SetScreenVariable("ball_hint", "sleep"))
action If(game.daytime, Return("night_start"), Return("day_start")) action If(game.daytime, Return("night_start"), Return("day_start"))
$ watch_x = 603 +67 $ watch_x = 603 +67