From 683af5ae42c61b81d5f4771c2f93ac762a46ae05 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sun, 16 Jul 2023 22:17:58 +0100 Subject: [PATCH] Bug fix * Removed broke transition vpunch_repeat --- game/scripts/characters/cho/events/intro.rpy | 4 ++-- game/scripts/characters/tonks/events/hangout.rpy | 2 +- .../characters/tonks/events/requests/detention_with_tonks.rpy | 2 +- game/scripts/minigames/mirror/events/biggus_dickus.rpy | 2 +- game/scripts/minigames/mirror/events/panty_raid.rpy | 2 +- game/scripts/utility/transitions.rpy | 2 -- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index 7df96c8f..414c5d76 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -328,7 +328,7 @@ label cho_intro_E1: cho "*Hmph*... There's no argument here..." ("open", "narrow", "angry", "L") cho "I'm sure that Hermione's reasons for interrupting are totally valid..." ("upset", "narrow", "angry", "R") her "And I'm sure Cho wasn't just coming here to flaunt her body..." ("soft", "narrow", "base", "L") - cho "What's that supposed to mean?!?" ("clench", "narrow", "angry", "R", trans=vpunch_repeat) + cho "What's that supposed to mean?!?" ("clench", "narrow", "angry", "R", trans=vpunch) gen "(I guess I'll just have to wait this one out...)" ("base", xpos="far_left", ypos="head") # Black screen @@ -344,7 +344,7 @@ label cho_intro_E1: play sound "sounds/snore1.ogg" gen "*Snore*{w=2.0}{nw}" her "" ("annoyed", "narrow", "annoyed", "R") - cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R", trans=vpunch_repeat) + cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R", trans=vpunch) play sound "sounds/snore2.ogg" gen "......{w=0.5}*Snore*{w=1.0}{nw}" her "I had completely legitimate reasons for coming here..." ("soft", "closed", "base", "mid") diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index b2dea932..14101edc 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -199,7 +199,7 @@ label nt_he_firewhisky_E4: ton "*Gulp*{w=0.8}{nw}" ("scream", "closed", "worried", "mid") play sound "sounds/gulp.ogg" ton "*Gulp*{w=0.8}{nw}" ("scream", "closed", "worried", "mid") - ton "*Aaaaaaaahhhh!!!*..." ("silly", "closed", "base", "ahegao", trans=vpunch_repeat) + ton "*Aaaaaaaahhhh!!!*..." ("silly", "closed", "base", "ahegao", trans=vpunch) gen "....................." ("base", xpos="far_left", ypos="head") jump tonks_hangout_continue diff --git a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy index 6471747f..678253c4 100644 --- a/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy +++ b/game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy @@ -653,7 +653,7 @@ label nt_pr_teach_T2_E3: # Tier 2 - Event 3 - Slytherin boy ton "I demanded of him to start jacking it..." ("soft", "base", "annoyed", "mid") ton "It was actually pretty cute at first..." ("open", "closed", "base", "mid") ton "Then just as he was about to blow his load..." ("soft", "closed", "base", "mid") - ton "Boom! Petrficus Totalus!" ("scream", "shocked", "angry", "mid", trans=vpunch_repeat) + ton "Boom! Petrficus Totalus!" ("scream", "shocked", "angry", "mid", trans=vpunch) gen "{i}Petrifi{/i}-{w} {i}Petrifico{/i}?-{w} {i}Petrificato{/i}--" ("base", xpos="far_left", ypos="head") ton "I petrified him!" ("open", "wide", "angry", "mid") gen "*Ahh*..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/biggus_dickus.rpy b/game/scripts/minigames/mirror/events/biggus_dickus.rpy index c62332eb..70103374 100644 --- a/game/scripts/minigames/mirror/events/biggus_dickus.rpy +++ b/game/scripts/minigames/mirror/events/biggus_dickus.rpy @@ -226,7 +226,7 @@ label biggus_dickus: with kissiris pause .8 play background "sounds/sexloop.ogg" - her "*Ah*...{w=0.4} *Ah*...{w=0.4} *Ah*...{heart}{heart}{heart}" with vpunch_repeat + 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}" diff --git a/game/scripts/minigames/mirror/events/panty_raid.rpy b/game/scripts/minigames/mirror/events/panty_raid.rpy index ecd9eb48..070b15db 100644 --- a/game/scripts/minigames/mirror/events/panty_raid.rpy +++ b/game/scripts/minigames/mirror/events/panty_raid.rpy @@ -623,7 +623,7 @@ label panty_raid: play sound "sounds/giggle3.ogg" "Katie" "I'll take that as a yes. {heart}{heart}{heart}" play sound "sounds/jump_on_bed.ogg" - her "*Hmph{cps=10}hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh{/cps}*{nw}" with vpunch_repeat + her "*Hmph{cps=10}hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh{/cps}*{nw}" with vpunch pause 1.0 centered "{size=+7}{color=#cbcbcb}End of part three{/color}{/size}" jump panty_raid.choices diff --git a/game/scripts/utility/transitions.rpy b/game/scripts/utility/transitions.rpy index b2eb0b0f..cd2948af 100644 --- a/game/scripts/utility/transitions.rpy +++ b/game/scripts/utility/transitions.rpy @@ -29,7 +29,5 @@ define blackfade = Fade(0.9, 0.5, 1, color='#000000') define morph = ComposeTransition(Dissolve(0.9), before=Fade(0.1, 0.5, 0.5, color="#fff"), after=Dissolve(0.5)) define teleport = ImageDissolve("id_teleport.webp", 1.0, 0) -define vpunch_repeat = Move((0, 10), (0, -10), .5, bounce=True, repeat=True, delay=4.5) - define faderight = ImageDissolve("interface/transitions/faderight.webp", 1.0) define fadeleft = ImageDissolve("interface/transitions/faderight.webp", 1.0, reverse=True)