From 1d1d2ed0f786059d598bd4cfe407cb9007ac22c0 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Fri, 17 May 2024 14:20:23 +0100 Subject: [PATCH] Recalculate missed positions --- .../cho/events/quidditch/gryffindor_match.rpy | 10 +++---- .../cho/events/quidditch/hufflepuff_match.rpy | 30 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 2c01cd14..07698537 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -1933,7 +1933,7 @@ label gryffindor_match_return: gen "So, what can I do you for? It's not often that three teachers enter my office at the same time." ("base", xpos="far_left", ypos="head") hoo "Yes, unfortunately it can't be helped, a very serious matter regarding the finals has come up." ("normal", "base", "shocked", "mid") gen "Oh?" ("base", xpos="far_left", ypos="head") - ton "" ("normal", "base", "base", "mid", xpos=460, ypos="base") + ton "" ("normal", "base", "base", "mid", xpos=1218, ypos="base") gen "That Potter boy didn't die, did he?" ("base", xpos="far_left", ypos="head") hoo "Who?" ("open", "base", "raised", "mid") ton "The Gryffindor seeker who crashed into one of the confectionery carts." ("open", "base", "base", "R") @@ -2133,8 +2133,8 @@ label gryffindor_match_return: hide snape_main with fade - ton "Calm down Severus... Accidents happen." ("soft", "narrow", "shocked", "mid", xpos=460, ypos="base", trans=d3) - sna "No, you did that on purpose!" ("snape_17", xpos=200, ypos="base", trans=d3) + ton "Calm down Severus... Accidents happen." ("soft", "narrow", "shocked", "mid", xpos=1218, ypos="base", trans=d3) + sna "No, you did that on purpose!" ("snape_17", xpos=756, ypos="base", trans=d3) ton "Don't be silly, I have no reason to get involved with your silly little bets." ("base", "narrow", "base", "R") sna "*Grr*... I'll be in my office." ("snape_16") @@ -2143,7 +2143,7 @@ label gryffindor_match_return: play sound "sounds/MaleClearThroat.ogg" gen "Forgetting something?" ("base", xpos="far_left", ypos="head") - sna "*Breathing heavily*" ("snape_43", xpos=460, ypos="base", trans=d3, flip=True) + sna "*Breathing heavily*" ("snape_43", xpos=1218, ypos="base", trans=d3, flip=True) gen "Show me the--" ("grin", xpos="far_left", ypos="head") #Snape walks to desk @@ -2152,7 +2152,7 @@ label gryffindor_match_return: play sound "sounds/money_thud.ogg" $ states.env.gold += 2000 - sna "Here, now shut...{w=0.2} Up!" ("snape_17", xpos=200, ypos="base", trans=d3, flip=False) + sna "Here, now shut...{w=0.2} Up!" ("snape_17", xpos=756, ypos="base", trans=d3, flip=False) call sna_walk(action="leave", speed=1.5) play sound "sounds/kick.ogg" with hpunch diff --git a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy index 8e469c96..1c17b128 100644 --- a/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy @@ -211,7 +211,7 @@ label hufflepuff_match: # Podium: call gen_chibi("stand", 280, 400, flip=True) ### Hermione Postions ### - ## Sprite: her "" (flip=True, xpos=290, ypos="base") + ## Sprite: her "" (flip=True, xpos=916, ypos="base") # Second Step Mid: call her_chibi("stand", 40, 295, flip=True) # Floor Mid: call her_chibi("stand", flip=True, 180, 400) # Podium: call her_chibi("stand", 300, 400, flip=True) @@ -226,7 +226,7 @@ label hufflepuff_match: # Sitting: call ton_chibi("sit", flip=True, xpos=-140, ypos=125) ### Cho Positions ### - ## Flying Sprite: call cho_main(xpos=580, ypos=-200) + ## Flying Sprite: call cho_main(xpos=1431, ypos=-200) # Flying Chibi: call cho_chibi("fly", 530, 360) $ snape_chibi.zorder = 2 @@ -278,7 +278,7 @@ label hufflepuff_match: call her_chibi("stand", 300, 400, flip=True) # Temp Bugfix pause .5 - her "Good Morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d3) + her "Good Morning everyone, and welcome to the i-inaugural--" ("soft", "base", "worried", "mid", flip=True, xpos=916, ypos="base", trans=d3) her "" ("normal", "base", "worried", "mid") sna "Speak up girl! And would it kill you to enunciate?!" ("snape_03", ypos="head") her "*Grrr*" ("mad", "narrow", "angry", "R") @@ -364,7 +364,7 @@ label hufflepuff_match: show screen blktone with d5 pause 1.0 - gen "" ("base", xpos=0, ypos="base") + gen "" ("base", xpos="far_left", ypos="base") show genie zorder states.gen.image.zorder with d3 pause 2.0 @@ -586,7 +586,7 @@ label hufflepuff_match: with d3 pause .8 - her "Ugh... thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=290, ypos="base", trans=d3) + her "Ugh... thank you for that, professor Dumbledore..." ("soft", "narrow", "base", "R_soft", flip=True, xpos=916, ypos="base", trans=d3) her "Now, to get this game underway!" ("open", "closed", "base", "mid") # Player introduction @@ -628,7 +628,7 @@ label hufflepuff_match: with d3 pause .1 - her "It appears we've got an interesting game ahead of us." ("open", "base", "base", "mid", flip=True, xpos=290, ypos="base", trans=d3) + her "It appears we've got an interesting game ahead of us." ("open", "base", "base", "mid", flip=True, xpos=916, ypos="base", trans=d3) her "If I'm not mistaken, there's some history between our seekers, Cho Chang and Cedric Diggory..." ("crooked_smile", "closed", "base", "mid") her "" ("smile", "happy", "base", "mid_soft") nar "Even though they are far down below on the pitch, you can clearly see Cho and Cedric glaring up at Hermione." @@ -649,7 +649,7 @@ label hufflepuff_match: play sound "sounds/sniff.ogg" her "..." play background "sounds/wind_long_loop.ogg" fadein 2 - her "The capturing of the snitch is worth 150 points--" ("open", "narrow", "base", "down", flip=True, xpos=290, ypos="base", trans=d3) + her "The capturing of the snitch is worth 150 points--" ("open", "narrow", "base", "down", flip=True, xpos=916, ypos="base", trans=d3) call quidditch_stands(crowd_react=["th", None, None]) with d3 @@ -671,7 +671,7 @@ label hufflepuff_match: mal2 "Yeah! Start the game!" qcr "START THE GAME! START THE GAME!" nar "Hermione's voice eventually gets drowned out by the growing restlessness of the crowd." - her "" ("normal", "base", "base", "mid", xpos=290, ypos="base", flip=True) + her "" ("normal", "base", "base", "mid", xpos=916, ypos="base", flip=True) her "Ugh, fine...{w=0.3} If everyone wants us to begin play without knowing {b}a single thing{/b}...{w=0.8} then that's {b}OK!{/b}" ("annoyed", "narrow", "annoyed", "R", trans=d3) her "A good commentator knows when to accommodate for a crowd's impatience!" ("soft", "closed", "base", "mid") hide hermione_main @@ -687,7 +687,7 @@ label hufflepuff_match: call quidditch_stands(crowd_react=[None, None, None]) with d3 play background "sounds/crowd_low.ogg" fadein 0.5 fadeout 0.5 - her @ cheeks blush "Now then..." ("open", "closed", "base", "mid", flip=True, xpos=290, ypos="base", trans=d3) + her @ cheeks blush "Now then..." ("open", "closed", "base", "mid", flip=True, xpos=916, ypos="base", trans=d3) her @ cheeks blush "Let's begin!" ("base", "happy", "base", "mid_soft") hide hermione_main with d3 @@ -698,7 +698,7 @@ label hufflepuff_match: play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed nar "A fit looking woman then throws the quaffle into the air -- which signals the start of the match -- and the players quickly take off!" - her "Oh, wow... They're going quite f-fast..." ("normal", "wide", "worried", "shocked", flip=True, xpos=290, ypos="base", trans=d3) + her "Oh, wow... They're going quite f-fast..." ("normal", "wide", "worried", "shocked", flip=True, xpos=916, ypos="base", trans=d3) her "" ("normal", "happyCl", "base", "mid") sna "Great commentary there girl... You might want to let them know the colour of the grass next..." ("snape_10", ypos="head") play sound "sounds/ball_hit.ogg" @@ -788,7 +788,7 @@ label hufflepuff_match: # Back to commentating play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed play background "sounds/crowd_low.ogg" fadein 0.5 fadeout 0.5 - her "..." ("normal", "squint", "angry", "mid", flip=True, xpos=290, ypos="base", trans=d3) + her "..." ("normal", "squint", "angry", "mid", flip=True, xpos=916, ypos="base", trans=d3) her "Oh, apparently Ravenclaw scored during that... \"captivating\" bit of distraction..." ("open", "narrow", "annoyed", "mid") gen "Sarcasm much?" ("grin", xpos="far_left", ypos="head") her "" ("normal", "closed", "base", "mid") @@ -861,7 +861,7 @@ label hufflepuff_match: with hpunch play sound "sounds/punch02.ogg" - her "..." ("normal", "wide", "base", "stare", flip=True, xpos=290, ypos="base", trans=d1) + her "..." ("normal", "wide", "base", "stare", flip=True, xpos=916, ypos="base", trans=d1) play sound "sounds/crowd_ouch.ogg" call quidditch_stands(crowd_react=["sur", "emo02", "excl"]) @@ -913,7 +913,7 @@ label hufflepuff_match: call quidditch_stands(crowd_react=["th", None, "emo8"]) with d3 - her "So, I think... that Hufflepuff just scored another goal? They might even be unstoppable at this point!" ("open", "base", "base", "L", flip=True, xpos=290, ypos="base", trans=d3) + her "So, I think... that Hufflepuff just scored another goal? They might even be unstoppable at this point!" ("open", "base", "base", "L", flip=True, xpos=916, ypos="base", trans=d3) # Fade to black stop background fadeout 4 @@ -947,8 +947,8 @@ label hufflepuff_match: call cho_walk(530, 360, speed=2) pause 1.5 - her "" ("annoyed", "base", "annoyed", "L", flip=True, xpos=290, ypos="base") - cho "Hey, Granger!" ("open", "narrow", "angry", "L", xpos=580, ypos=-200, trans=d3) + her "" ("annoyed", "base", "annoyed", "L", flip=True, xpos=916, ypos="base") + cho "Hey, Granger!" ("open", "narrow", "angry", "L", xpos=1431, ypos=-200, trans=d3) her "What do you want?{w=0.6} Shouldn't you be busy with,{w=0.8} I don't know..." ("open", "base", "angry", "mid", trans=d3) cho "" ("annoyed", "narrow", "raised", "L") her "playing the game?" ("smile", "closed", "base", "mid")