diff --git a/game/scripts/characters/astoria/events/intro.rpy b/game/scripts/characters/astoria/events/intro.rpy index 7894b22d..fff45a1a 100644 --- a/game/scripts/characters/astoria/events/intro.rpy +++ b/game/scripts/characters/astoria/events/intro.rpy @@ -614,7 +614,7 @@ label astoria_intro_E3: play music "music/Dark Fog.ogg" fadein 1 if_changed ast "" ("annoyed", "base", "worried", "R") - sna "You wanted to see me?" ("snape_09", xpos=600, ypos="base") + sna "You wanted to see me?" ("snape_09", xpos=1467, ypos="base") ast "..." ("annoyed", "narrow", "worried", "L") sna "Astoria?!" ("snape_05") sna "Why is one of my students in your office? Don't tell me you..." ("snape_03") diff --git a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy index e6186153..5f9122bf 100644 --- a/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy +++ b/game/scripts/characters/astoria/events/spells/imperio_tonks.rpy @@ -1523,7 +1523,7 @@ label ag_st_imperio_E5: pause.2 play music "music/Dark Fog.ogg" fadein 1 if_changed - sna "What on Earth is going on here?!" ("snape_08", xpos=580 ,ypos="base") + sna "What on Earth is going on here?!" ("snape_08", xpos=1431 ,ypos="base") sna "You two better explain to me what I just witnessed!" ("snape_32") ton @ hair angry "Stop being such a wuss, Severus!" ("mad", "base", "angry", "L", xpos="mid", flip=True) ton @ hair upset "We were just practising some spells with Miss Greengrass." ("annoyed", "base", "base", "R") @@ -1534,7 +1534,7 @@ label ag_st_imperio_E5: sna "Don't tell me you--" ("snape_36") # Shocked ton @ cheeks blush "The Imperius Curse." ("soft", "closed", "base", "mid") sna "I can't believe you two..." ("snape_08") - ast "Am I in trouble now, Professor?" ("annoyed", "base", "base", "L", xpos=10) # Asking Snape + ast "Am I in trouble now, Professor?" ("annoyed", "base", "base", "L", xpos=418) # Asking Snape sna "Keep quiet, girl!" ("snape_34") sna "............" ("snape_04") # Snape sees the wand. @@ -1581,8 +1581,8 @@ label ag_st_imperio_E5: call ton_walk(550,"base") pause.8 - ton "" ("annoyed", "base", "annoyed", "L", xpos=275, ypos="base", flip=True) - sna "........................." ("snape_05", xpos=580 ,ypos="base") + ton "" ("annoyed", "base", "annoyed", "L", xpos=889, ypos="base", flip=True) + sna "........................." ("snape_05", xpos=1431 ,ypos="base") play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed ton @ hair horny "Like what you see?" ("upset", "base", "raised", "L") # Bit flirty, maybe just to calm Snape down. diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy index df865a03..0cbc2403 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy @@ -165,7 +165,7 @@ label cc_pf_strip_T3_intro_E1: with d3 pause .8 - cho "" ("smile", "narrow", "angry", "R", xpos=360, ypos="base", flip=True) + cho "" ("smile", "narrow", "angry", "R", xpos=1040, ypos="base", flip=True) pause .8 cho @ cheeks blush "I am starting to love doing {b}this{/b} as well." ("soft", "narrow", "base", "R") @@ -444,8 +444,8 @@ label cc_pf_strip_T3_intro_E2: pause .3 play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed - cho @ cheeks blush "" ("quiver", "narrow", "worried", "L", xpos=330, ypos="base", flip=True) - ton "" ("base", "narrow", "base", "L", xpos=460, ypos="base") + cho @ cheeks blush "" ("quiver", "narrow", "worried", "L", xpos=987, ypos="base", flip=True) + ton "" ("base", "narrow", "base", "L", xpos=1218, ypos="base") gen "Are you more into the girl's tits... or her ass?" ("grin", xpos="far_left", ypos="head") ton @ hair horny "*Hmm*--" ("base", "narrow", "annoyed", "L") cho @ cheeks heavy_blush "Sir!" ("soft", "happyCl", "worried", "mid") @@ -563,7 +563,7 @@ label cc_pf_strip_T3_intro_E2: hide cho_main with d5 call cho_chibi(flip=False) - cho @ cheeks blush "" ("quiver", "narrow", "worried", "down", xpos=260, ypos="base", flip=False, trans=d5) + cho @ cheeks blush "" ("quiver", "narrow", "worried", "down", xpos=862, ypos="base", flip=False, trans=d5) pause .8 ton @ hair horny "" ("base", "narrow", "base", "down") gen "Slowly..." ("base", xpos="far_left", ypos="head") @@ -621,7 +621,7 @@ label cc_pf_strip_T3_intro_E2: hide cho_main with d5 call cho_chibi(flip=True) - cho @ cheeks heavy_blush "" ("normal", "happyCl", "worried", "mid", xpos=330, ypos="base", flip=True, trans=d5) + cho @ cheeks heavy_blush "" ("normal", "happyCl", "worried", "mid", xpos=987, ypos="base", flip=True, trans=d5) pause .8 ton @ hair horny "*Hmm*... Will you look at that..." ("base", "narrow", "base", "down") @@ -664,8 +664,8 @@ label cc_pf_strip_T3_intro_E2: $ cho.zorder = 16 # in front of Tonks. 15 is default. play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed - ton @ hair horny "" ("base", "narrow", "base", "L", xpos=345, ypos="base") - cho @ cheeks heavy_blush "T-Tonks!" ("clench", "happyCl", "raised", "L", xpos=280, ypos="base", flip=True) #Closed eyes, embarrassed + ton @ hair horny "" ("base", "narrow", "base", "L", xpos=1013, ypos="base") + cho @ cheeks heavy_blush "T-Tonks!" ("clench", "happyCl", "raised", "L", xpos=898, ypos="base", flip=True) #Closed eyes, embarrassed ton @ hair angry "That's {b}Professor Tonks{/b} to you, Miss Chang." ("open", "narrow", "angry", "L") # stern look cho @ cheeks heavy_blush "Sorry!" ("clench", "happyCl", "worried", "mid") play sound "sounds/giggle2_loud.ogg" @@ -734,7 +734,7 @@ label cc_pf_strip_T3_intro_E2: pause .2 # Tonks turns around. - call ton_chibi(xpos=360, ypos=360, flip=True) + call ton_chibi(xpos=1040, ypos=360, flip=True) with d3 # Snape walks closer to the middle. @@ -745,16 +745,16 @@ label cc_pf_strip_T3_intro_E2: $ cho.zorder = 15 # reset to default. $ tonks.zorder = 16 # in front of Cho. 15 is default. play music "music/Dark Fog.ogg" fadein 1 if_changed - sna "" ("snape_40", xpos=560, ypos="base") - cho "" ("normal", "wide", "base", "L", xpos=275, ypos="base", flip=True) - ton "" ("annoyed", "narrow", "annoyed", "L", xpos=390, ypos="base", flip=True) + sna "" ("snape_40", xpos=1396, ypos="base") + cho "" ("normal", "wide", "base", "L", xpos=889, ypos="base", flip=True) + ton "" ("annoyed", "narrow", "annoyed", "L", xpos=1093, ypos="base", flip=True) ton "Severus?" ("mad", "base", "base", "L", trans=d5) ton "{size=-4}Get behind me, Cho...{/size}" ("open", "narrow", "base", "R") #small text $ cho_chibi.zorder = 2 # default is 3 call cho_chibi("stand", 320, 366, flip=True) - cho @ cheeks heavy_blush "{size=-4}Yes-- Thank you.{/size}" ("disgust", "happyCl", "worried", "mid", xpos=295, ypos=17, flip=True, trans=d3) # Sprite is slightly lowered. + cho @ cheeks heavy_blush "{size=-4}Yes-- Thank you.{/size}" ("disgust", "happyCl", "worried", "mid", xpos=924, ypos=30, flip=True, trans=d3) # Sprite is slightly lowered. ton "What are you doing here?" ("annoyed", "base", "angry", "stare") ton @ hair horny "Have you been spying on us behind that door?" ("soft", "narrow", "base", "up") @@ -851,7 +851,7 @@ label cc_pf_strip_T3_intro_E2: $ cho_chibi.zorder = 3 # Reset to default. call cho_chibi("stand", 314, 366, flip=True) ton "" ("annoyed", "narrow", "raised", "downR") - cho "But the entire Slytherin team drank some! They were even bragging about it!" ("clench", "narrow", "angry", "L", xpos=275, ypos="base", flip=True, trans=hpunch) + cho "But the entire Slytherin team drank some! They were even bragging about it!" ("clench", "narrow", "angry", "L", xpos=889, ypos="base", flip=True, trans=hpunch) sna "I suppose if that's what they said, then who am I to refute it..." ("snape_37") #smirk sna "Now, if you'll excuse me..." ("snape_09") @@ -876,8 +876,8 @@ label cc_pf_strip_T3_intro_E2: $ cho.zorder = 16 # In front of Tonks. Default is 15. play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed sna "" ("snape_13") - ton @ hair horny "" ("annoyed", "shocked", "raised", "stare", xpos=310, ypos="base", flip=True) - cho "First you're going to explain yourself!" ("clench", "base", "angry", "L", xpos=415, ypos="base", flip=True, trans=hpunch) + ton @ hair horny "" ("annoyed", "shocked", "raised", "stare", xpos=951, ypos="base", flip=True) + cho "First you're going to explain yourself!" ("clench", "base", "angry", "L", xpos=1138, ypos="base", flip=True, trans=hpunch) ton @ cheeks blush hair horny "" ("clench", "wide", "shocked", "L") cho "You somehow tricked them! They played far better than usual." ("mad", "base", "angry", "L") ton @ cheeks heavy_blush hair horny "" ("horny", "narrow", "worried", "down") @@ -955,8 +955,8 @@ label cc_pf_strip_T3_intro_E2: call ton_chibi("stand", 370, 360, flip=False) with d3 - cho "" ("annoyed", "narrow", "base", "mid", xpos=190, ypos="base", flip=False) - ton "Well, that was a bit uncalled-for... even for him." ("open", "narrow", "annoyed", "R", xpos=350, ypos="base", flip=False, trans=d5) + cho "" ("annoyed", "narrow", "base", "mid", xpos=738, ypos="base", flip=False) + ton "Well, that was a bit uncalled-for... even for him." ("open", "narrow", "annoyed", "R", xpos=1022, ypos="base", flip=False, trans=d5) ton "When did I step on his toes?" ("upset", "base", "base", "mid") gen "Maybe when you called him Snivellus--" ("base", xpos="far_left", ypos="head") @@ -1194,8 +1194,8 @@ label cc_pf_strip_T3_intro_E3: pause .8 $ cho.zorder = 16 # in front of Tonks. 15 is default. - cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=280, ypos="base", flip=True) - ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=345, ypos="base") + cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=898, ypos="base", flip=True) + ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=1013, ypos="base") ton @ hair horny "Are you watching closely, Professor?" ("open", "narrow", "base", "mid") gen "You bet!" ("grin", xpos="far_left", ypos="head") ton @ hair horny "I wouldn't want you to miss what's about to happen..." ("base", "narrow", "base", "mid") @@ -1288,13 +1288,13 @@ label cc_pf_strip_T3_intro_E3: $ cho.zorder = 15 # reset to default. $ tonks.zorder = 16 # in front of Cho # Default is 15. - cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) - ton @ hair horny "..." ("crooked_smile", "narrow", "base", "mid", xpos=215, ypos="base", flip=False) + cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False) + ton @ hair horny "..." ("crooked_smile", "narrow", "base", "mid", xpos=782, ypos="base", flip=False) ton @ hair horny "Miss Chang, would you be so kind and assist me with my shirt?" ("soft", "base", "shocked", "down") cho @ cheeks heavy_blush "Yes, Professor..." ("smile", "narrow", "base", "down") pause .2 - cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "down", xpos=315, ypos="base", flip=False, trans=d5) # moves closer to Tonks. + cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "down", xpos="base", ypos="base", flip=False, trans=d5) # moves closer to Tonks. pause .8 cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "down") pause .2 @@ -1321,8 +1321,8 @@ label cc_pf_strip_T3_intro_E3: call ton_chibi(flip=True) #$ tonks.zorder = 15 # Reset to default. #$ cho.zorder = 16 # in front of Tonks # Default is 15. - #cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "L", xpos=345, ypos="base", flip=False) - ton @ hair horny "Let me show you how it's done. {heart}" ("crooked_smile", "narrow", "base", "down", xpos=280, ypos="base", flip=True, trans=d5) + #cho @ cheeks heavy_blush "" ("base", "narrow", "raised", "L", xpos=1013, ypos="base", flip=False) + ton @ hair horny "Let me show you how it's done. {heart}" ("crooked_smile", "narrow", "base", "down", xpos=898, ypos="base", flip=True, trans=d5) cho @ cheeks heavy_blush "..." ("horny", "narrow", "worried", "down") # lip bite ton @ cheeks heavy_blush hair horny "With trousers like these, you should start slowly... that's how the headmaster likes it. {heart}" ("horny", "narrow", "base", "mid") @@ -1399,7 +1399,7 @@ label cc_pf_strip_T3_intro_E3: # Tonks turns around. call ton_chibi(flip=False) - ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=215, ypos="base", flip=False, trans=d5) + ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=782, ypos="base", flip=False, trans=d5) pause .5 ton @ cheeks blush hair horny "It's fine, Cho. Just give it a little slap." ("soft", "narrow", "base", "downR") @@ -1414,7 +1414,7 @@ label cc_pf_strip_T3_intro_E3: # Tonks turns around. call ton_chibi(flip=True) - ton "" ("base", "base", "base", "mid", xpos=280, ypos="base", flip=True, trans=d5) + ton "" ("base", "base", "base", "mid", xpos=898, ypos="base", flip=True, trans=d5) pause .8 ton @ cheeks heavy_blush "Thank you, sweetie." ("crooked_smile", "narrow", "base", "L") @@ -1490,7 +1490,7 @@ label cc_pf_strip_T3_intro_E3: # Cho moves in front. $ cho.zorder = 16 # in front of Tonks # Default is 15. $ tonks.zorder = 15 # reset to default. - cho @ cheeks heavy_blush "" ("angry", "narrow", "base", "down", xpos=300, ypos="base", trans=d5) + cho @ cheeks heavy_blush "" ("angry", "narrow", "base", "down", xpos=933, ypos="base", trans=d5) pause .8 # Remove Cho's bra. @@ -1525,8 +1525,8 @@ label cc_pf_strip_T3_intro_E3: with d3 pause .5 - cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True) - ton @ hair horny "..." ("grin", "narrow", "base", "L", xpos=345, ypos="base", flip=False, trans=d5) + cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid", xpos=898, ypos="base", flip=True) + ton @ hair horny "..." ("grin", "narrow", "base", "L", xpos=1013, ypos="base", flip=False, trans=d5) play sound "sounds/giggle2_loud.ogg" ton @ hair horny "*Giggles*..." ("grin", "narrow", "shocked", "mid") @@ -2902,7 +2902,7 @@ label cc_pf_strip_T3_intro_E3: $ hermione_chibi.zorder = 2 # behind Cho. Default is 3. call ton_chibi("hide") call her_chibi("stand", 370, 360, flip=False) - her "" ("crooked_smile", "narrow", "base", "mid", xpos=345, ypos="base", flip=False, trans=morph) + her "" ("crooked_smile", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False, trans=morph) pause .2 cho @ cheeks heavy_blush "" ("open", "wide", "raised", "L") @@ -2989,7 +2989,7 @@ label cc_pf_strip_T3_intro_E3: $ cho_chibi.zorder = 3 # Reset to default. $ tonks_chibi.zorder = 2 # behind Cho. Default is 3. call ton_chibi("stand", 370, 360, flip=False) - ton @ hair neutral "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False, trans=morph) + ton @ hair neutral "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False, trans=morph) pause .2 cho @ cheeks heavy_blush "" ("clench", "base", "raised", "down") @@ -3079,7 +3079,7 @@ label cc_pf_strip_T3_intro_E3: label cc_pf_strip_T3_repeat: call cc_pf_strip - + gen "I'm in the mood for another strip-show, [name_cho_genie]." ("base", xpos="far_left", ypos="head") cho "Of course you are, [name_genie_cho]." ("base", "narrow", "raised", "mid") cho "Who's going to watch me this time?" ("soft", "narrow", "base", "mid") diff --git a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy index ee5b0616..b9baa207 100644 --- a/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy +++ b/game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy @@ -167,8 +167,8 @@ label cc_pf_strip_T3_tonks: play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed $ cho.zorder = 16 # in front of Tonks # Default is 15. $ tonks.zorder = 15 # reset to default. - cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=280, ypos="base", flip=True) - ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=345, ypos="base") + cho @ cheeks heavy_blush "" ("base", "narrow", "base", "L", xpos=898, ypos="base", flip=True) + ton @ hair horny "..." ("base", "narrow", "raised", "L", xpos=1013, ypos="base") ton @ hair horny "This feels quite familiar, doesn't it, Miss Chang?" ("crooked_smile", "narrow", "raised", "L") cho @ cheeks blush "..." ("horny", "narrow", "base", "mid") @@ -216,8 +216,8 @@ label .strip_cho: $ tonks.zorder = 15 # reset to default. call cho_chibi("stand", 314, 366, flip=True) call ton_chibi("stand", 370, 360, flip=False) - cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True) - ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) + cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=898, ypos="base", flip=True) + ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False) with d5 call ctc @@ -241,7 +241,7 @@ label .strip_cho: if cho.is_any_worn("robe", "top", "bottom"): ton @ hair horny "Let me help you get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L") cho @ cheeks heavy_blush "Yes, Professor." ("base", "narrow", "base", "down") - ton @ hair horny "" ("base", "narrow", "base", "down", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho. + ton @ hair horny "" ("base", "narrow", "base", "down", xpos=933, ypos="base", flip=False, trans=d5) # moves closer to Cho. pause .2 if cho.is_worn("robe"): @@ -274,7 +274,7 @@ label .strip_cho: if cho.is_any_worn("bra", "panties"): ton @ hair horny "I like your underwear Miss Chang... Very cute!" ("soft", "narrow", "base", "L") cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "downR") - ton @ hair horny "" ("soft", "narrow", "base", "L", xpos=300, ypos="base", flip=False, trans=d5) # moves closer to Cho. + ton @ hair horny "" ("soft", "narrow", "base", "L", xpos=933, ypos="base", flip=False, trans=d5) # moves closer to Cho. if cho.is_worn("bra"): ton @ hair horny "But...{w=0.3} That bra definitely has to come off." ("soft", "narrow", "angry", "down") @@ -307,7 +307,7 @@ label .strip_cho: cho @ cheeks heavy_blush "" ("base", "narrow", "base", "mid") call ctc - ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) # Tonks moves to her original position. + ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False) # Tonks moves to her original position. with d5 random: @@ -404,8 +404,8 @@ label .spank_cho: # Cho turns around. call cho_chibi("stand", 325, 366, flip=False) call ton_chibi("stand", 360, 360, flip=False) - ton @ hair horny "" ("base", "narrow", "base", "down", xpos=325, ypos="base", flip=False) - cho @ cheeks blush "" ("disgust", "narrow", "worried", "down", xpos=235, ypos="base", flip=False, trans=d5) + ton @ hair horny "" ("base", "narrow", "base", "down", xpos=978, ypos="base", flip=False) + cho @ cheeks blush "" ("disgust", "narrow", "worried", "down", xpos=818, ypos="base", flip=False, trans=d5) pause .5 call slap_her @@ -468,8 +468,8 @@ label .spank_cho: # Cho turns around. call cho_chibi("stand", 314, 366, flip=True) call ton_chibi("stand", 370, 360, flip=False) - ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) - cho @ cheeks blush "" ("annoyed", "narrow", "base", "mid", xpos=280, ypos="base", flip=True, trans=d5) + ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False) + cho @ cheeks blush "" ("annoyed", "narrow", "base", "mid", xpos=898, ypos="base", flip=True, trans=d5) pause .8 return @@ -502,8 +502,8 @@ label .strip_tonks: with d3 pause .5 - cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=315, ypos="base", flip=False) - ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=280, ypos="base", flip=True) + cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=960, ypos="base", flip=False) + ton @ hair horny "" ("base", "narrow", "base", "mid", xpos=898, ypos="base", flip=True) with d5 call ctc @@ -534,7 +534,7 @@ label .strip_tonks: if tonks.is_worn("robe") or tonks.is_worn("top") or tonks.is_worn("bottom"): ton @ hair horny "Help me get out of these clothes, Miss Chang." ("soft", "narrow", "base", "L") cho @ cheeks blush "Yes, Professor." ("soft", "narrow", "base", "down") - cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=315, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks. + cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=960, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks. pause .2 if tonks.is_worn("robe"): @@ -571,7 +571,7 @@ label .strip_tonks: ton @ hair horny "*Hmm*... It's been a while since I had to remove underwear." ("annoyed", "narrow", "base", "down") ton @ hair horny "Help me take them off, [name_cho_tonks]." ("base", "narrow", "base", "down") cho @ cheeks blush "Of course..." ("smile", "narrow", "base", "down") - cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=315, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks. + cho @ cheeks blush "" ("horny", "narrow", "base", "down", xpos=960, ypos="base", flip=False, trans=d5) # Cho moves closer to Tonks. if tonks.is_worn("bra"): ton @ hair horny "Let's get these tits out already!" ("base", "narrow", "angry", "mid") @@ -603,7 +603,7 @@ label .strip_tonks: with d3 call ctc - cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=315, ypos="base", flip=False) # Cho moves to her original position. + cho @ cheeks blush "" ("base", "narrow", "base", "mid", xpos=960, ypos="base", flip=False) # Cho moves to her original position. with d5 random: @@ -683,7 +683,7 @@ label .spank_tonks: # Tonks turns around. call ton_chibi(flip=False) - ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=215, ypos="base", flip=False, trans=d5) + ton @ cheeks blush hair horny "" ("base", "base", "base", "mid", xpos=782, ypos="base", flip=False, trans=d5) pause .5 ton @ cheeks blush hair horny "Slap this naughty teacher's ass!" ("crooked_smile", "narrow", "angry", "R") @@ -726,7 +726,7 @@ label .spank_tonks: # Tonks turns around. call ton_chibi(flip=True) - ton @ cheeks heavy_blush hair horny "" ("base", "base", "base", "mid", xpos=280, ypos="base", flip=True, trans=dissolve) + ton @ cheeks heavy_blush hair horny "" ("base", "base", "base", "mid", xpos=898, ypos="base", flip=True, trans=dissolve) pause .8 ton @ cheeks heavy_blush hair horny "Ten points for Ravenclaw." ("soft", "narrow", "base", "L") @@ -761,8 +761,8 @@ label .transformations: $ tonks.zorder = 15 # reset to default. call cho_chibi("stand", 314, 366, flip=True) call ton_chibi("stand", 370, 360, flip=False) - ton @ hair horny "" ("base", "narrow", "base", "L", xpos=345, ypos="base", flip=False) - cho @ cheeks blush "" ("grin", "base", "base", "L", xpos=280, ypos="base", flip=True) + ton @ hair horny "" ("base", "narrow", "base", "L", xpos=1013, ypos="base", flip=False) + cho @ cheeks blush "" ("grin", "base", "base", "L", xpos=898, ypos="base", flip=True) with d5 ## Intro Events 1 and 2: @@ -995,8 +995,8 @@ label .succubus_E2: # Tonks transforms into a Succubus stop music fadeout 0.5 - cho "" ("mad", "narrow", "base", "down", xpos=265, ypos="base", flip=True) # bit more to the left - ton "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False) # bit more to the right + cho "" ("mad", "narrow", "base", "down", xpos=871, ypos="base", flip=True) # bit more to the left + ton "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False) # bit more to the right with fade pause .5 @@ -1220,7 +1220,7 @@ label .hermione_E1: $ hermione_chibi.zorder = 2 # behind Cho. Default is 3. call ton_chibi("hide") call her_chibi("stand", 370, 360, flip=False) - her "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False, trans=morph) + her "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False, trans=morph) pause .2 cho @ cheeks heavy_blush "" ("horny", "narrow", "worried", "L") @@ -1366,7 +1366,7 @@ label .hermione_E1: $ cho_chibi.zorder = 3 # Reset to default. $ tonks_chibi.zorder = 2 # behind Cho. Default is 3. call ton_chibi("stand", 370, 360, flip=False) - ton "" ("base", "narrow", "base", "mid", xpos=345, ypos="base", flip=False, trans=morph) + ton "" ("base", "narrow", "base", "mid", xpos=1013, ypos="base", flip=False, trans=morph) pause .2 cho @ cheeks heavy_blush "" ("horny", "base", "base", "L") diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index a9b5b7e2..a9c0bbdb 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -897,7 +897,7 @@ label cho_intro_E3: play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed 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=1200, 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 281d0489..2c01cd14 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -301,10 +301,10 @@ label gryffindor_match: gen "{size=-4}You'd think that in a place of magic, there'd be some better means of transport than simply walking...{/size}" ("base", xpos="far_left", ypos="head") #whisper gen "{size=-4}What's Snape doing?{/size}" ("base", xpos="far_left", ypos="head") #whisper #Snape middle of the screen standing - sna "And seeing that our dear headmaster couldn't make it today, it's fallen upon me--" ("snape_24", flip=True, xpos=340, ypos="base", trans=d5) + sna "And seeing that our dear headmaster couldn't make it today, it's fallen upon me--" ("snape_24", flip=True, xpos=1004, ypos="base", trans=d5) ton "{size=-4}The headmaster is supposed to kick off the final game, you better get up there.{/size}" ("soft", "base", "base", "R") gen "{size=-4}I feel like I should be getting briefed on these things...{/size}" ("base", xpos="far_left", ypos="head") - sna "So...{w=0.4} Everyone do your best...{w=0.4} And stuff like that..." ("snape_25", flip=True, xpos=340, ypos="base", trans=d5) + sna "So...{w=0.4} Everyone do your best...{w=0.4} And stuff like that..." ("snape_25", flip=True, xpos=1004, ypos="base", trans=d5) call gen_chibi("stand", 180, 435, flip=True) call her_chibi("stand", 260, 440, flip=True) @@ -328,7 +328,7 @@ label gryffindor_match: with d3 her "Professor!" # She turns around and sees Genie, but Snape thinks she's calling for him. - sna "What is it now Miss--" ("snape_07", flip=True, xpos=340, ypos="base", trans=d5) + sna "What is it now Miss--" ("snape_07", flip=True, xpos=1004, ypos="base", trans=d5) #Snape turns to Hermione and sees genie call sna_chibi("stand", 280, 400, flip=False) @@ -377,7 +377,7 @@ label gryffindor_match: sna "Dear lord... Always with the dramatics..." ("snape_06", xpos="base", ypos="head", flip=False) - gen "" ("base", xpos=0, ypos="base") + gen "" ("base", xpos="far_left", ypos="base") show genie zorder states.gen.image.zorder with d3 @@ -553,7 +553,7 @@ label gryffindor_match: #Genie and Tonks head back to the seats #Hermione goes up to the podium - her "*Ahem*..." ("soft", "happy", "base", "R", xpos=290, ypos="base", flip=True, trans=d5) + her "*Ahem*..." ("soft", "happy", "base", "R", xpos=916, ypos="base", flip=True, trans=d5) her "Moving on..." ("open", "happy", "base", "L") her "What could only be described as a debut at the Quidditch Finals..." ("grin", "closed", "base", "L") her "A surprise to everyone, I'm sure..." ("grin", "base", "base", "L") @@ -604,7 +604,7 @@ label gryffindor_match: hide screen blkfade with d5 - her "--And finally, making their way onto the pitch..." ("angry", "happy", "base", "L", xpos=290, ypos="base", flip=True, trans=d5) + her "--And finally, making their way onto the pitch..." ("angry", "happy", "base", "L", xpos=916, ypos="base", flip=True, trans=d5) her "The Ravenclaw seeker...{w=0.6}{nw}" ("open", "base", "base", "L") play sound "sounds/crowd_cheer.ogg" @@ -670,7 +670,7 @@ label gryffindor_match: gen "You bet." ("grin", xpos="far_left", ypos="head") gen "(Let's hope she's had enough practice, bonding with that broom...)" ("base", xpos="far_left", ypos="head") play sound "sounds/ball_hit.ogg" - her "Katie Bell, of course, has already gotten a hold of the quaffle, and is speeding up towards Ravenclaw's side of the pitch!" ("grin", "squint", "base", "L", xpos=290, ypos="base", flip=True, trans=d5) + her "Katie Bell, of course, has already gotten a hold of the quaffle, and is speeding up towards Ravenclaw's side of the pitch!" ("grin", "squint", "base", "L", xpos=916, ypos="base", flip=True, trans=d5) her "Davies is moving up to intercept--{w=0.2}" ("angry", "squint", "base", "L") #her "Watch out Katie!!" ("base", "base", "base", "mid") # Confusing. @@ -1013,7 +1013,7 @@ label gryffindor_match: nar "Cho gives you a quick nod and then flies up towards one of the Gryffindor chasers who have positioned themselves near the Ravenclaw goalposts." - her "Johnson passing to Spinnet--" ("grin", "base", "base", "L", xpos=290, ypos="base", flip=True, trans=d5) + her "Johnson passing to Spinnet--" ("grin", "base", "base", "L", xpos=916, ypos="base", flip=True, trans=d5) #Spank sound play sound "sounds/slap_02.ogg" @@ -1028,7 +1028,7 @@ label gryffindor_match: call her_chibi("stand", 300, 400, flip=False) with d3 - her @ cheeks blush "Sir!" ("disgust", "narrow", "annoyed", "mid", xpos=290, ypos="base", flip=False, trans=d5) + her @ cheeks blush "Sir!" ("disgust", "narrow", "annoyed", "mid", xpos=916, ypos="base", flip=False, trans=d5) her @ cheeks blush "She--{w=0.2} She smacked one of the chasers on the bum..." ("angry", "happy", "annoyed", "mid") her @ cheeks blush "Sir, you can't let her get away with this!" ("clench", "happy", "annoyed", "mid") gen "I'm not hearing any objections from the referee...{w=0.5} Or the player, matter-of-factly..." ("base", xpos="far_left", ypos="head") @@ -1055,7 +1055,7 @@ label gryffindor_match: ton "*Hmm*?" ("soft", "base", "base", "R") sna "{size=-4}That little witch has successfully been making my life a misery since the moment she got here.{/size}" ("snape_01") sna "{size=-4}To think that Miss Chang would be able to rile her up...{/size}" ("snape_37") - her "Another goal for Team Gryffindor!" ("crooked_smile", "happy", "base", "L", xpos=290, ypos="base", flip=True, trans=d5) + her "Another goal for Team Gryffindor!" ("crooked_smile", "happy", "base", "L", xpos=916, ypos="base", flip=True, trans=d5) #crowd cheer play sound "sounds/crowd_cheer.ogg" @@ -1103,7 +1103,7 @@ label gryffindor_match: pause 2.0 sna "*Tsk*, *Tsk*...{w=0.4} The sense of imminent loss must've been too much for him." ("snape_37") - her "A fantastic--{w=0.4}{nw}" ("grin", "base", "base", "L", xpos=290, ypos="base", flip=True, trans=d5) + her "A fantastic--{w=0.4}{nw}" ("grin", "base", "base", "L", xpos=916, ypos="base", flip=True, trans=d5) her "A fantastic--{fast} Hold on...{w=0.4} What's that on the pitch?{nw}" ("soft", "narrow", "base", "L") her "A fantastic-- Hold on... What's that on the pitch?{fast} Is that--" ("clench", "wide", "base", "L") play sound "sounds/murmur.ogg" @@ -1313,7 +1313,7 @@ label gryffindor_match: call cho_chibi("fly", flip=True) play background "sounds/crowd_very_low.ogg" fadein 10 - cho "That's right boys, look this way!" ("smile", "narrow", "base", "L", xpos=580, ypos=-200, flip=True, trans=d3) + cho "That's right boys, look this way!" ("smile", "narrow", "base", "L", xpos=1431, ypos=-200, flip=True, trans=d3) $ cho.strip("top") with d3 @@ -1906,7 +1906,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=756, 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 @@ -1920,13 +1920,13 @@ 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=1644, 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") hoo "Why thank you Professor, how nice." ("base", "shocked", "shocked", "mid") sna "Yes, always such a {i}nice guy{/i}..." ("snape_31") - ton "*Ahem*...{w=0.4}{nw}" ("soft", "base", "base", "R", xpos=460, ypos="base", trans=d3) + ton "*Ahem*...{w=0.4}{nw}" ("soft", "base", "base", "R", xpos=1218, ypos="base", trans=d3) ton "*Ahem*...{fast}{w=0.4}{nw}" ("soft", "base", "base", "L") ton "*Ahem*...{fast}" ("soft", "base", "base", "R") sna "" ("snape_39") diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 00e5769f..757f77cb 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -660,7 +660,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=880, ypos="base", flip=True) cho "Hello, Sir." ("base", "base", "base", "mid", xpos="close", ypos="base") cho "Granger." ("soft", "narrow", "base", "L") her @ cheeks blush "..." ("annoyed", "base", "angry", "mid") @@ -1163,7 +1163,7 @@ label cho_quid_E12: call gen_walk(xpos="mid") gen "Alright then, let's find you a broom to use so we can finally be done--" ("base", xpos="far_left", ypos="head") - cho "Where have you been?" ("disgust", "base", "angry", "mid", xpos=460, ypos="base", trans=d3) + cho "Where have you been?" ("disgust", "base", "angry", "mid", xpos=1218, ypos="base", trans=d3) gen "*Err*...{w=0.4} In my office?" ("base", xpos="far_left", ypos="head") cho "It's ten AM! I've already been here for the past five hours!" ("soft", "base", "angry", "mid") gen "You've been here since six AM?" ("angry", xpos="far_left", ypos="head") @@ -1216,7 +1216,7 @@ label cho_quid_E12: play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed #Hooch doll fades in - hoo "Professor Dumbledore, Miss Chang, what can I do you for?" ("base", "base", "base", "L", xpos=100, ypos="base", flip=True, trans=d3) # "what can I do you for" is a form of a joke, fits next line perfectly. + hoo "Professor Dumbledore, Miss Chang, what can I do you for?" ("base", "base", "base", "L", xpos=578, ypos="base", flip=True, trans=d3) # "what can I do you for" is a form of a joke, fits next line perfectly. gen "Me..." ("base", xpos="far_left", ypos="head") hoo "Sorry?" ("open", "base", "base", "L") gen "Oh...{w=0.4} *Err*...{w=0.4} Miss Chang here is looking for a broom to use for the final Quidditch match." ("base", xpos="far_left", ypos="head") @@ -1517,8 +1517,8 @@ label cho_quid_E12: call gen_chibi("stand", "mid", 470, flip=False) chibi hooch place ((450, 500)) - hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=100, ypos="base", flip=True) - cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=460, ypos="base", flip=False) + hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=578, ypos="base", flip=True) + cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=1218, ypos="base", flip=False) play background "sounds/outskirts.ogg" fadein 2 play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index ef79fdf6..5a6af21b 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=916, 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=916, ypos="base", trans=d5) pause .8 play sound "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=916, 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") @@ -1018,7 +1018,7 @@ label slytherin_match: pause .5 play sound "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=916, ypos="base", flip=True, trans=dissolve) her @ cheeks blush "{size=-4}Oh, these boobs are so heavy...{/size}" ("disgust", "base", "worried", "down") her @ cheeks blush "{size=-4}And why is this shirt so hot...{/size}" ("soft", "base", "base", "down") @@ -1313,7 +1313,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=916, ypos="base", trans=d3) play sound "sounds/giggle2_loud.ogg" 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") @@ -1703,7 +1703,7 @@ label slytherin_match_return: call sus_chibi("hide") call lun_chibi("hide") call sna_chibi("stand",410,177+250, flip=False) - sna "Want some of this, Genie?" ("snape_clown", xpos=320, ypos="base", flip=False, trans=morph) + sna "Want some of this, Genie?" ("snape_clown", xpos=967, ypos="base", flip=False, trans=morph) play sound "sounds/MaleGasp.ogg" with hpunch 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 cc44272d..2c1d4865 100644 --- a/game/scripts/characters/hermione/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/hermione/events/favors/talk_to_me.rpy @@ -456,7 +456,7 @@ label hg_pf_talk_T2_repeat: # Favours can revolve around Cho, Luna, Tonks label hg_pf_talk_T3_intro_E1: - + call start_hg_pf_talk gen "Let's have another chat, [name_hermione_genie]." ("base", xpos="far_left", ypos="head") @@ -763,7 +763,7 @@ label hg_pf_talk_tonks: play sound "sounds/door.ogg" call ton_walk(500,"base") - ton @ hair basic "" ("base", "base", "base", "mid", xpos=600, ypos="base", trans=d3) + ton @ hair basic "" ("base", "base", "base", "mid", xpos=1467, ypos="base", trans=d3) her "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=d3) if states.env.daytime: gen "Good day, Miss Tonks." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/luna/events/intro.rpy b/game/scripts/characters/luna/events/intro.rpy index 2b125b8d..a706d6ed 100644 --- a/game/scripts/characters/luna/events/intro.rpy +++ b/game/scripts/characters/luna/events/intro.rpy @@ -286,7 +286,7 @@ label luna_intro_E1: call her_walk("mid", action="enter") gen "Ah, Miss Granger..." ("base", xpos="far_left", ypos="head") - her "[name_genie_hermione]... do you know what time it--" ("normal", "happyCl", "base", "down", xpos=500, ypos="base", trans=dissolve) + her "[name_genie_hermione]... do you know what time it--" ("normal", "happyCl", "base", "down", xpos=1289, ypos="base", trans=dissolve) her "..." ("normal", "narrow", "base", "L") her "Luna? what are you doing here?!?" ("angry", "base", "worried", "L") #shocked @@ -434,7 +434,7 @@ label luna_intro_E1: call her_walk("door") her @ cheeks blush "Good night then..." ("normal", "squint", "base", "R", xpos="base", ypos="base") #annoyed, flipped - ton "Sleep tight, Miss Granger..." ("horny", "narrow", "base", "R", xpos=400, ypos="base", trans=dissolve) # Tongue in cheek + ton "Sleep tight, Miss Granger..." ("horny", "narrow", "base", "R", xpos=1111, ypos="base", trans=dissolve) # Tongue in cheek call her_walk(action="leave") diff --git a/game/scripts/events/final_events.rpy b/game/scripts/events/final_events.rpy index 85aa831b..3fa788fd 100644 --- a/game/scripts/events/final_events.rpy +++ b/game/scripts/events/final_events.rpy @@ -342,7 +342,7 @@ label ball_quest_E1: with hpunch with kissiris $ hermione.set_pose("hand_on_pussy") - her "" ("open", "squint", "worried", "mid", xpos=270) + her "" ("open", "squint", "worried", "mid", xpos=880) hide screen blkfade with d5 diff --git a/game/scripts/minigames/mirror/events/a_white_christmas.rpy b/game/scripts/minigames/mirror/events/a_white_christmas.rpy index a54f6575..88aff3bf 100644 --- a/game/scripts/minigames/mirror/events/a_white_christmas.rpy +++ b/game/scripts/minigames/mirror/events/a_white_christmas.rpy @@ -153,7 +153,7 @@ label a_white_christmas: nar "In a wrestling ring, with his cock out... Everyone checking out his wood." nar "Frozen on the spot, the only thing he could do was shout." - gen "I'll kill you for this!" (face="open", base="hard", xpos=100, trans=d3) + gen "I'll kill you for this!" (face="open", base="hard", xpos=578, trans=d3) nar "The match now beginning." nar "The opponents, walking out." diff --git a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy index dbe5d8ed..115c85bf 100644 --- a/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy +++ b/game/scripts/minigames/mirror/events/genies_christmas_wish.rpy @@ -151,7 +151,7 @@ label genies_christmas_wish: cho "How did I get here?" ("angry", "wide", "base", "stare", xpos="mid", ypos="base", trans=d5) nar "Said one." cho "" ("annoyed", "base", "base", "R") - her "I was just with my mum and dad." ("mad", "base", "base", "stare", xpos=500, ypos="base", trans=d5) + her "I was just with my mum and dad." ("mad", "base", "base", "stare", xpos=1289, ypos="base", trans=d5) nar "Said the second, sounding confused, and a bit sad." her "" ("annoyed", "base", "base", "R") 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 05bb2b1d..849d1a02 100644 --- a/game/scripts/minigames/mirror/events/not_so_great_escape.rpy +++ b/game/scripts/minigames/mirror/events/not_so_great_escape.rpy @@ -207,7 +207,7 @@ label not_so_great_escape: with d3 cho @ cheeks blush "Miss! He's gone!" ("angry", "base", "base", "mid", flip=True, trans=d3) - ton "Yes, I can see that rookie..." ("open", "narrow", "base", "L", xpos=500, ypos="base", trans=d5) + ton "Yes, I can see that rookie..." ("open", "narrow", "base", "L", xpos=1288, ypos="base", trans=d5) call ton_walk("mid", "base") call cho_chibi(flip=False) @@ -226,7 +226,7 @@ label not_so_great_escape: call cho_chibi(flip=True) with d3 - cho "What was that?" ("soft", "base", "base", "mid", xpos=500, ypos="base", trans=d5) + cho "What was that?" ("soft", "base", "base", "mid", xpos=1288, ypos="base", trans=d5) lun "Huh?" ("mad", "narrow", "base", "L") cho "Never mind, must have been the wind..." ("annoyed", "base", "base", "mid") # @@ -247,7 +247,7 @@ label not_so_great_escape: lun "If I can't see him then I'll have to search for him some other way!" ("mad", "base", "base", "L", xpos="mid", ypos="base", flip=True, trans=d5) cho "*Sigh*..." ("disgust", "base", "base", "mid") - ton "Well he's here somewhere, that's for sure." ("base", "narrow", "base", "L", xpos=500, ypos="base", trans=d5) + ton "Well he's here somewhere, that's for sure." ("base", "narrow", "base", "L", xpos=1288, ypos="base", trans=d5) cho "Really?" ("angry", "base", "base", "mid") gen "(How does she know?)" ("angry", xpos="far_left", ypos="head") cho "How do you know, miss?" ("angry", "base", "base", "mid") @@ -258,7 +258,7 @@ label not_so_great_escape: call ton_chibi(flip=False) with d3 - ton "Why don't you help your partner to search the place?" ("open", "base", "base", "R", xpos=450, ypos="base", flip=False, trans=d5) + ton "Why don't you help your partner to search the place?" ("open", "base", "base", "R", xpos=1200, ypos="base", flip=False, trans=d5) ton "I'm sure the chief would be really happy if we brought that scumbag in." ("soft", "base", "base", "R") gen "(Now that's just rude...)" ("base", xpos="far_left", ypos="head") @@ -319,7 +319,7 @@ label not_so_great_escape: lun "Wow! Was he in there this entire time?" ("angry", "wide", "base", "mid", trans=d5) cho @ cheeks blush "How did you know, miss?" ("mad", "base", "base", "mid", trans=d5) - ton "Years of experience, girls... You'll get there some day..." ("base", "wink", "base", "mid", xpos=500, ypos="base", flip=True, trans=d5) + ton "Years of experience, girls... You'll get there some day..." ("base", "wink", "base", "mid", xpos=1288, ypos="base", flip=True, trans=d5) ton "Now... Time to put this filth where it belongs..." ("mad", "narrow", "annoyed", "mid") gen "No, wait!" ("angry", xpos="far_left", ypos="head") @@ -335,9 +335,9 @@ label not_so_great_escape: call lun_chibi("hide") # pre-sets expressions for later # - lun @ cheeks blush "" ("soft", "narrow", "base", "mid", xpos=400, ypos="base", flip=False) + lun @ cheeks blush "" ("soft", "narrow", "base", "mid", xpos=1111, ypos="base", flip=False) cho @ cheeks blush "" ("smile", "base", "base", "mid") - ton "" ("grin", "base", "base", "mid", xpos=500, ypos="base", flip=False) + ton "" ("grin", "base", "base", "mid", xpos=1288, ypos="base", flip=False) # Hides decorations $ halloween_rug_ITEM.use() diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy index 16012785..23b09170 100644 --- a/game/scripts/minigames/mirror/events/suck_and_run.rpy +++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy @@ -223,7 +223,7 @@ label suck_and_run: gen "Tonks?!" ("open", xpos="far_left", ypos="head") play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed - ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll + ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=360, trans=d3) # Explicit positions to avoid hiding the doll call ton_chibi_scene("bj_desk") gen "am I still dreaming?" ("angry", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/whose_points.rpy b/game/scripts/minigames/mirror/events/whose_points.rpy index 4a562114..547d0bf6 100644 --- a/game/scripts/minigames/mirror/events/whose_points.rpy +++ b/game/scripts/minigames/mirror/events/whose_points.rpy @@ -42,13 +42,13 @@ label whose_points: gen "First, let me introduce today's contestants." ("base", xpos="far_left", ypos="head") gen "The curly haired harlot we all know and love. Give it up for Hermione!" ("base", xpos="far_left", ypos="head") play sound "sounds/applause01.ogg" - her @ cheeks blush "..." ("grin", "base", "worried", "mid", xpos=500, ypos="base") + her @ cheeks blush "..." ("grin", "base", "worried", "mid", xpos=1289, ypos="base") play sound "sounds/wolf_whistle.ogg" her @ cheeks blush "..." ("base", "base", "worried", "mid") gen "The ravishing Ravenclaw who will rock your socks off... Luna!" ("base", xpos="far_left", ypos="head") play sound "sounds/applause01.ogg" - lun "..." ("base", "wink", "base", "mid", xpos=650, ypos="base") + lun "..." ("base", "wink", "base", "mid", xpos=1556, ypos="base") play sound "sounds/giggle2_loud.ogg" lun "*heh*... hello." ("grin", "narrow", "base", "mid") @@ -56,7 +56,7 @@ label whose_points: play sound "sounds/applause01.ogg" gen "..." ("grin", xpos="far_left", ypos="head") play sound "sounds/gasp3.ogg" - ast "Hey!" ("scream", "base", "angry", "mid", xpos=380, ypos="base") + ast "Hey!" ("scream", "base", "angry", "mid", xpos=1076, ypos="base") pause.5 hide hermione_main @@ -219,9 +219,9 @@ 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=1111, ypos="base") - lun "How do those points taste now?" ("silly", "narrow", "annoyed", "L", xpos=600, ypos="base") + lun "How do those points taste now?" ("silly", "narrow", "annoyed", "L", xpos=1467, ypos="base") lun "The whole wizarding world is going to see your tits!" ("smile", "happyCl", "base", "mid") hide luna_main hide astoria_main