diff --git a/game/images/interface/wheelmenu/wheelmenu_astoria.png b/game/images/interface/wheelmenu/wheelmenu_astoria.png new file mode 100644 index 00000000..d7488e16 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_astoria.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08ce5a05ea1c94868bc69e854f51dcfe8c5d21edf6de9f765127c8af034062f5 +size 172541 diff --git a/game/images/interface/wheelmenu/wheelmenu_cho.png b/game/images/interface/wheelmenu/wheelmenu_cho.png new file mode 100644 index 00000000..f57f1f64 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_cho.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:251bbb694c85e7644f114e3fe3b5817c6cf6a7671876d29bd8ede5c9cdf7bbf5 +size 165948 diff --git a/game/images/interface/wheelmenu/wheelmenu_hermione.png b/game/images/interface/wheelmenu/wheelmenu_hermione.png new file mode 100644 index 00000000..6dbf2ab6 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_hermione.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae7472dadd6601ee598097f02e9a8b897fcfba94e008e37166a58f5b0f3b5b0 +size 220602 diff --git a/game/images/interface/wheelmenu/wheelmenu_luna.png b/game/images/interface/wheelmenu/wheelmenu_luna.png new file mode 100644 index 00000000..c2132e3d --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_luna.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:543a9b9cd0e9ebef2cb89d3dbbb5f00a659fbc032c00bd81c39e7adaf19f759f +size 261038 diff --git a/game/images/interface/wheelmenu/wheelmenu_snape.png b/game/images/interface/wheelmenu/wheelmenu_snape.png new file mode 100644 index 00000000..08d350c6 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_snape.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d39c70261eda9a81cf25929cbd06682b1a6b734832ee2fb0a157444f77798e2 +size 145808 diff --git a/game/images/interface/wheelmenu/wheelmenu_susan.png b/game/images/interface/wheelmenu/wheelmenu_susan.png new file mode 100644 index 00000000..6291015e --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_susan.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89d22f43a2daf7096e9b8ab1de28f9b168c05c8d69deb5642a11a81bf2b4f857 +size 162294 diff --git a/game/images/interface/wheelmenu/wheelmenu_tonks.png b/game/images/interface/wheelmenu/wheelmenu_tonks.png new file mode 100644 index 00000000..e1e53e84 --- /dev/null +++ b/game/images/interface/wheelmenu/wheelmenu_tonks.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:028f16b1c2ee739af21da0515379cd2d28b1d94b6a97a4c011187946aa7d79fd +size 237719 diff --git a/game/scripts/gui/_styles_.rpy b/game/scripts/gui/_styles_.rpy index ae89c717..85eab8e9 100644 --- a/game/scripts/gui/_styles_.rpy +++ b/game/scripts/gui/_styles_.rpy @@ -117,10 +117,11 @@ style vslider: # Button style imagemap: - activate_sound "sounds/click3.ogg" + activate_sound "sounds/qubodup-click2.ogg" style button: - activate_sound "sounds/click3.ogg" + activate_sound "sounds/qubodup-click1.ogg" + hover_sound "sounds/qubodup-hover1.ogg" insensitive_background "#463b3be6" selected_background "#766a6ae6" padding (5, 5, 5, 5) diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy index d58bea62..840aeff0 100644 --- a/game/scripts/gui/say.rpy +++ b/game/scripts/gui/say.rpy @@ -122,7 +122,8 @@ screen quick_menu(): textbutton _("Preferences") action ShowMenu("preferences") style quick_button is default: - activate_sound "sounds/click3.ogg" + activate_sound "sounds/qubodup-click2.ogg" + hover_sound "sounds/qubodup-hover2.ogg" background None xpadding 8 ypadding 8 @@ -241,7 +242,8 @@ style light_disabled_menu_text: color "#ae9566" style menu_button is default: - activate_sound "sounds/click3.ogg" + activate_sound "sounds/qubodup-click1.ogg" + hover_sound "sounds/qubodup-hover1.ogg" style dark_menu_button: background "#5d5151e6" diff --git a/game/scripts/interface/screens.rpy b/game/scripts/interface/screens.rpy index 54033ea8..9da22fe7 100644 --- a/game/scripts/interface/screens.rpy +++ b/game/scripts/interface/screens.rpy @@ -48,8 +48,6 @@ screen close_button(xoffset=0, yoffset=0, action=Return("Close"), key=["game_men key key action action - - screen close_button_background(action=Return("Close"), keysym=None): # Restore menu access if we're leaving nested context diff --git a/game/scripts/interface/wheelmenu.rpy b/game/scripts/interface/wheelmenu.rpy index 18002d39..0bc26ad9 100644 --- a/game/scripts/interface/wheelmenu.rpy +++ b/game/scripts/interface/wheelmenu.rpy @@ -41,6 +41,9 @@ init python: for name, (displayable, action, condition) in elements.items(): condition = eval(condition) + if not condition: + continue + buttons.append(wheelmenu.button(displayable, action, condition, tooltip=name)) positions = wheelmenu.pos(len(buttons)) @@ -50,6 +53,7 @@ init python: config.per_frame_screens.append("wheelmenu") label wheelmenu(btns, ret, pos=None): + play sound "sounds/qubodup-click1.ogg" call screen wheelmenu(btns, pos) jump expression ret @@ -75,7 +79,7 @@ screen wheelmenu(btns, pos): add "wheelmenu_genie" align (0.5, 0.5) at transform: subpixel True xysize (48, 48) - yzoom (-1 if mpos[0] > start_pos[0] else 1) + yzoom (1 if mpos[0] < start_pos[0] else -1) rotate (math.degrees(math.atan2(mpos[1] - start_pos[1], mpos[0] - start_pos[0])) + 360) % 360 - 180 style wheelmenu_window is empty: @@ -86,6 +90,8 @@ style wheelmenu_window is empty: style wheelmenu_button is empty: background Transform("wheelmenu_button", xysize=(48,48)) hover_background At(Transform("wheelmenu_button_opaque", xysize=(48,48)), wheelmenu_hover_anim) + hover_sound "sounds/qubodup-hover1.ogg" + activate_sound "sounds/qubodup-click2.ogg" xysize (48, 48) anchor (0.5, 0.5) diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy index 2a10ba47..73bae1e5 100644 --- a/game/scripts/rooms/main_room/init.rpy +++ b/game/scripts/rooms/main_room/init.rpy @@ -1,7 +1,17 @@ default main_room = Room("main_room", "main_room_menu") default fireplace_OBJ = RoomObject(main_room, "fireplace", pos=(693, 277), idle="fireplace_idle_shadow", focus_mask="fireplace_hover", foreground=None, action=Jump("fireplace"), tooltip="Light/Extinguish") -default cupboard_OBJ = RoomObject(main_room, "cupboard", pos=(260, 280), idle="cupboard_idle", action=Jump("cupboard"), tooltip="Rummage") +default cupboard_OBJ = RoomObject( + main_room, + "cupboard", + pos=(260, 280), + idle="cupboard_idle", + action={ + "Open Inventory": (Text("🎒", align=(0.5, 0.5)), Jump("inventory"), "True"), + "Rummage": (Text("🖐ī¸", align=(0.5, 0.5)), Jump("cupboard"), "True") + }, + tooltip="Cupboard" +) default phoenix_OBJ = RoomObject( main_room, "phoenix", pos=(557, 272), @@ -15,7 +25,24 @@ default phoenix_OBJ = RoomObject( }, tooltip="Phoenix" ) -default door_OBJ = RoomObject(main_room, "door", pos=(898, 315), idle="door_idle", focus_mask="door_hover", action=Jump("door"), tooltip="Door") +default door_OBJ = RoomObject( + main_room, + "door", + pos=(898, 315), + idle="door_idle", + focus_mask="door_hover", + action={ + "Summon Snape": (Transform("wheelmenu_snape", align=(0.5, 0.5), xysize=(32, 32)), If(states.sna.busy, None, Jump("summon_snape")), "states.sna.unlocked"), + "Summon Tonks": (Transform("wheelmenu_tonks", align=(0.5, 0.5), xysize=(32, 32)), If(states.ton.busy, None, Jump("summon_tonks")), "states.ton.unlocked"), + "Summon Hermione": (Transform("wheelmenu_hermione", align=(0.5, 0.5), xysize=(32, 32)), If(states.her.busy, None, Jump("summon_hermione")), "states.her.unlocked"), + "Summon Cho": (Transform("wheelmenu_cho", align=(0.5, 0.5), xysize=(32, 32)), If(states.cho.busy, None, Jump("summon_cho")), "states.cho.unlocked"), + "Summon Luna": (Transform("wheelmenu_luna", align=(0.5, 0.5), xysize=(32, 32)), If(states.lun.busy, None, Jump("summon_luna")), "states.lun.unlocked"), + "Summon Astoria": (Transform("wheelmenu_astoria", align=(0.5, 0.5), xysize=(32, 32)), If(states.ast.busy, None, Jump("summon_astoria")), "states.ast.unlocked"), + "Summon Susan": (Transform("wheelmenu_susan", align=(0.5, 0.5), xysize=(32, 32)), If(states.sus.busy, None, Jump("summon_susan")), "states.sus.unlocked"), + "Exit": (Text("đŸšĒ", align=(0.5, 0.5)), Jump("desk"), "states.map.unlocked"), + }, + tooltip="Door" +) default candleL_OBJ = RoomObject(main_room, "candle_left", pos=(350, 160), idle="candle_left", foreground=None, action=ToggleVariable("candleL_OBJ.foreground", "candle_fire", None), zorder=3) default candleR_OBJ = RoomObject(main_room, "candle_right", pos=(833, 225), idle="candle_right", foreground=None, action=ToggleVariable("candleR_OBJ.foreground", "candle_fire", None), zorder=3) default desk_OBJ = RoomObject( @@ -28,7 +55,6 @@ default desk_OBJ = RoomObject( "Sleep": (Text("💤", align=(0.5, 0.5)), If(game.daytime, Return("night_start"), Return("day_start")), "True"), "Jerk Off": (Text("🍆", align=(0.5, 0.5)), Jump("jerk_off"), "True"), "Do Paperwork": (Text("📝", align=(0.5, 0.5)), Jump("paperwork"), "True"), - "Open Inventory": (Text("🎒", align=(0.5, 0.5)), Jump("inventory"), "True"), "Open Deck Builder": (Text("🃏", align=(0.5, 0.5)), Jump("deck_builder"), "states.cardgame.unlocked"), "Open Cheats Menu": (Text("🕹ī¸", align=(0.5, 0.5)), Jump("cheats"), "game.cheats"), }, diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index 5754d2d9..1a82deb4 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -909,7 +909,8 @@ style wardrobe_window is empty style wardrobe_button is empty: foreground None hover_foreground "#ffffff80" - activate_sound "sounds/click.ogg" + activate_sound "sounds/qubodup-click1.ogg" + hover_sound "sounds/qubodup-hover1.ogg" style wardrobe_button_text: color "#fff" diff --git a/game/sounds/qubodup-click1.ogg b/game/sounds/qubodup-click1.ogg new file mode 100644 index 00000000..2d54d3ec --- /dev/null +++ b/game/sounds/qubodup-click1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a49eb79a424b150652520e83096312e99cd7cd21ca02df3f331c66771fe46d5 +size 5819 diff --git a/game/sounds/qubodup-click2.ogg b/game/sounds/qubodup-click2.ogg new file mode 100644 index 00000000..ee5d3458 --- /dev/null +++ b/game/sounds/qubodup-click2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8da362e84c396f4a9cdece152acc171016c92ff374867c8d40a96bd1c725e523 +size 5796 diff --git a/game/sounds/qubodup-hover1.ogg b/game/sounds/qubodup-hover1.ogg new file mode 100644 index 00000000..117e5d42 --- /dev/null +++ b/game/sounds/qubodup-hover1.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d4c8200defc4d2f12bf9978edd410bdc587a039a1af1259f10017558a54246 +size 5050 diff --git a/game/sounds/qubodup-hover2.ogg b/game/sounds/qubodup-hover2.ogg new file mode 100644 index 00000000..46ebf933 --- /dev/null +++ b/game/sounds/qubodup-hover2.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de9b46d619a2918ddcfc823b41ecec93aa72bf8c42c11ea1d36d653b31acdc87 +size 5473