From 1c813f5efb16da29d6a59266be51abcb87cf7094 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 24 Sep 2024 16:32:33 +0100 Subject: [PATCH] Bug fixes * Fixed teleport animation issues * Reimplemented and fixed 'centered' speaker * Removed menu yalign params (obsolete) * Reimplemented side image support for speakers * Fixed selected item usable state for non-owned items in inventory --- game/scripts/characters.rpy | 3 +++ .../astoria/events/spells/imperio_tonks.rpy | 2 +- game/scripts/characters/cho/events/intro.rpy | 2 +- .../cho/events/quidditch/hufflepuff_match.rpy | 4 +-- .../cho/events/quidditch/intros.rpy | 4 +-- .../cho/events/quidditch/retrospection.rpy | 2 +- .../cho/events/quidditch/slytherin_match.rpy | 10 ++++---- .../cho/events/quidditch/training.rpy | 2 +- .../cho/events/requests/manipulate_boys.rpy | 2 +- .../characters/hermione/events/tentacles.rpy | 4 +-- .../luna/events/favors/inspect_her_body.rpy | 4 +-- .../luna/events/favors/masturbate_for_me.rpy | 4 +-- game/scripts/characters/luna/events/intro.rpy | 4 +-- game/scripts/events/ending.rpy | 25 +++++++++---------- game/scripts/events/ending_after.rpy | 4 +-- game/scripts/events/labels.rpy | 8 +++--- game/scripts/events/map.rpy | 6 ++--- game/scripts/gui/say.rpy | 24 +++++++++++++++++- game/scripts/interface/inventory.rpy | 1 + game/scripts/interface/letter.rpy | 2 +- game/scripts/inventory/use_gifts.rpy | 4 +-- .../mirror/events/a_bad_time_to_disrobe.rpy | 6 ++--- .../mirror/events/a_christmas_tale.rpy | 2 +- .../mirror/events/a_christmas_tale2.rpy | 2 +- .../mirror/events/a_dark_room_NOT_IN_USE.txt | 12 ++++----- .../events/a_spaced_out_conversation.rpy | 4 +-- .../mirror/events/a_white_christmas.rpy | 2 +- .../mirror/events/an_odd_circumstance.rpy | 2 +- .../mirror/events/anal_pirate_event.rpy | 2 +- .../minigames/mirror/events/biggus_dickus.rpy | 6 ++--- .../mirror/events/blueballing_bad.rpy | 2 +- .../mirror/events/eating_for_pleasure.rpy | 6 ++--- .../mirror/events/genie_house_elf.rpy | 4 +-- .../mirror/events/genies_christmas_wish.rpy | 2 +- .../mirror/events/not_so_great_escape.rpy | 6 ++--- .../minigames/mirror/events/panty_raid.rpy | 20 +++++++-------- .../mirror/events/previously_at_hogwarts.rpy | 2 +- .../minigames/mirror/events/suck_and_run.rpy | 8 +++--- .../minigames/mirror/events/whose_points.rpy | 4 +-- game/scripts/utility/common_labels.rpy | 2 +- 40 files changed, 120 insertions(+), 95 deletions(-) diff --git a/game/scripts/characters.rpy b/game/scripts/characters.rpy index 61c18f75..3629117d 100644 --- a/game/scripts/characters.rpy +++ b/game/scripts/characters.rpy @@ -71,3 +71,6 @@ define dum2 = Character("name_dumbledore_genie", show_side_image=Image("characte define dum3 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_3.webp"), show_icon="dumbledore", dynamic=True) define dum4 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_4.webp"), show_icon="dumbledore", dynamic=True) define dum5 = Character("name_dumbledore_genie", show_side_image=Image("characters/misc/dumbledore/dum_5.webp"), show_icon="dumbledore", dynamic=True) + +define centered = Character(None, window_style="centered_window", statement_name="say-centered", screen="say_centered") +# define vcentered = Character(None, what_style="centered_vtext", window_style="centered_window", statement_name="say-centered", screen="say_centered") # Not in use, kept for reference diff --git a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy index ae9c3ace..533149fa 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy @@ -1709,7 +1709,7 @@ label ag_st_imperio_E5: ton "I..." ("open", "base", "worried", "down") gen "Say it!" ("angry", xpos="far_left", ypos="head") - menu (menu_yalign=0.7): + menu: "\"You're a selfish slut!\"": ton @ hair horny "Yes!" ("mad", "wide", "shocked", "stare") ton @ hair horny "I'm a selfish slut!" ("open_wide_tongue", "closed", "worried", "mid") diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index d2c31377..6bf0a641 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -336,7 +336,7 @@ label cho_intro_E1: call blkfade pause 2 - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." pause 1 call hide_blkfade diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 6f0c49e0..084b64fc 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -146,7 +146,7 @@ label hufflepuff_match: nar "Amazed... by the sight, Snape then leads you to the base of one of the towers." # Pitch entrance - centered "{size=+7}{color=#cbcbcb}At the Quidditch pitch...{/color}{/size}" + centered "At the Quidditch pitch..." call room("quidditch_pitch") play background "sounds/outskirts.ogg" fadein 2 @@ -722,7 +722,7 @@ label hufflepuff_match: call ctc her @ cheeks blush "" ("open", "wide", "worried", "shocked") - qcr "{shudder}!!!{/shudder}" + qcr "{shudder}!!!{/shudder}" play background "sounds/crowd.ogg" fadein 2 mal "..." play sound "sounds/murmur.ogg" diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 9bf69d95..15977479 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -200,7 +200,7 @@ label cho_quid_E2: if len(__chosen1) < 3: # needed because of the bld call bld - menu (menu_yalign=.8): + menu: set __chosen1 gen "Could you..." ("base", xpos="far_left", ypos="head") "\"Fly in front of me.\"": @@ -1315,7 +1315,7 @@ label cho_quid_E12: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}A few moments later...{/color}{/size}" + centered "A few moments later..." call gen_chibi(flip=False) hide screen blkfade diff --git a/game/scripts/characters/cho/events/quidditch/retrospection.rpy b/game/scripts/characters/cho/events/quidditch/retrospection.rpy index 50222a8d..bdd0721a 100644 --- a/game/scripts/characters/cho/events/quidditch/retrospection.rpy +++ b/game/scripts/characters/cho/events/quidditch/retrospection.rpy @@ -137,7 +137,7 @@ label cho_quid_E14_retrospection: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Few minutes into the game...{/color}{/size}" + centered "Few minutes into the game..." hide screen blkfade call gryffindor_match.introspection3 diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 0c8c6d1c..fd19b6f5 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -192,7 +192,7 @@ label slytherin_match: nar "You find Snape waiting for you at the entrance of the Quidditch pitch towers." # Pitch entrance - #centered "{size=+7}{color=#cbcbcb}At the Quidditch pitch...{/color}{/size}" + #centered "At the Quidditch pitch..." #TODO Weather effects: # Scene Cloudy/rainy pitch @@ -666,7 +666,7 @@ label slytherin_match: show screen blkfade with d1 - centered "{size=+7}{color=#cbcbcb}-\{Intermission\}-{/color}{/size}\n{size=-2}{color=#686868}Please stand by{/color}{/size}{w=5.0}{nw}" + centered "-\{Intermission\}-\n{size=-16}{color=#686868}Please stand by{/color}{/size}{w=5.0}{nw}" stop music fadeout 1 pause .5 @@ -719,7 +719,7 @@ label slytherin_match: sna "{size=-4}10 points to Slytherin.{/size}" ("snape_38") $ states.env.slytherin += 10 gen "Did you say something--" ("base", xpos="far_left", ypos="head") - + ton @ hair angry "{shudder}Quiet!{/shudder}" ("mad", "base", "angry", "L") gen "..." ("base", xpos="far_left", ypos="head") @@ -1345,7 +1345,7 @@ label slytherin_match: stop background fadeout 4 stop music fadeout 2 - centered "{size=+7}{color=#cbcbcb}After the game...{/color}{/size}" + centered "After the game..." hide screen blkfade with d5 @@ -1602,7 +1602,7 @@ label slytherin_match_return: ton "I tried to!" ("upset", "base", "worried", "mid") ton "You pretty much pushed me onto the podium when I got back..." ("open", "base", "worried", "mid") gen "Oh, yeah..." ("base", xpos="far_left", ypos="head") - ton "Would you like a show?" ("base", "wide", "annoyed", "mid") + ton "Would you like a show?" ("base", "wide", "annoyed", "mid") gen "What kind of show are we--" ("base", xpos="far_left", ypos="head") else: diff --git a/game/scripts/characters/cho/events/quidditch/training.rpy b/game/scripts/characters/cho/events/quidditch/training.rpy index a6ab835b..35414168 100644 --- a/game/scripts/characters/cho/events/quidditch/training.rpy +++ b/game/scripts/characters/cho/events/quidditch/training.rpy @@ -412,7 +412,7 @@ label cho_tactics: scene onlayer dolls call bld - menu (menu_yalign=.74): + menu: gen "(What directions should I give her?)" ("base", xpos="far_left", ypos="head") "\"Fly in front of me.\"" if states.cho.ev.quidditch.position != "front": jump cho_tactics.change_front diff --git a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy index e5784cda..0f92ac0e 100644 --- a/game/scripts/characters/cho/events/requests/manipulate_boys.rpy +++ b/game/scripts/characters/cho/events/requests/manipulate_boys.rpy @@ -957,7 +957,7 @@ label cc_pr_manipulate_boys_twins_branch: call blkfade stop music fadeout 1 - centered "{size=+7}{color=#cbcbcb}{cps=7}...{/cps}{/color}{/size}{w=1.0}{nw}" + centered "{cps=2}...{/cps}{w=1.0}{nw}" call room("clothing_store") play music "music/clothing_store.ogg" fadein 1 if_changed call hide_blkfade diff --git a/game/scripts/characters/hermione/events/tentacles.rpy b/game/scripts/characters/hermione/events/tentacles.rpy index bd4bb07c..f29dc5c7 100644 --- a/game/scripts/characters/hermione/events/tentacles.rpy +++ b/game/scripts/characters/hermione/events/tentacles.rpy @@ -179,7 +179,7 @@ label tentacle_scene_intro: stop music fadeout 3.0 show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}A few moments later...{/color}{/size}" + centered "A few moments later..." call gen_chibi("hide") $ desk_OBJ.foreground = "letter_and_plant_on_desk" hide screen blkfade @@ -251,7 +251,7 @@ label tentacle_scene_intro: pause 1.5 play sound "sounds/door.ogg" pause 1 - centered "{size=+7}{color=#cbcbcb}Herbology{/color}{/size}" + centered "Herbology" pause 1 play music "music/hidden-agenda-by-kevin-macleod.ogg" fadein 1 if_changed diff --git a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy index b2928869..0c858a04 100644 --- a/game/scripts/characters/luna/events/favors/inspect_her_body.rpy +++ b/game/scripts/characters/luna/events/favors/inspect_her_body.rpy @@ -1175,7 +1175,7 @@ label ll_pf_inspect_T2_E3_intro: hide luna_main hide cg - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." call lun_chibi("stand", "desk", "base") hide screen blkfade @@ -1437,7 +1437,7 @@ label ll_pf_inspect_T2_E4_repeat: nar "Luna, completely exhausted, slumps onto your desk once again." nar "You pull your chair back to give her some space." - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." call lun_chibi("stand", "desk", "base") diff --git a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy index 8f799e03..d4080125 100644 --- a/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy +++ b/game/scripts/characters/luna/events/favors/masturbate_for_me.rpy @@ -546,7 +546,7 @@ label ll_pf_masturbate_T3_E2_intro: nar "Luna slowly pulls her finger out and shudders slightly..." nar "She looks at her fingers, which glisten in the light, with a relieved expression on her face..." - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." # End of masturbate section @@ -741,7 +741,7 @@ label ll_pf_masturbate_T3_E3_intro: nar "Luna takes her fingers out, and looks up at you with a happy smile spread across her face..." gen "Well done [name_luna_genie]." - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." # End of masturbate section diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy index eca74867..4a8e90fa 100644 --- a/game/scripts/characters/luna/events/intro.rpy +++ b/game/scripts/characters/luna/events/intro.rpy @@ -239,7 +239,7 @@ label luna_intro_E1: gen "Uh-oh..." ("base", xpos="far_left", ypos="head") call blkfade hide pentogram onlayer screens - centered "{size=+7}{color=#cbcbcb}20 minutes later...{/color}{/size}" + centered "20 minutes later..." gen "*Ha-ha*... Good one! Alright, talk to you later, Beelzebub!" ("grin", xpos="far_left", ypos="head") "Beelzebub" "Ah, don't be so formal, just call me Bub." @@ -683,7 +683,7 @@ label luna_intro_E2: lun "I'm sorry, sir?" ("upset", "narrow", "base", "mid") gen "{bounce}*Sigh*{/bounce} I'm talking about the four-dimensional space, {size=-1}a mathematical{/size} {size=-2}extension of the concept{/size} {size=-3}of three-dimensional or 3D space.{/size} {size=-5}Three-dimensional space{/size}{size=-7} is the simplest possible abstraction of the observation that one only needs three numbers, called dimensions, to describe the sizes or locations of objects in the everyday world.{/size}{size=-10}For example, the volume of a rectangular box is found by measuring and multiplying its length, width, and height (often labeled x, y, and z)...{/size}" ("base", xpos="far_left", ypos="head") call blkfade - centered "{size=+7}{color=#cbcbcb}5 minutes later...{/color}{/size}" + centered "5 minutes later..." call hide_blkfade gen "...and this is how your glasses work, right?" ("base", xpos="far_left", ypos="head") lun "I... Maybe?" ("angry", "narrow", "base", "down") # Puzzled diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index 08990ba5..e4ab454e 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -308,7 +308,7 @@ label ball_ending_E1: stop weather # Outskirts of Hogwarts - centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}" + centered "Outskirts of Hogwarts" play background "sounds/night.ogg" fadein 1 @@ -347,21 +347,20 @@ label ball_ending_E1: play music "music/Plaint.ogg" fadein 1 fadeout 1 #SAD CREDITS MUSIC. if_changed - centered """{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n - {size=+5}{color=#cbcbcb}This is ending \"00\" out of \"02\".{/color}{/size}{#LINT_IGNORE}""" + centered "Congratulations on completing the game!\n\n{size=-16}This is ending \"00\" out of \"02\".{/size}{#LINT_IGNORE}" - centered "{size=+7}{color=#cbcbcb}Thank you for playing!{/color}{/size}\n\n{#LINT_IGNORE}" + centered "Thank you for playing!\n\n{#LINT_IGNORE}" play sound "sounds/scratch.ogg" stop music with hpunch gen "Wait, I'm still here!" ("angry", xpos="far_left", ypos="head") - centered "{size=+7}{color=#cbcbcb}WHAT?!{/color}{/size}" + centered "WHAT?!" gen "I said I am still here, dammit!" ("angry", xpos="far_left", ypos="head") - centered "{size=+7}{color=#cbcbcb}Oh... :({/color}{/size}{#LINT_IGNORE}" + centered "Oh... :({#LINT_IGNORE}" show her_ball outskirts -m1 as cg hide screen blkfade @@ -381,7 +380,7 @@ label ball_ending_E1: if not persistent.game_complete: # First play-through - centered "{size=+7}{color=#cbcbcb}Fine whatever...{/color}{/size}" + centered "Fine whatever..." jump ball_ending_E2 @@ -392,7 +391,7 @@ label ball_ending_E2: call blkfade play music "music/court-of-the-queen-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed - centered "{size=+7}{color=#cbcbcb}The Annual Hogwarts Autumn Ball{/color}{/size}" + centered "The Annual Hogwarts Autumn Ball" # Scene Setup $ states.env.daytime = True @@ -2642,7 +2641,7 @@ label ball_ending_E2: pause 1 stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}" + centered "Outskirts of Hogwarts" $ states.env.daytime = False @@ -2704,9 +2703,9 @@ label ball_ending_E2: stop background fadeout 1.0 if "public" in states.her.ev.yule_ball.variant: - centered "{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n{color=#cbcbcb}This is one of two possible endings (public whore){/color}" + centered "Congratulations on completing the game!\n\n{size=-16}This is one of two possible endings (public whore){/size}" else: - centered "{size=+7}{color=#cbcbcb}Congratulations on completing the game!{/color}{/size}\n\n{color=#cbcbcb}This is one of two possible endings (personal whore){/color}" + centered "Congratulations on completing the game!\n\n{size=-16}This is one of two possible endings (personal whore){/size}" show screen blkfade with d7 @@ -2717,7 +2716,7 @@ label ball_ending_E2: pause.5 # Dumbledore is back at Hogwarts - centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}" + centered "The next morning..." $ states.env.daytime = True @@ -2875,7 +2874,7 @@ Farewell, my little [word_03].{/size} play sound "sounds/win2.ogg" - centered "{color=#cbcbcb}This concludes the original Witch Trainer ending{fast}\n\n{size=+7}-\{Thank you for playing!\}-{/size}{/color}" + centered "{size=-16}This concludes the original Witch Trainer ending{/size}{fast}\n\n{size=+7}-\{Thank you for playing!\}-{/size}" pause 2 diff --git a/game/scripts/events/ending_after.rpy b/game/scripts/events/ending_after.rpy index 4f90a921..edd92a3e 100644 --- a/game/scripts/events/ending_after.rpy +++ b/game/scripts/events/ending_after.rpy @@ -10,7 +10,7 @@ label ending_after: $ renpy.scene("screens") - centered "{size=+7}{color=#cbcbcb}Somewhere outside of time and space...{/color}{/size}\n\n{#LINT_IGNORE}" + centered "Somewhere outside of time and space...\n\n{#LINT_IGNORE}" play music "music/epic-unease-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed # noloop pause 3 g2 "Where... where am I...?" with d5 @@ -193,7 +193,7 @@ label ending_after: $ states.env.daytime = True call music_block - centered "{size=+7}{color=#cbcbcb}The next morning...{/color}{/size}" + centered "The next morning..." call hide_blkfade # Snape enters and walks up to desk diff --git a/game/scripts/events/labels.rpy b/game/scripts/events/labels.rpy index 26b6d4f3..31d8af0a 100644 --- a/game/scripts/events/labels.rpy +++ b/game/scripts/events/labels.rpy @@ -144,7 +144,7 @@ label teleport(position=None,effect=True,poof_label=None): hide screen blkfade show heal_ani onlayer screens zorder teleport_zorder: anchor (0.5, 1.0) - pos teleport_pos + pos (teleport_xpos, teleport_ypos) zoom 0.5 with d3 @@ -155,11 +155,11 @@ label teleport(position=None,effect=True,poof_label=None): call expression poof_label show teleport_ani onlayer screens zorder teleport_zorder: anchor (0.5, 0.7) - pos teleport_pos + pos (teleport_xpos, teleport_ypos) zoom 0.5 with d5 - hide teleport_animation onlayer screens + hide teleport_ani onlayer screens with d5 if effect == True: @@ -172,4 +172,4 @@ default hermione_action = None label set_her_action(action=None, update=None): $ hermione_action = action - return \ No newline at end of file + return diff --git a/game/scripts/events/map.rpy b/game/scripts/events/map.rpy index b7ae26d3..a43d1a3b 100644 --- a/game/scripts/events/map.rpy +++ b/game/scripts/events/map.rpy @@ -170,7 +170,7 @@ label gryffindor_dormitories: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Gryffindor's Dormitory{/color}{/size}" + centered "Gryffindor's Dormitory" menu: "-Search the area-":#Cat Hair @@ -195,7 +195,7 @@ label ravenclaw_dormitories: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Ravenclaw's Dormitory{/color}{/size}" + centered "Ravenclaw's Dormitory" menu: "-Search the area-":#Luna's Hair @@ -259,7 +259,7 @@ label outskirts_of_hogwarts: stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}Outskirts of Hogwarts{/color}{/size}" + centered "Outskirts of Hogwarts" $ renpy.scene("screens") diff --git a/game/scripts/gui/say.rpy b/game/scripts/gui/say.rpy index 198580d0..cada75b1 100644 --- a/game/scripts/gui/say.rpy +++ b/game/scripts/gui/say.rpy @@ -23,7 +23,7 @@ screen nvl(dialogue, items=None): # config.all_character_callbacks.append(next_who) -screen say(who, what, side_doll=None, icon=None): +screen say(who, what, side_doll=None, side_image=None, icon=None): style_prefix "say" layer "interface" zorder 0 @@ -65,9 +65,23 @@ screen say(who, what, side_doll=None, icon=None): if side_doll: add side_doll + elif side_image: # Compat + add side_image zoom 0.5 align (0.0, 1.0) xoffset 16 else: add SideImage() +screen say_centered(who, what, icon=None): + style_prefix "say" + layer "interface" + zorder 0 + + window: + id "textbox" + xfill True + yfill True + + text what id "what" style "what_centered" + screen hider(): if states.settings.interface_hidden: button action ToggleVariable("states.settings.interface_hidden", True, False) style "empty" @@ -124,6 +138,14 @@ style what: size 24 justify True +style what_centered: + align (0.5, 0.5) + text_align 0.5 + color "#fff" + outlines [(2, "#000000", 1, 1)] + hinting "bytecode" + size 48 + style namebox: ysize 22 # Halved due to oversampling padding (32, 0, 32, 0) diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy index f423c353..5bf8a8ca 100644 --- a/game/scripts/interface/inventory.rpy +++ b/game/scripts/interface/inventory.rpy @@ -56,6 +56,7 @@ screen inventory(): textbutton selected_item.caption: if inventory_mode==0: + sensitive selected_item.owned action [selected_item.use, renpy.restart_interaction] elif inventory_mode==1: action Return(selected_item) diff --git a/game/scripts/interface/letter.rpy b/game/scripts/interface/letter.rpy index 056c8bc9..f856bd12 100644 --- a/game/scripts/interface/letter.rpy +++ b/game/scripts/interface/letter.rpy @@ -209,7 +209,7 @@ label letter(text, lbl): show screen letter(text) with d3 - menu (menu_yalign=.9): + menu: "-Done reading-": pass diff --git a/game/scripts/inventory/use_gifts.rpy b/game/scripts/inventory/use_gifts.rpy index 23159811..37204832 100644 --- a/game/scripts/inventory/use_gifts.rpy +++ b/game/scripts/inventory/use_gifts.rpy @@ -508,7 +508,7 @@ label hg_condom_balloon: call blkfade pause 2 - centered "{size=+7}{color=#cbcbcb}A couple of minutes later...{/color}{/size}" + centered "A couple of minutes later..." pause 1 call hide_blkfade @@ -633,7 +633,7 @@ label ll_condom_balloon: call blkfade pause 2 - centered "{size=+7}{color=#cbcbcb}A couple of minutes later...{/color}{/size}" + centered "A couple of minutes later..." pause 1 call hide_blkfade diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy index cc07e217..139178b2 100644 --- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy +++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy @@ -3,7 +3,7 @@ label a_bad_time_to_disrobe: with d5 - centered "{size=+7}{color=#cbcbcb}A bad time to disrobe{/color}{/size}" + centered "A bad time to disrobe" nar "In this story the genie has found an invisibility cloak." nar "And with the cloak come great opportunities." @@ -199,7 +199,7 @@ label a_bad_time_to_disrobe_part_1: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}End of part one.{/color}{/size}" + centered "End of part one." jump a_bad_time_to_disrobe.choices @@ -362,6 +362,6 @@ label a_bad_time_to_disrobe_part_2: call her_chibi("leave") call blkfade - centered "{size=+10}{color=#cbcbcb}The end{/color}{/size}" + centered "The end" jump a_bad_time_to_disrobe.choices diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy index c44481f8..cb7bd171 100644 --- a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy +++ b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy @@ -31,7 +31,7 @@ label a_christmas_tale: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}A Christmas tale{/color}{/size}" + centered "A Christmas tale" hide screen blkfade with d5 diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy index 2f45f2d6..0dc1b591 100644 --- a/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy +++ b/game/scripts/minigames/mirror/events/a_christmas_tale2.rpy @@ -41,7 +41,7 @@ label a_christmas_tale2(): show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Santa's Little Helper{/color}{/size}" + centered "Santa's Little Helper" hide screen blkfade with d5 diff --git a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt index fa0aef4b..829d6e7f 100644 --- a/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt +++ b/game/scripts/minigames/mirror/events/a_dark_room_NOT_IN_USE.txt @@ -32,7 +32,7 @@ label start_dark_room_game: call hide_screens pause 2 - centered "{size=+7}{color=#cbcbcb}A Dark Room{/color}{/size}" + centered "A Dark Room" pause 2 @@ -88,7 +88,7 @@ label dark_room_main: call weather_sound pause 2 - centered "{size=+7}{color=#cbcbcb}Day [DRstates.env.day]{/color}{/size}" + centered "Day [DRstates.env.day]" pause 1 label DRgame_resume: @@ -96,9 +96,9 @@ label dark_room_main: show screen blkfade with d5 pause 1 - centered "{size=+7}{color=#cbcbcb}Game Over...{/color}{/size}" + centered "Game Over..." pause 1 - centered "{size=+7}{color=#cbcbcb}You made it to day [DRstates.env.day]!{/color}{/size}" + centered "You made it to day [DRstates.env.day]!" pause 1 jump dark_room_game_start_menu @@ -138,9 +138,9 @@ label dark_room_main: show screen blkfade with d5 pause 1 - centered "{size=+7}{color=#cbcbcb}Game Over...{/color}{/size}" + centered "Game Over..." pause 1 - centered "{size=+7}{color=#cbcbcb}You made it to day [DRstates.env.day]!{/color}{/size}" + centered "You made it to day [DRstates.env.day]!" pause 1 jump dark_room_game_start_menu diff --git a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy index 05aa7657..b14ac51a 100644 --- a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy +++ b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy @@ -13,7 +13,7 @@ label a_spaced_out_conversation: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}A spaced out conversation.{/color}{/size}" + centered "A spaced out conversation." hide screen blkfade with d5 @@ -211,7 +211,7 @@ label a_spaced_out_conversation: stop music fadeout 3.0 - centered "{size=+7}{color=#cbcbcb}The end.{/color}{/size}" + centered "The end." $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy index 327d781a..5c47083c 100644 --- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy +++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy @@ -49,7 +49,7 @@ label a_white_christmas: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}A white Christmas{/color}{/size}" + centered "A white Christmas" hide screen blkfade with d5 diff --git a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy index b05617cc..5482c99d 100644 --- a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy +++ b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy @@ -22,7 +22,7 @@ label an_odd_circumstance: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}An odd circumstance{/color}{/size}" + centered "An odd circumstance" hide screen blkfade show layer screens at sepia diff --git a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy index 00ad4b67..ac759516 100644 --- a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy +++ b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy @@ -10,7 +10,7 @@ label anal_pirate_event: # TODO: Add pirate outfit with d5 - centered "{size=+7}{color=#cbcbcb}Booty at sea{/color}{/size}" + centered "Booty at sea" "This story is a rewrite of the \"Time for anal\" personal favour. And the genie is a pirate? Who knows... Enjoy." diff --git a/game/scripts/minigames/mirror/events/biggus_dickus.rpy b/game/scripts/minigames/mirror/events/biggus_dickus.rpy index b56b680f..da498e4c 100644 --- a/game/scripts/minigames/mirror/events/biggus_dickus.rpy +++ b/game/scripts/minigames/mirror/events/biggus_dickus.rpy @@ -11,7 +11,7 @@ label biggus_dickus: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Biggus Dickus{/color}{/size}" + centered "Biggus Dickus" hide screen blkfade with d5 @@ -98,7 +98,7 @@ label biggus_dickus: show screen blkfade with d3 - centered "{size=+7}{color=#cbcbcb}One hefty purchase and a day later...{/color}{/size}" + centered "One hefty purchase and a day later..." hide screen blkfade with d3 @@ -228,7 +228,7 @@ label biggus_dickus: play background "sounds/sexloop.ogg" her "*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*...{heart}{heart}{heart}" with vpunch pause 1 - centered "{size=+7}{color=#cbcbcb}The end{/color}{/size}" + centered "The end" $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/blueballing_bad.rpy b/game/scripts/minigames/mirror/events/blueballing_bad.rpy index b74145b3..5b4c9990 100644 --- a/game/scripts/minigames/mirror/events/blueballing_bad.rpy +++ b/game/scripts/minigames/mirror/events/blueballing_bad.rpy @@ -12,7 +12,7 @@ label blueballing_bad: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Blueballing Bad{/color}{/size}" + centered "Blueballing Bad" nar "In an alternate universe, Genie, wanting to go back to Agrabah, never took any risks to keep his cover as the Headmaster of Hogwarts..." nar "And stopped being a pervert." diff --git a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy index 577d551c..a708d756 100644 --- a/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy +++ b/game/scripts/minigames/mirror/events/eating_for_pleasure.rpy @@ -14,7 +14,7 @@ label eating_for_pleasure: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Eating for Pleasure{/color}{/size}" + centered "Eating for Pleasure" narrator "This story is best played when drunk...{w=0.4} or not at all...{w=0.4} it's the worst...{w=0.4} enjoy!" @@ -199,7 +199,7 @@ label eating_for_pleasure: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." call gen_chibi("sit_behind_desk") @@ -282,7 +282,7 @@ label eating_for_pleasure: hat "By Merlins beard, that's disgusting!" "Genie" "Shut up hat! Don't judge me!" - centered "{size=+7}{color=#cbcbcb}{cps=1}...{/cps}End?{/color}{/size}" + centered "{cps=1}...{/cps}End?" $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/genie_house_elf.rpy b/game/scripts/minigames/mirror/events/genie_house_elf.rpy index e57809ba..6a1d9603 100644 --- a/game/scripts/minigames/mirror/events/genie_house_elf.rpy +++ b/game/scripts/minigames/mirror/events/genie_house_elf.rpy @@ -11,7 +11,7 @@ label genie_house_elf: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}The Genie, the Desk and the Door{/color}{/size}" #Play on "The Lion, the Witch and the Wardrobe" + centered "The Genie, the Desk and the Door" #Play on "The Lion, the Witch and the Wardrobe" hide screen blkfade with d5 @@ -86,6 +86,6 @@ label genie_house_elf: call blkfade - centered "{size=+7}{color=#cbcbcb}The end{/color}{/size}" + centered "The end" $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy index dbe5d8ed..8c7b7d80 100644 --- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy +++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy @@ -38,7 +38,7 @@ label genies_christmas_wish: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Genie's Christmas Wish{/color}{/size}" + centered "Genie's Christmas Wish" hide screen blkfade with d5 diff --git a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy index f7fac54d..7842acca 100644 --- a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy +++ b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy @@ -58,7 +58,7 @@ label not_so_great_escape: $ candleL_OBJ.get_action()() $ candleR_OBJ.get_action()() - centered "{size=+7}{color=#cbcbcb}A not so great escape{/color}{/size}" + centered "A not so great escape" hide screen blkfade with d5 @@ -270,7 +270,7 @@ label not_so_great_escape: show screen blkfade with d3 - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." $ luna_chibi.zorder = 3 $ cho_chibi.zorder = 1 @@ -466,6 +466,6 @@ label not_so_great_escape: ton "{bounce}*Sigh*{/bounce} He'll be fine..." ("soft", "closed", "base", "mid", xpos="mid", ypos="base", trans=d5) call blkfade - centered "{size=+10}{color=#cbcbcb}Happy Halloween!{/color}{/size}" + centered "Happy Halloween!" $ renpy.end_replay() diff --git a/game/scripts/minigames/mirror/events/panty_raid.rpy b/game/scripts/minigames/mirror/events/panty_raid.rpy index 073cc057..3ca32c7e 100644 --- a/game/scripts/minigames/mirror/events/panty_raid.rpy +++ b/game/scripts/minigames/mirror/events/panty_raid.rpy @@ -3,7 +3,7 @@ label panty_raid: with d5 - centered "{size=+7}{color=#cbcbcb}Panty Raid{/color}{/size}\n\n{color=#cbcbcb}Based on a story written by {size=+4}WaxerRed{/size}\n{size=-4}Proofreading & Editing by Lineup, Johnny and LoafyLemon\nImplementation by Lineup and LoafyLemon{/size}{/color}" + centered "Panty Raid\n\n{color=#cbcbcb}{size=-16}Based on a story written by WaxerRed\nProofreading & Editing by Lineup, Johnny and LoafyLemon\nImplementation by Lineup and LoafyLemon{/size}{/color}" label .choices: @@ -118,7 +118,7 @@ label panty_raid: with d3 stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}Three hours later...{/color}{/size}" + centered "Three hours later..." $ states.env.daytime = False call music_block @@ -229,7 +229,7 @@ label panty_raid: show screen blkfade with d3 stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}End of part one{/color}{/size}" + centered "End of part one" jump panty_raid.choices if pathvalue == 1: @@ -292,7 +292,7 @@ label panty_raid: show screen blkfade with d3 stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}Four hours later...{/color}{/size}" + centered "Four hours later..." $ states.env.daytime = False call music_block @@ -384,7 +384,7 @@ label panty_raid: stop music fadeout 1.0 call gen_chibi("sit_behind_desk") - centered "{size=+7}{color=#cbcbcb}End of part two{/color}{/size}" + centered "End of part two" jump panty_raid.choices elif pathvalue == 2: @@ -426,7 +426,7 @@ label panty_raid: call blkfade stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}A few hours later...{/color}{/size}" + centered "A few hours later..." $ states.env.daytime = False call music_block @@ -625,12 +625,12 @@ label panty_raid: play sound "sounds/jump_on_bed.ogg" her "*Hmph{cps=10}hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh{/cps}*{nw}" with vpunch pause 1.0 - centered "{size=+7}{color=#cbcbcb}End of part three{/color}{/size}" + centered "End of part three" jump panty_raid.choices elif pathvalue == 3: # Part 4 - centered "{size=+7}{color=#cbcbcb}A couple of months after the \"linguistics\" incident...{/color}{/size}" + centered "A couple of months after the \"linguistics\" incident..." call hide_blkfade pause 1.0 @@ -669,7 +669,7 @@ label panty_raid: call blkfade stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}Some time later...{/color}{/size}" + centered "Some time later..." $ states.env.daytime = False call music_block @@ -742,5 +742,5 @@ label panty_raid: stop music fadeout 5.0 call gen_chibi("sit_behind_desk") - centered "{size=+7}{color=#cbcbcb}End of part four{/color}{/size}" + centered "End of part four" jump panty_raid.choices diff --git a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy index 9bb478c2..62a8a065 100644 --- a/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy +++ b/game/scripts/minigames/mirror/events/previously_at_hogwarts.rpy @@ -14,7 +14,7 @@ label prev_at_hogwarts: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}Previously, at Hogwarts{w=1.0}\nschool of Witchcraft and Wizardry...{/color}{/size}" + centered "Previously, at Hogwarts,\nthe school of Witchcraft and Wizardry..." play music "music/Brittle Rille.ogg" fadein 1 if_changed hide screen blkfade diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy index d1d63f38..144d293a 100644 --- a/game/scripts/minigames/mirror/events/suck_and_run.rpy +++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy @@ -8,7 +8,7 @@ label suck_and_run_rewards: label suck_and_run: with d5 - centered "{size=+7}{color=#cbcbcb}Suck & Run{/color}{/size}" + centered "Suck & Run" label .choices: @@ -90,7 +90,7 @@ label suck_and_run: stop music fadeout 1.0 hide screen with_snape - centered "{size=+7}{color=#cbcbcb}End of part one{/color}{/size}" + centered "End of part one" jump suck_and_run.choices @@ -173,7 +173,7 @@ label suck_and_run: stop music fadeout 1.0 hide screen with_tonks_animated - centered "{size=+7}{color=#cbcbcb}End of part two{/color}{/size}" + centered "End of part two" jump suck_and_run.choices @@ -361,6 +361,6 @@ label suck_and_run: show screen blkfade with d3 stop music fadeout 1.0 - centered "{size=+7}{color=#cbcbcb}End of part three{/color}{/size}" + centered "End of part three" jump suck_and_run.choices diff --git a/game/scripts/minigames/mirror/events/whose_points.rpy b/game/scripts/minigames/mirror/events/whose_points.rpy index 3ea9999c..10d7f9df 100644 --- a/game/scripts/minigames/mirror/events/whose_points.rpy +++ b/game/scripts/minigames/mirror/events/whose_points.rpy @@ -21,7 +21,7 @@ label whose_points: $ luna.zorder = 16 $ astoria.zorder = 14 - centered "{size=+7}{color=#cbcbcb}Whose points is it anyway?{/color}{/size}" + centered "Whose points is it anyway?" show screen whose_points_screen hide screen blkfade @@ -236,7 +236,7 @@ label whose_points: show screen blkfade with d5 - centered "{size=+7}{color=#cbcbcb}To be continued?{/color}{/size}" + centered "To be continued?" $ renpy.end_replay() diff --git a/game/scripts/utility/common_labels.rpy b/game/scripts/utility/common_labels.rpy index 52faf898..fdef3949 100644 --- a/game/scripts/utility/common_labels.rpy +++ b/game/scripts/utility/common_labels.rpy @@ -74,7 +74,7 @@ label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"): show screen blktone with d3 - menu (menu_yalign=.75): + menu: "[text]" "-Done Reading-": pass