From e4a77ced9ed16450196dfde24c363e64a45532ab Mon Sep 17 00:00:00 2001 From: Johnny Date: Sun, 19 Jun 2022 18:05:43 +0200 Subject: [PATCH] Fixed incorrect xpos usage on character doll positions. --- game/scripts/characters/cho/events/intro.rpy | 2 +- .../cho/events/quidditch/gryffindor_match.rpy | 8 ++++---- .../cho/events/quidditch/hufflepuff_match.rpy | 20 +++++++++---------- .../cho/events/quidditch/intros.rpy | 2 +- .../cho/events/quidditch/slytherin_match.rpy | 10 +++++----- .../hermione/events/favors/talk_to_me.rpy | 2 +- .../minigames/mirror/events/whose_points.rpy | 4 ++-- 7 files changed, 24 insertions(+), 24 deletions(-) diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index 3970f5cd..fe0ed892 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -901,7 +901,7 @@ label cho_intro_E3: play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 cho "Hello, Sir.{w=0.6} You've called for me?" ("soft", "narrow", "raised", "L", xpos="base", ypos="base") - her "" ("normal", "closed", "base", "mid", xpos="450", ypos="base") + her "" ("normal", "closed", "base", "mid", xpos=450, ypos="base") cho "Granger..." ("soft", "narrow", "angry", "L") her "Chang..." ("annoyed", "narrow", "angry", "R") gen "Go on, girl. Tell her." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 0e3959e6..47058d07 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -1572,7 +1572,7 @@ label gryffindor_match_return: call sna_walk(action="enter", xpos="400", ypos="460") #Snape enters office and walks to desk (left) - sna "Headmaster..." ("snape_01", trans=d3, xpos="200", ypos="base") + sna "Headmaster..." ("snape_01", trans=d3, xpos=200, ypos="base") gen "Severus! I should've known!" ("grin", xpos="far_left", ypos="head") gen "Come to deliver my winnings I presume?" ("grin", xpos="far_left", ypos="head") sna "Not exactly..." ("snape_37") #Smugface @@ -1586,7 +1586,7 @@ label gryffindor_match_return: pause 1.0 #Hooch enters and walks up behind Snape and Tonks - hoo "You can't just walk in like that without knocking Severus, show the headmaster some respect." ("angry", "shocked", "base", "mid", xpos="700", ypos="base", flip=False, trans=d3) + hoo "You can't just walk in like that without knocking Severus, show the headmaster some respect." ("angry", "shocked", "base", "mid", xpos=700, ypos="base", flip=False, trans=d3) sna "..." ("snape_35", trans=d3) hoo "Sorry for arriving unannounced like this, Headmaster." ("normal", "base", "base", "mid") gen "No worries at all, Miss Hooch... Seeing your face always puts a smile on my face." ("base", xpos="far_left", ypos="head") @@ -1800,7 +1800,7 @@ label gryffindor_match_return: 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) + sna "No, you did that on purpose!" ("snape_17", xpos=200, 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") @@ -1818,7 +1818,7 @@ label gryffindor_match_return: $ renpy.play("sounds/money_thud.ogg") $ game.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=200, ypos="base", trans=d3, flip=False) call sna_walk(action="leave", speed=1.5) call play_sound("kicking") 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 3adbe77d..5bd67088 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=290, 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) @@ -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=290, 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") ">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: $ renpy.sound.play("sounds/sniff.ogg") her "..." play bg_sounds "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=290, ypos="base", trans=d3) call quidditch_stands(crowd_react=["th", None, None]) with d3 @@ -671,7 +671,7 @@ label hufflepuff_match: mal2 "Yeh! Start the game!" qcr "START THE GAME! START THE GAME!" ">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=290, 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 bg_sounds "sounds/crowd_low.ogg" fadein 0.5 fadeout 0.5 - her "Now then..." ("open", "closed", "base", "mid", cheeks="blush", flip=True, xpos="290", ypos="base", trans=d3) + her "Now then..." ("open", "closed", "base", "mid", cheeks="blush", flip=True, xpos=290, ypos="base", trans=d3) her "Let's begin!" ("base", "happy", "base", "mid_soft", cheeks="blush") hide hermione_main with d3 @@ -698,7 +698,7 @@ label hufflepuff_match: play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 ">A Grey haired 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=290, 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") $ renpy.sound.play("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 play bg_sounds "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=290, 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 $ renpy.sound.play("sounds/punch02.ogg") - her "..." ("normal", "wide", "base", "stare", flip=True, xpos="290", ypos="base", trans=d1) + her "..." ("normal", "wide", "base", "stare", flip=True, xpos=290, ypos="base", trans=d1) $ renpy.sound.play("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=290, ypos="base", trans=d3) # Fade to black stop bg_sounds fadeout 4 @@ -947,7 +947,7 @@ label hufflepuff_match: call cho_walk(530, 360, speed=2) pause 1.5 - her "" ("annoyed", "base", "annoyed", "L", flip=True, xpos="290", ypos="base") + 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 "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") diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 0e00b44a..d2c109ad 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -674,7 +674,7 @@ label cho_quid_E7: call chibi_emote("hide", "hermione") with d3 - her "" ("annoyed", "base", "angry", "R", xpos="270", ypos="base", flip=True) + her "" ("annoyed", "base", "angry", "R", xpos=270, ypos="base", flip=True) cho "Hello, Sir." ("base", "base", "base", "mid", xpos="close", ypos="base") cho "Granger." ("soft", "narrow", "base", "L") her "..." ("annoyed", "base", "angry", "mid", cheeks="blush") diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index 73dcf391..aa99c58e 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -290,7 +290,7 @@ label slytherin_match: # Podium: call gen_chibi("stand", flip=True, 280, 400) ### Hermione Postions ### - ## Sprite: her "" (flip=True, xpos="290", ypos="base") + ## Sprite: her "" (flip=True, xpos=290, ypos="base") # 2nd 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) @@ -434,7 +434,7 @@ label slytherin_match: with d3 pause .5 - her "" ("open", "base", "worried", "mid", flip=True, xpos="290", ypos="base", trans=d5) + her "" ("open", "base", "worried", "mid", flip=True, xpos=290, ypos="base", trans=d5) pause .8 $ renpy.sound.play("sounds/microphone_feedback.ogg") @@ -480,7 +480,7 @@ label slytherin_match: with d3 pause .5 - her "I know the weather might not be optimal, but the games must go on." ("soft", "closed", "base", "mid", flip=True, xpos="290", ypos="base", trans=d3) + her "I know the weather might not be optimal, but the games must go on." ("soft", "closed", "base", "mid", flip=True, xpos=290, ypos="base", trans=d3) her "Therefore, let me now welcome onto the pitch..." ("open", "base", "base", "down") her "The team known for their technical prowess and... lately... unconventional tactics..." ("disgust", "base", "worried", "down") her "Team Ravenclaw!" ("open", "base", "base", "mid") @@ -1040,7 +1040,7 @@ label slytherin_match: pause .5 $ renpy.sound.play("sounds/microphone_feedback.ogg") - her "*Ahem*..." ("base", "base", "base", "mid", xpos="290", ypos="base", flip=True, trans=dissolve) + her "*Ahem*..." ("base", "base", "base", "mid", xpos=290, ypos="base", flip=True, trans=dissolve) her "{size=-4}Oh, these boobs are so heavy...{/size}" ("disgust", "base", "worried", "down", cheeks="blush") her "{size=-4}And why is this shirt so hot...{/size}" ("soft", "base", "base", "down", cheeks="blush") @@ -1351,7 +1351,7 @@ label slytherin_match: # Stop Prediction $ renpy.stop_predict("images/CG/cho_quidditch/*.*") - her "Oh... it looks like things are heating up!{w=0.5} Malfoy has finally realised Chang is going for the Snitch..." ("open", "base", "angry", "L", flip=True, xpos="290", ypos="base", trans=d3) + her "Oh... it looks like things are heating up!{w=0.5} Malfoy has finally realised Chang is going for the Snitch..." ("open", "base", "angry", "L", flip=True, xpos=290, ypos="base", trans=d3) call play_sound("giggle") her "*giggles* Look at that girl fly! I didn't think you could grip a broom so tightly... maybe I could learn a thing or two from her." ("grin", "base", "angry", "L") diff --git a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy index 302d684a..8993d702 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -625,7 +625,7 @@ label hg_pf_talk_tonks: with d5 pause.8 - ton "" ("base", "base", "base", "mid", hair="basic", xpos="600", ypos="base") + ton "" ("base", "base", "base", "mid", hair="basic", xpos=600, ypos="base") her "Hello, Professor Tonks." ("open", "closed", "base", "mid", xpos="right", ypos="base") her "" ("base", "base", "base", "mid") if game.daytime: diff --git a/game/scripts/minigames/mirror/events/whose_points.rpy b/game/scripts/minigames/mirror/events/whose_points.rpy index 3d792172..000ffb95 100644 --- a/game/scripts/minigames/mirror/events/whose_points.rpy +++ b/game/scripts/minigames/mirror/events/whose_points.rpy @@ -35,7 +35,7 @@ label whose_points: gen "The show where everything is made up and the points don't matter." ("grin", xpos="far_left", ypos="head") gen "Just like at Hogwarts." ("grin", xpos="far_left", ypos="head") $ renpy.play("sounds/applause01.ogg") - her "(I hope I win! I need those house points.)" ("base", "happy", "base", "R", ypos="head", flip=False) + her "(I hope I win! I need those house points.)" ("base", "happy", "base", "R", xpos="base", ypos="head", flip=False) play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 fadeout 1 @@ -219,7 +219,7 @@ label whose_points: hide hermione_main with d3 - ast "Harlot! Harlot! Harlot!" ("grin", "closed", "base", "mid", xpos="400", ypos="base") + ast "Harlot! Harlot! Harlot!" ("grin", "closed", "base", "mid", xpos=400, ypos="base") lun "How do those points taste now?" ("silly", "narrow", "annoyed", "L", xpos=600, ypos="base") lun "The whole wizarding world is going see your tits!" ("smile", "happyCl", "base", "mid")