diff --git a/game/scripts/characters/cho/events/favors/talk_to_me.rpy b/game/scripts/characters/cho/events/favors/talk_to_me.rpy index 1be4e6b3..e9c9ae2b 100644 --- a/game/scripts/characters/cho/events/favors/talk_to_me.rpy +++ b/game/scripts/characters/cho/events/favors/talk_to_me.rpy @@ -1436,9 +1436,15 @@ label cc_pf_talk_T3_intro_E1: cho "You'll get me the firebolt?!" ("angry", "wide", "base", "mid") gen "Get you a what, sorry?" ("base", xpos="far_left", ypos="head") cho "The firebolt! Surely, you must have seen Potter's?" ("smile", "wide", "base", "mid") - gen "I most certainly have not!" ("base", xpos="far_left", ypos="head") - cho "I'm sure if you could get me a broom like that it would assure my--, I mean, our victory!" ("smile", "base", "base", "mid") - gen "Wait... A broom? That's what all of this is about?" ("angry", xpos="far_left", ypos="head") + if states.gen.knowledge.firebolt: + gen "You've been going on about a stupid broom, this entire time?" ("angry", xpos="far_left", ypos="head") + else: + gen "I most certainly have not!" ("base", xpos="far_left", ypos="head") + cho "I'm sure if you could get me a broom like that it would assure my--, I mean, our victory!" ("smile", "base", "base", "mid") + + $ states.gen.knowledge.firebolt = True + + gen "Wait... A broom? That's what all of this is about?" ("angry", xpos="far_left", ypos="head") cho "Yes? What else would it be?" ("soft", "narrow", "raised", "mid") gen "I'm going to need a moment..." ("base", xpos="far_left", ypos="head") cho "[name_genie_cho]?" ("open", "base", "raised", "mid") diff --git a/game/scripts/characters/cho/events/intro.rpy b/game/scripts/characters/cho/events/intro.rpy index 5ced9a77..ca7c2206 100644 --- a/game/scripts/characters/cho/events/intro.rpy +++ b/game/scripts/characters/cho/events/intro.rpy @@ -111,15 +111,15 @@ label cho_intro_E1: cho "Yes, anyway..." ("open", "closed", "base", "mid") "\"Xiao Hua...\"": - cho "*Uhm*... thanks..." ("normal", "narrow", "raised", "mid") - cho "But I don't speak that much Mandarin, Sir." ("open", "closed", "base", "mid") - cho "I was actually born here..." ("base", "narrow", "base", "mid") - gen "Where?" - cho "In Scotland, Sir." ("angry", "wink", "base", "mid") - cho "People always act surprised when they find that out." ("open", "base", "base", "R") - cho "It doesn't help that my name sounds so Asian...{w} Cho Chang..." ("annoyed", "narrow", "angry", "up") - gen "..." - cho "Anyway..." ("open", "closed", "base", "mid") + cho "*Uhm*... thanks..." ("normal", "narrow", "raised", "mid") + cho "But I don't speak that much Mandarin, Sir." ("open", "closed", "base", "mid") + cho "I was actually born here..." ("base", "narrow", "base", "mid") + gen "Where?" + cho "In Scotland, Sir." ("angry", "wink", "base", "mid") + cho "People always act surprised when they find that out." ("open", "base", "base", "R") + cho "It doesn't help that my name sounds so Asian...{w} Cho Chang..." ("annoyed", "narrow", "angry", "up") + gen "..." + cho "Anyway..." ("open", "closed", "base", "mid") hide cg with fade diff --git a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy index a7012ff0..9f9304f8 100644 --- a/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/slytherin_match.rpy @@ -1594,7 +1594,7 @@ label slytherin_match_return: ton "" ("horny", "base", "base", "mid", trans=d5) pause .8 - if states.gen.ev.tonks.metamorphmagi_aware: #This wont be used if we make it so you learn it first time here and hangouts unlock after this + if states.gen.knowledge.tonks_metamorphmagi: #This wont be used if we make it so you learn it first time here and hangouts unlock after this gen "It all makes sense now." ("base", xpos="far_left", ypos="head") ton "Hello sweet cheeks!" ("base", "base", "base", "mid") ton "Thought I was about to lose focus there for a second when you started going at it!" ("open", "base", "base", "R") @@ -1606,7 +1606,7 @@ label slytherin_match_return: gen "What kind of show are we--" ("base", xpos="far_left", ypos="head") else: - $ states.gen.ev.tonks.metamorphmagi_aware = True + $ states.gen.knowledge.tonks_metamorphmagi = True gen "You were Miss Granger the whole time?" ("angry", xpos="far_left", ypos="head") gen "Plot twist of the fucking century." ("base", xpos="far_left", ypos="head") ton "Of course not, don't be silly..." ("open", "closed", "base", "mid") diff --git a/game/scripts/characters/genie/vars.rpy b/game/scripts/characters/genie/vars.rpy index d76fae90..4a237ab6 100644 --- a/game/scripts/characters/genie/vars.rpy +++ b/game/scripts/characters/genie/vars.rpy @@ -24,7 +24,11 @@ default states.gen.ev.intro.cupboard_examined = False default states.gen.ev.intro.door_examined = False default states.gen.ev.intro.fireplace_examined = False default states.gen.ev.intro.safe_examined = False -default states.gen.ev.tonks.metamorphmagi_aware = False # Genie knows about Tonks being a Metamorphmagus + +#Genie Knowledge + +default states.gen.knowledge.firebolt = False #Genie knows what a firebolt is +default states.gen.knowledge.tonks_metamorphmagi = False # Genie knows about Tonks being a Metamorphmagus # Statistics diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy index 19595361..7b3745be 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy @@ -1276,7 +1276,7 @@ label hg_pf_handjob_2_cumming: "-Cum in her mouth!-" if states.her.status.gokkun: # Has swallowed cum before. gen "Open your mouth, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") - her "{shudder}What?!{/shudder}" ("open", "wide", "base", "stare", ypos="head", cheeks="blush", flip=False) + her "{shudder}What?!{/shudder}" ("open", "wide", "base", "stare", xpos="base", ypos="head", cheeks="blush", flip=False) if hermione.is_worn("top"): gen "Open your mouth, or I'll coat your clothes!" ("angry", xpos="far_left", ypos="head") else: diff --git a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy index fe4caabc..18650240 100644 --- a/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy +++ b/game/scripts/characters/hermione/events/favors/give_me_a_tittyjob.rpy @@ -391,7 +391,7 @@ label hg_pf_titjob_1: #pause.8 gen "Great...{w=0.4} Now, move your tits up and down along the shaft..." ("base", xpos="far_left", ypos="head") - her "Alright..." ("angry", "happyCl", "worried", "mid", emote="sweat", ypos="head", flip=False) + her "Alright..." ("angry", "happyCl", "worried", "mid") call her_chibi_scene("tj", trans=d5) call ctc @@ -754,7 +754,7 @@ label hg_pf_titjob_2: call ctc nar "She then starts moving her breasts, alternating her speed every now and then." - her "Do you enjoy it when I move them like this, [name_genie_hermione]?" ("grin", "base", "base", "R", ypos="head", flip=False) + her "Do you enjoy it when I move them like this, [name_genie_hermione]?" ("grin", "base", "base", "R") gen "Oh, yes... Very much!" ("grin", xpos="far_left", ypos="head") play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. @@ -940,14 +940,14 @@ label hg_pf_titjob_2_continue: call bld gen "*Mmm*... Keep stroking it." ("base", xpos="far_left", ypos="head") show her_titjob_personal h23 as cg - her ".............." ("angry", "wink", "base", "mid", ypos="head", flip=False) + her ".............." ("angry", "wink", "base", "mid") gen "Now I want you to say..." ("base", xpos="far_left", ypos="head") menu: gen "..." ("base", xpos="far_left", ypos="head") "{size=-4}\"I love teasing my father with my big tits.\"{/size}": show her_titjob_personal h25 as cg - her "Teasing my--{w=0.2} But, [name_genie_hermione]..." ("angry", "narrow", "base", "down", ypos="head", flip=False) + her "Teasing my--{w=0.2} But, [name_genie_hermione]..." ("angry", "narrow", "base", "down") gen "Just say it, [name_hermione_genie]." ("base", xpos="far_left", ypos="head") show her_titjob_personal h22 as cg her "*Hmph*...{w=0.4} What do you want me to say, exactly?" ("soft", "narrow", "annoyed", "up") @@ -986,7 +986,7 @@ label hg_pf_titjob_2_continue: "{size=-4}\"I love teasing my classmates with my perfect tits.\"{/size}": show her_titjob_personal h23 as cg - her "I...{w=0.4} I love teasing my classmates...{w=0.4} With my perfect tits..." ("soft", "narrow", "annoyed", "up", ypos="head", flip=False) + her "I...{w=0.4} I love teasing my classmates...{w=0.4} With my perfect tits..." ("soft", "narrow", "annoyed", "up") gen "Of course you do..." ("base", xpos="far_left", ypos="head") her "I love the jealous looks from the other girls..." ("base", "narrow", "worried", "down") gen "Yes, and they should be jealous..." ("base", xpos="far_left", ypos="head") @@ -1048,7 +1048,7 @@ label hg_pf_titjob_2_cumming: gen "*Mmm*..." ("base", xpos="far_left", ypos="head") gen "I love your perfect tits!" ("base", xpos="far_left", ypos="head") show her_titjob_personal h22 as cg - her "Thank you, [name_genie_hermione]." ("soft", "narrow", "annoyed", "up", ypos="head", flip=False) + her "Thank you, [name_genie_hermione]." ("soft", "narrow", "annoyed", "up") show her_titjob_personal h23 as cg her "Shall I rub them a bit faster?" ("soft", "narrow", "annoyed", "up") gen "Rub away, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") @@ -1062,7 +1062,7 @@ label hg_pf_titjob_2_cumming: "-Cum in her mouth-": gen "Take this, whore!" ("angry", xpos="far_left", ypos="head") show her_titjob_personal h25 as cg - her "What are you--" ("angry", "wink", "base", "mid", ypos="head", flip=False) + her "What are you--" ("angry", "wink", "base", "mid") call her_chibi_scene("tj_mouth", trans=d5) pause.8 @@ -1133,7 +1133,7 @@ label hg_pf_titjob_2_cumming: with hpunch gen "{shudder}*ARGH*!{/shudder}" ("angry", xpos="far_left", ypos="head") show her_titjob_personal h25 as cg - her "What? Already?!" ("angry", "wide", "base", "stare", ypos="head", flip=False) + her "What? Already?!" ("angry", "wide", "base", "stare") gen "Aaah, yes!" ("angry", xpos="far_left", ypos="head") call cum_block diff --git a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy index 6ee656bb..604ddf44 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_ass.rpy @@ -481,7 +481,7 @@ label hg_pf_grope_ass_T3_continue: jump end_hg_pf_grope label hg_pf_grope_ass_T3_mad: - her @ cheeks blush "Stop that at once!" ("angry", "happyCl", "worried", "mid", ypos="head") + her @ cheeks blush "Stop that at once!" ("angry", "happyCl", "worried", "mid", ypos="head", flip=False) nar "Hermione gives you an unexpectedly strong shove..." call her_chibi_scene("behind_desk_front", trans=hpunch) @@ -508,7 +508,7 @@ label hg_pf_grope_ass_T3_mad: gen "One hundred points to Gryffindor!" ("base", xpos="far_left", ypos="head") gen "There, it is done..." ("base", xpos="far_left", ypos="head") gen "Not about the points, you say... You make me--" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "{shake}Shut up!{/shake}" ("scream", "happyCl", "worried", "mid", ypos="head") + her @ cheeks blush "{shake}Shut up!{/shake}" ("scream", "happyCl", "worried", "mid", ypos="head", flip=False) her @ cheeks blush "{size=+7}The terms should've been stated before commencing the--{/size}" ("scream", "happyCl", "worried", "mid", trans=hpunch) gen "Commencing--" ("base", xpos="far_left", ypos="head") gen "Oh, snap out of it [name_hermione_genie]... You got paid didn't you?" ("base", xpos="far_left", ypos="head") @@ -519,7 +519,7 @@ label hg_pf_grope_ass_T3_mad: "\"Surely you can't be serious, [name_hermione_genie]!\"": $ states.her.mood += 27 - her @ cheeks blush "Yes... I am!" ("scream", "happyCl", "worried", "mid", ypos="head") + her @ cheeks blush "Yes... I am!" ("scream", "happyCl", "worried", "mid", ypos="head", flip=False) gen "By the great desert..." ("angry", xpos="far_left", ypos="head") gen "You get no points!" ("angry", xpos="far_left", ypos="head") her @ cheeks blush "*Grr*... Fine!" ("scream", "happyCl", "worried", "mid") diff --git a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy index e73d57af..d6623ae9 100644 --- a/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy +++ b/game/scripts/characters/hermione/events/favors/grope_her_breasts.rpy @@ -10,7 +10,7 @@ label hg_pf_grope_breasts_T2: her "!!!" ("normal", "wide", "worried", "shocked") nar "Hermione takes a hesitant step back..." - her @ cheeks blush "{shudder}!!!?{/shudder}" ("mad", "wide", "base", "stare", ypos="head", trans=hpunch) + her @ cheeks blush "{shudder}!!!?{/shudder}" ("mad", "wide", "base", "stare", ypos="head", flip=False, trans=hpunch) call ctc nar "Hermione tries to pull away from you, but you hold her firmly by her breasts..." @@ -31,7 +31,7 @@ label hg_pf_grope_breasts_T2: her "M-my happy place...?" ("angry", "wink", "base", "mid") nar "You feel the girl's shapely breasts in your palms..." - her "............................" ("shock", "happyCl", "worried", "mid", ypos="head") + her "............................" ("shock", "happyCl", "worried", "mid", flip=False, ypos="head") menu: "-Squeeze her tits with all of your strength-": diff --git a/game/scripts/characters/hermione/events/items/collars.rpy b/game/scripts/characters/hermione/events/items/collars.rpy index 9b8d16c9..7ff9912d 100644 --- a/game/scripts/characters/hermione/events/items/collars.rpy +++ b/game/scripts/characters/hermione/events/items/collars.rpy @@ -321,7 +321,7 @@ label slut_scene: gen "That's a good little slut..." ("base", xpos="far_left", ypos="head") gen "Now, if you want to suck my cock, I expect you to ask nicely." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "What? Isn't it bad enough that the stupid collar said that I'm a slut! Just let me suck your cock!" ("clench", "happy", "base", "up", ypos="head") + her @ cheeks blush "What? Isn't it bad enough that the stupid collar said that I'm a slut! Just let me suck your cock!" ("clench", "happy", "base", "up", xpos="base", ypos="head", flip=False) gen "Well, that's exactly it, [name_hermione_genie]!" ("base", xpos="far_left", ypos="head") gen "Sluts beg for cock!" ("base", xpos="far_left", ypos="head") gen "I expect you to beg!" ("base", xpos="far_left", ypos="head") @@ -767,7 +767,7 @@ label slave_scene: gen "That's a good slave." ("base", xpos="far_left", ypos="head") gen "Now ask me nicely to fuck that tight ass of yours." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "Please sir, please fuck my ass." ("soft", "happy", "worried", "R", ypos="head") + her @ cheeks blush "Please sir, please fuck my ass." ("soft", "happy", "worried", "R", xpos="base", ypos="head", flip=False) gen "Good girl." ("base", xpos="far_left", ypos="head") nar "You thrust your full length into Hermione in one motion." diff --git a/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy b/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy index e7fc5350..f280d3dd 100644 --- a/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy +++ b/game/scripts/characters/hermione/events/potions/polyjuice_cat.rpy @@ -498,7 +498,7 @@ label her_potion_cat_return: pause.8 gen "Good girl." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "..." ("base", "narrow", "base", "L", ypos="head", flip=False) + her @ cheeks blush "..." ("base", "narrow", "base", "L", xpos="base", ypos="head", flip=False) nar "Hermione, now kneeling in front of you, takes you into her mouth." play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed # SEX THEME. diff --git a/game/scripts/characters/snape/events/hangouts.rpy b/game/scripts/characters/snape/events/hangouts.rpy index 3e2a9d2e..c4a2ee45 100644 --- a/game/scripts/characters/snape/events/hangouts.rpy +++ b/game/scripts/characters/snape/events/hangouts.rpy @@ -101,7 +101,7 @@ label snape_hangout: label ss_he_wine_intro: call bld gen "Look what I've got!" ("base", xpos="far_left", ypos="head") - sna "*Hmm*...?" ("snape_05", ypos="head") + sna "*Hmm*...?" ("snape_05", xpos="base", ypos="head", flip=False) sna "Let me see..." pause.1 @@ -123,7 +123,7 @@ label ss_he_wine_intro_E2: call give_gift(_("You hand over the bottle you found in the cupboard to professor Snape..."), wine_ITEM) - sna "Another bottle of Dumbledore's wine?" ("snape_05", ypos="head") + sna "Another bottle of Dumbledore's wine?" ("snape_05", xpos="base", ypos="head", flip=False) sna "Did you find Albus' secret stash or was it his personal wine cellar?" ("snape_05") gen "It's more of a \"wine cabinet\", I'd say." ("base", xpos="far_left", ypos="head") gen "And I believe there is more where this came from..." ("base", xpos="far_left", ypos="head") @@ -141,7 +141,7 @@ label ss_he_wine_repeat: call give_gift(_("You hand over the bottle you found in the cupboard to professor Snape..."), wine_ITEM) - sna "Another one?" ("snape_05", ypos="head") + sna "Another one?" ("snape_05", xpos="base", ypos="head", flip=False) random: sna "Splendid!" ("snape_02") @@ -159,7 +159,7 @@ label ss_he_wine_repeat: label ss_he_hermione_strip: # TAKES PLACE AFTER Hermione has danced for you and Snape. - sna "So..." ("snape_31", ypos="head") + sna "So..." ("snape_31", xpos="base", ypos="head", flip=False) sna "You got the girl to strip for you..." ("snape_35") sna "And you didn't even invite me?!" ("snape_08") gen "Well..." ("base", xpos="far_left", ypos="head") @@ -202,7 +202,7 @@ label ss_he_hermione_strip: label ss_he_story_E1: call bld gen "Alright. Teach me your wand-based magic now." ("base", xpos="far_left", ypos="head") - sna "Sure, I could do that..." ("snape_23", ypos="head") + sna "Sure, I could do that..." ("snape_23", xpos="base", ypos="head", flip=False) sna "Or I could tell you some more about those ripe Slytherin sluts..." ("snape_02") gen "The latter, please." ("grin", xpos="far_left", ypos="head") sna "Great... Get a load of this, then..." ("snape_13") @@ -221,7 +221,7 @@ label ss_he_story_intro_E2: call bld gen "For our little enterprise to succeed..." ("base", xpos="far_left", ypos="head") gen "You need to be more generous with these house point things..." ("base", xpos="far_left", ypos="head") - sna "Right, of course..." ("snape_09", ypos="head") + sna "Right, of course..." ("snape_09", xpos="base", ypos="head", flip=False) sna "Miss Granger will require a strong incentive..." ("snape_09") sna "So putting my house in the lead is essential..." ("snape_09") sna "Could take time though..." ("snape_06") @@ -242,7 +242,7 @@ label ss_he_story_intro_E2: label ss_he_story_intro_E3: - sna "Have you heard of that \"men's rights movement\" nonsense?" ("snape_01", ypos="head") + sna "Have you heard of that \"men's rights movement\" nonsense?" ("snape_01", xpos="base", ypos="head", flip=False) sna "She is smart, popular, and has a will made from iron..." ("snape_01") sna "Lately I am starting to feel very doubtful about our whole plan..." ("snape_06") gen "You shouldn't though..." ("base", xpos="far_left", ypos="head") @@ -263,7 +263,7 @@ label ss_he_story_intro_E3: label ss_he_story_intro_E4: - sna "Tell me something, Genie..." ("snape_24", ypos="head") + sna "Tell me something, Genie..." ("snape_24", xpos="base", ypos="head", flip=False) gen "Yes?" ("base", xpos="far_left", ypos="head") sna "Do you believe in the theory of parallel worlds?" ("snape_25") gen "Well, it's hard not to. All things considered." ("base", xpos="far_left", ypos="head") @@ -292,7 +292,7 @@ label ss_he_story_intro_E4: label ss_he_story_intro_E5: - sna "So... How is our little plan coming along?" ("snape_05", ypos="head") + sna "So... How is our little plan coming along?" ("snape_05", xpos="base", ypos="head", flip=False) sna "Is that wretched girl giving you trouble?" ("snape_05") menu: @@ -382,7 +382,7 @@ label ss_he_story_intro_E7: label ss_he_story_intro_E8: call bld - sna "Do you think if we wanted to..." ("snape_05", ypos="head") + sna "Do you think if we wanted to..." ("snape_05", xpos="base", ypos="head", flip=False) sna "We could bring the public flogging back?" ("snape_05") gen "What do you mean?" ("base", xpos="far_left", ypos="head") sna "Well, years ago flogging was a completely acceptable measure of punishment for the students." ("snape_06") @@ -408,7 +408,7 @@ label ss_he_story_intro_E8: label ss_he_story_intro_E9: # Replace this event. - sna "... so, after that, I return back to Russia, right?" ("snape_24", ypos="head") + sna "... so, after that, I return back to Russia, right?" ("snape_24", xpos="base", ypos="head", flip=False) gen "Back to Russia?" ("angry", xpos="far_left", ypos="head") sna "But wait, it gets worse." ("snape_01") sna "Apparently I am fluent in Russian now." ("snape_05") @@ -442,7 +442,7 @@ label ss_he_story_intro_E9: # Replace this event. label ss_he_story_intro_E10: - sna "What is the meaning of life, Genie?" ("snape_29", ypos="head") + sna "What is the meaning of life, Genie?" ("snape_29", xpos="base", ypos="head", flip=False) gen "What?" ("angry", xpos="far_left", ypos="head") sna "Since you are an all-powerful being, you've got to know things like that, right?" ("snape_05") gen "Maybe..." ("base", xpos="far_left", ypos="head") @@ -480,7 +480,7 @@ label ss_he_story_intro_E10: label ss_he_story_intro_E11: - sna "So... Back in your world, do you people have a country named England?" ("snape_05", ypos="head") + sna "So... Back in your world, do you people have a country named England?" ("snape_05", xpos="base", ypos="head", flip=False) gen "We used to..." ("base", xpos="far_left", ypos="head") sna "What happened?" ("snape_26") gen "\"The great catastrophe\"..." ("base", xpos="far_left", ypos="head") @@ -506,7 +506,7 @@ label ss_he_story_intro_E11: label ss_he_story_intro_E12: - sna "I've been thinking about what you've said the other day..." ("snape_09", ypos="head") + sna "I've been thinking about what you've said the other day..." ("snape_09", xpos="base", ypos="head", flip=False) sna "About your home world being nothing but a scorched desert and all..." ("snape_09") gen "Yes?" ("base", xpos="far_left", ypos="head") sna "Do you think Albus will be alright there?" ("snape_06") @@ -538,7 +538,7 @@ label ss_he_story_intro_E12: label ss_he_story_intro_E13: - sna "You know what?" ("snape_01", ypos="head") + sna "You know what?" ("snape_01", xpos="base", ypos="head", flip=False) gen "What?" ("base", xpos="far_left", ypos="head") sna "For the first time in a very long time..." ("snape_01") sna "I think..." ("snape_03") @@ -564,7 +564,7 @@ label ss_he_story_intro_E13: label ss_he_story_E14: - sna "... So, she says, \"Sir, could you choke me a little, please\"!" ("snape_02", ypos="head") + sna "... So, she says, \"Sir, could you choke me a little, please\"!" ("snape_02", xpos="base", ypos="head", flip=False) sna "And I am happy to oblige of course!" ("snape_13") sna "So, I choke that little bitch while I'm fucking her, right?" ("snape_19") sna "And she rolls her eyes up to the point where I can't even see her pupils anymore!" ("snape_19") @@ -592,7 +592,7 @@ label ss_he_story_E14: label ss_he_story_intro_E15: - sna "It's been a while now..." ("snape_05", ypos="head") + sna "It's been a while now..." ("snape_05", xpos="base", ypos="head", flip=False) gen "What do you mean?" ("base", xpos="far_left", ypos="head") sna "The spell that brought you here..." ("snape_24") sna "You said it would wear off in time..." ("snape_24") diff --git a/game/scripts/characters/snape/events/intro.rpy b/game/scripts/characters/snape/events/intro.rpy index 2bd47bfb..f60124c4 100644 --- a/game/scripts/characters/snape/events/intro.rpy +++ b/game/scripts/characters/snape/events/intro.rpy @@ -398,13 +398,13 @@ label snape_intro_E3: call bld if d_flag_01: - sna "Who are you, scum!" ("snape_34", ypos="head", wand=True) + sna "Who are you, scum!" ("snape_34", xpos="base", ypos="head", flip=False, wand=True) gen "What? It's me... *Ehm*... {i}Abius{/i}! I mean, Albus!" ("angry", xpos="far_left", ypos="head") sna "You cannot fool me." ("snape_32", wand=True) sna "Just now, you used some sort of alien magic!" ("snape_32", wand=True) sna "Reveal your true self to me now, fiend! Who are you?!" ("snape_34", wand=True) else: - sna "My name is Severus Snape!" (ypos="head", wand=True) + sna "My name is Severus Snape!" ("snape_34", xpos="base", ypos="head", flip=False, wand=True) sna "Now, who might you be...?" ("snape_01", wand=True) gen "{shake}!!!{/shake}" ("angry", xpos="far_left", ypos="head") @@ -510,7 +510,7 @@ label snape_intro_E4: gen "*Panting*" ("angry", xpos="far_left", ypos="head") gen "Ready to talk now?!" ("angry", xpos="far_left", ypos="head") - sna "(... i-impossible...)" ("snape_36", ypos="head") + sna "(... i-impossible...)" ("snape_36", xpos="base", ypos="head", flip=False) play music "music/Dark Fog.ogg" fadein 1 if_changed hide screen duel @@ -833,7 +833,7 @@ label snape_intro_E5: call sna_walk("door", "base") pause.2 - sna "................." ("snape_06", ypos="head") + sna "................." ("snape_06", xpos="base", ypos="head", flip=False) sna "\"Send those whores up, Severus!\" *Ha-ha-ha*..." ("snape_28") call sna_chibi("leave") diff --git a/game/scripts/characters/snape/summon.rpy b/game/scripts/characters/snape/summon.rpy index 39e075d2..b13b1c6d 100644 --- a/game/scripts/characters/snape/summon.rpy +++ b/game/scripts/characters/snape/summon.rpy @@ -52,7 +52,7 @@ label summon_snape: call bld gen "Want to do the honours?" ("base", xpos="far_left", ypos="head") - sna "With pleasure!" ("snape_02", ypos="head") + sna "With pleasure!" ("snape_02", xpos="base", ypos="head", flip=False) pause.1 call give_gift(_("You hand over the bottle you found in the cupboard to professor Snape..."), wine_ITEM) diff --git a/game/scripts/characters/susan/events/intro.rpy b/game/scripts/characters/susan/events/intro.rpy index 4706510f..37b693cd 100644 --- a/game/scripts/characters/susan/events/intro.rpy +++ b/game/scripts/characters/susan/events/intro.rpy @@ -2,7 +2,7 @@ ### Susan Intro ### label nt_he_susan_E1: - ton "................." ("annoyed", "base", "shocked", "down", ypos="head", flip=False) + ton "................." ("annoyed", "base", "shocked", "down", xpos="base", ypos="head", flip=False) gen "Something on your mind?" ("base", xpos="far_left", ypos="head") ton "Yes, there's this student in my class. She seems to be having a bad time." ("open", "narrow", "worried", "mid") gen "Education isn't meant to be enjoyable." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/tonks/chitchats.rpy b/game/scripts/characters/tonks/chitchats.rpy index ffd4906c..061591ab 100644 --- a/game/scripts/characters/tonks/chitchats.rpy +++ b/game/scripts/characters/tonks/chitchats.rpy @@ -135,31 +135,31 @@ label tonks_chitchat: ton "A foul creature that is drawn to footwear..." ("open", "base", "base", "R") ton "It doesn't actually exist... I just wanted an excuse to have the students show me their feet." ("horny", "base", "base", "mid") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "Since Metamorphmagi can change their skin, I sometimes just don't bother wearing any clothes." ("soft", "base", "shocked", "mid") ton "I once changed the colour of my skin and made it look like a tight shirt..." ("grin", "narrow", "base", "R") ton "I might have worked topless once or twice..." ("horny", "base", "raised", "mid") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "I often got detentions by morphing into prefects..." ("normal", "base", "base", "R") ton "But It was worth it, as I was able to utilize the prefects' bathroom..." ("base", "wide", "base", "mid") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "Most of my abilities are based around emotions..." ("open", "base", "base", "mid") ton "My hair can go red when I'm upset or angry..." ("upset", "base", "base", "mid") ton "Don't tell anyone, but my natural hair colour is actually more brown..." ("open", "base", "base", "R") ton "People think it's pink, but that's because I'm horny all the time." ("base", "base", "base", "down") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "There are rumours that Snape has set up an Age Line to keep students away from his private stash..." ("normal", "narrow", "base", "R") ton "Won't stop me borrowing some polyjuice potions though... Not that I need them..." ("open", "base", "base", "R") ton "But maybe I can find a girl who doesn't mind drinking it and have some fun." ("horny", "base", "raised", "R") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "I'm a metamorphmagus. I can change my appearance at will..." ("open", "base", "base", "mid") ton "Makes spying on the other teachers and students a lot easier..." ("grin", "base", "raised", "mid") - block if states.gen.ev.tonks.metamorphmagi_aware: + block if states.gen.knowledge.tonks_metamorphmagi: ton "I can change the shape and length of my tongue any way I want." ("open", "base", "base", "mid") ton "Imagine the possibilities..." ("open_wide_tongue2", "narrow", "base", "mid") diff --git a/game/scripts/characters/tonks/events/clothing.rpy b/game/scripts/characters/tonks/events/clothing.rpy index fd8b41d3..925f34d4 100644 --- a/game/scripts/characters/tonks/events/clothing.rpy +++ b/game/scripts/characters/tonks/events/clothing.rpy @@ -149,7 +149,7 @@ label tonks_summon_setup: ton "" (trans=morph) ton @ cheeks heavy_blush hair horny "" ("soft", "narrow", "base", "mid") - if states.gen.ev.tonks.metamorphmagi_aware: + if states.gen.knowledge.tonks_metamorphmagi: gen "...{w} You used your meta-whatsit ability just then didn't you?" ("base", xpos="far_left", ypos="head") ton @ cheeks heavy_blush hair horny "You can tell?" ("soft", "narrow", "base", "down") gen "Whatever, just wear your actual clothing next time..." ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index d7b1697f..6806a298 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -45,7 +45,7 @@ label tonks_hangout: jump nt_he_favors_E2 # Tonks Tier 2 available. - ### Snape Stories ### + ### Tonks Stories ### $ ton_eventqueue_hangouts_story.start() @@ -92,7 +92,7 @@ label tonks_hangout: label nt_he_wine_intro: call bld gen "Care for a drink?" ("base", xpos="far_left", ypos="head") - ton @ cheeks blush "Of course, [name_genie_tonks]." ("base", "base", "shocked", "mid", ypos="head", flip=False) + ton @ cheeks blush "Of course, [name_genie_tonks]." ("base", "base", "shocked", "mid", xpos="base", ypos="head", flip=False) ton "Hit me!" ("horny", "base", "base", "down") pause.1 @@ -122,7 +122,7 @@ label nt_he_firewhisky_intro: # Show firewhisky call give_reward(_("You hand over a bottle of firewhisky to Tonks..."), gift="interface/icons/firewhisky.webp", sound=False) - ton "Finally, the good stuff!" ("horny", "base", "base", "down", ypos="head", flip=False) + ton "Finally, the good stuff!" ("horny", "base", "base", "down", xpos="base", ypos="head", flip=False) ton "I'm glad you brought out some firewhisky this time..." ("base", "base", "base", "down") ton "Wine makes me giggly, and hinders my judgment." ("base", "base", "base", "L") gen "..." ("base", xpos="far_left", ypos="head") @@ -144,7 +144,7 @@ label nt_he_firewhisky_intro: label nt_he_firewhisky_E1: call bld gen "Another glass of firewhisky?" ("base", xpos="far_left", ypos="head") - ton "Fill 'er up." ("horny", "base", "base", "up", ypos="head", flip=False) + ton "Fill 'er up." ("horny", "base", "base", "up", xpos="base", ypos="head", flip=False) ton "..." ("base", "base", "shocked", "down") ton "A little bit more..." ("open", "base", "raised", "down") ton "A bit more..." ("horny", "base", "angry", "down") @@ -172,7 +172,7 @@ label nt_he_firewhisky_E1: label nt_he_firewhisky_E2: call bld gen "More firewhisky?" ("base", xpos="far_left", ypos="head") - ton "Thought you'd never ask..." ("horny", "base", "base", "down", ypos="head", flip=False) + ton "Thought you'd never ask..." ("horny", "base", "base", "down", xpos="base", ypos="head", flip=False) jump tonks_hangout_continue @@ -181,7 +181,7 @@ label nt_he_firewhisky_E3: call bld gen "Want to get drunk?" ("base", xpos="far_left", ypos="head") - ton "Of course." ("base", "narrow", "shocked", "down", ypos="head", flip=False) + ton "Of course." ("base", "narrow", "shocked", "down", xpos="base", ypos="head", flip=False) if states.env.daytime: ton "I'm not going to regret this, am I?" ("clench", "base", "raised", "downR") ton "Hopefully my students won't notice..." ("grin", "narrow", "base", "downR") @@ -192,7 +192,7 @@ label nt_he_firewhisky_E3: label nt_he_firewhisky_E4: - ton "Bottoms up." ("base", "narrow", "base", "mid", ypos="head", flip=False) + ton "Bottoms up." ("base", "narrow", "base", "mid", xpos="base", ypos="head", flip=False) play sound "sounds/gulp.ogg" ton "*Gulp*{w=0.8}{nw}" ("scream", "closed", "base", "mid") play sound "sounds/gulp.ogg" @@ -209,7 +209,7 @@ label nt_he_firewhisky_E4: ### Events ### label nt_he_favors_E1: - ton "So, [name_genie_tonks]... What's the going rate around here, then?" ("open", "base", "raised", "mid", ypos="head", flip=False) + ton "So, [name_genie_tonks]... What's the going rate around here, then?" ("open", "base", "raised", "mid", xpos="base", ypos="head", flip=False) gen "Going rate?" ("base", xpos="far_left", ypos="head") ton "How much do you pay your students to fool around?" ("base", "narrow", "annoyed", "mid") gen "Oh... It depends on what you want them to do." ("base", xpos="far_left", ypos="head") @@ -243,7 +243,7 @@ label nt_he_favors_E1: label nt_he_favors_E2: - ton "You know, [name_genie_tonks]... I overheard a couple of students whispering about me..." ("open", "base", "raised", "mid", ypos="head", flip=False) + ton "You know, [name_genie_tonks]... I overheard a couple of students whispering about me..." ("open", "base", "raised", "mid", xpos="base", ypos="head", flip=False) gen "Finally..." ("grin", xpos="far_left", ypos="head") ton "I walked past a group of boys the other day..." ("open", "base", "base", "R") ton "One straight up called me a slut, whilst the others snickered at me..." ("open", "base", "base", "down") @@ -271,7 +271,7 @@ label nt_he_favors_E2: ### Tonks Auror Stories ### label nt_he_story_intro_E1: - ton "Thanks for accepting my job application by the way." ("base", "base", "base", "mid", ypos="head", flip=False) + ton "Thanks for accepting my job application by the way." ("base", "base", "base", "mid", xpos="base", ypos="head", flip=False) gen "I didn't really have that much choice in the matter." ("base", xpos="far_left", ypos="head") ton "Oh, yeah..." ("grin", "narrow", "base", "downR") ton "..." ("annoyed", "base", "base", "R") @@ -306,8 +306,8 @@ label nt_he_story_intro_E1: label nt_he_story_intro_E2: call bld - gen "You mentioned an auror last time if I'm not mistaken." ("base", xpos="far_left", ypos="head") - ton "Moody?" ("annoyed", "wide", "shocked", "mid", ypos="head", flip=False) + gen "I remember you mentioning something about being taught by an auror..." ("base", xpos="far_left", ypos="head") + ton "Moody?" ("annoyed", "wide", "shocked", "mid", xpos="base", ypos="head", flip=False) gen "Not in particular." ("base", xpos="far_left", ypos="head") ton "What?" ("mad", "base", "raised", "mid") gen "..." ("base", xpos="far_left", ypos="head") @@ -342,7 +342,7 @@ label nt_he_story_intro_E3: gen "Why go anywhere when you've got a magic cupboard that fills itself with alcohol." ("base", xpos="far_left", ypos="head") ton "It does?" ("open", "wide", "raised", "mid") gen "At least I think that's how it works..." ("base", xpos="far_left", ypos="head") - gen "I may be a Genie, but I can't just turn water into wine... or whisky." ("base", xpos="far_left", ypos="head") + gen "I may be a Genie, but I can't just turn water into wine or whisky unintentionally..." ("base", xpos="far_left", ypos="head") gen "(At least not in this world...)" ("base", xpos="far_left", ypos="head") ton "Yeah, that would be impressive." ("silly", "happyCl", "base", "mid") ton "I haven't found a single wizard that could do that." ("open", "closed", "shocked", "mid") @@ -359,11 +359,21 @@ label nt_he_story_intro_E3: label nt_he_story_intro_E4: - ton "I've been so busy lately... The days here fly by faster than a Firebolt." ("open", "closed", "worried", "mid", ypos="head", flip=False) + ton "I've been so busy lately... The days here fly by faster than a Firebolt." ("open", "closed", "worried", "mid", xpos="base", ypos="head", flip=False) gen "I'm not sure I know that... Spell?" ("base", xpos="far_left", ypos="head") ton "It's a broom..." ("upset", "base", "base", "mid") - gen "Oh, I see... I'm not really that into brooms." ("base", xpos="far_left", ypos="head") - gen "Or anything that is inconveniently stiff and long to ride on..." ("base", xpos="far_left", ypos="head") + if states.gen.knowledge.firebolt: + gen "Oh right... It's the broom that Miss Chang was trying to persuade me to buy for her..." ("base", xpos="far_left", ypos="head") + ton "Very cheeky that one..." ("grin", "base", "base", "R") + ton "In more ways than one..." ("grin", "base", "base", "R") + gen "Brooms are a pain in the ass..." ("base", xpos="far_left", ypos="head") + gen "And don't try to convince a vacuum is much better, I've already tried it..." ("base", xpos="far_left", ypos="head") + ton "A what, sorry?" ("upset", "base", "base", "mid") + gen "I'm not riding anything hard or stiff, is all I'm saying..." ("base", xpos="far_left", ypos="head") + else: + $ states.gen.knowledge.firebolt = True + gen "Oh, I see... I'm not really that into brooms." ("base", xpos="far_left", ypos="head") + gen "Or anything that is inconveniently stiff and long to ride on..." ("base", xpos="far_left", ypos="head") ton "Well, I don't mind that... Most witches don't." ("grin", "base", "base", "R") gen "You should ask me about my knowledge of flying carpets instead!" ("grin", xpos="far_left", ypos="head") gen "I can tell you everything about the newest model." ("grin", xpos="far_left", ypos="head") @@ -384,19 +394,17 @@ label nt_he_story_intro_E4: label nt_he_story_intro_E5: call bld - gen "You still haven't told me anything about your time as an auror..." ("base", xpos="far_left", ypos="head") - ton "Well, what would you like to know?" ("open", "wide", "raised", "mid", ypos="head", flip=False) - gen "That \"moody\" guy taught you, you said. You could start there." ("base", xpos="far_left", ypos="head") - ton "Well, the job of an auror is a bit different now than how it was ten or so years ago." ("open", "base", "base", "R") - ton "I studied to become an auror with the hopes of taking down evil wizards." ("annoyed", "base", "annoyed", "down") + gen "Tell me a bit about your time as an auror... Surely you must've had your fair share of excitement." ("base", xpos="far_left", ypos="head") + ton "Well, what would you like to know?" ("open", "wide", "raised", "mid", xpos="base", ypos="head", flip=False) + gen "That \"moody\" guy taught you, you said. I'd love to hear what it was like..." ("base", xpos="far_left", ypos="head") + ton "It was something alright... The job of an auror is a bit different now than how it was ten or so years ago, after all..." ("open", "base", "base", "R") + ton "The general impression people have of aurors is that our only job is to take down evil wizards, vampires and other beings." ("annoyed", "base", "annoyed", "down") gen "Sounds like a nineties B movie to me." ("base", xpos="far_left", ypos="head") ton "A what?" ("normal", "shocked", "raised", "mid") gen "Never mind... Continue." ("base", xpos="far_left", ypos="head") - ton "In any case... That's not at all how the job is anymore." ("mad", "base", "base", "R") - gen "Was it ever?" ("base", xpos="far_left", ypos="head") - ton "That's what they told me..." ("annoyed", "base", "annoyed", "R") #'tell' to 'told' - ton "But right now, it's mostly droves of paperwork." ("open", "closed", "annoyed", "mid") - ton "Back in the day, they never used to bother with it." ("upset", "base", "base", "mid") + ton "In any case... It's just one aspect of the job." ("mad", "base", "base", "R") + ton "In-between jobs, I'll spend weeks, dealing with droves of paperwork." ("open", "closed", "annoyed", "mid") + ton "I blame my predecessors... Back in the day, they never used to bother with it." ("upset", "base", "base", "mid") gen "Don't you have people for that sort of thing?" ("base", xpos="far_left", ypos="head") ton "We're our own division, and are supposed to follow strict guidelines set by the ministry." ("open", "closed", "base", "mid") ton "There was too much bad stuff happening for anyone to lecture the aurors though..." ("normal", "base", "annoyed", "R") @@ -412,9 +420,13 @@ label nt_he_story_intro_E5: label nt_he_story_E6: - ton "Did I ever tell you about the time we arrested a vampire?" ("open", "wide", "base", "mid", ypos="head", flip=False) - gen "You haven't even told me about your \"defence against the dark arts\" training yet, but sure, go ahead..." ("base", xpos="far_left", ypos="head") - ton "Right... Well, there was this vampire guy." ("soft", "base", "base", "R") + ton "Did I ever tell you about the time we arrested a vampire?" ("open", "wide", "base", "mid", xpos="base", ypos="head", flip=False) + gen "I don't believe so... What type of vampire was it?" ("base", xpos="far_left", ypos="head") + ton "What do you mean?" ("soft", "base", "base", "mid") + gen "Was it the sparkly type, the blood-sucking type, or the counting type of vampire?" ("base", xpos="far_left", ypos="head") + ton "The second one..." ("soft", "base", "base", "R") + gen "I see..." ("base", xpos="far_left", ypos="head") + ton "Anyway... There was this vampire guy." ("soft", "base", "base", "R") ton "We spent ages looking for him, and found that he had been disguising himself as a headmaster of a muggle school." ("mad", "narrow", "base", "downR") gen "..." ("base", xpos="far_left", ypos="head") ton "It was quite disgusting what he was doing to the students actually..." ("annoyed", "closed", "angry", "mid") @@ -435,7 +447,7 @@ label nt_he_story_E6: label nt_he_story_intro_E7: call bld gen "Now, I'm starting to feel like you've been avoiding the subject of your auror training." ("base", xpos="far_left", ypos="head") - ton "Is it that obvious?" ("mad", "base", "base", "R", ypos="head", flip=False) + ton "Is it that obvious?" ("mad", "base", "base", "R", xpos="base", ypos="head", flip=False) gen "You brought up vampires last time without even saying hello." ("base", xpos="far_left", ypos="head") ton "Vampires are interesting..." ("soft", "base", "worried", "downR") gen "..." ("base", xpos="far_left", ypos="head") @@ -456,7 +468,7 @@ label nt_he_story_intro_E7: label nt_he_story_E8: - ton "I'll tell you about this one time when Moody went a bit too far." ("normal", "base", "base", "downR", ypos="head", flip=False) + ton "I'll tell you about this one time when Moody went a bit too far." ("normal", "base", "base", "downR", xpos="base", ypos="head", flip=False) gen "Where did this sudden urge of sharing come from?" ("base", xpos="far_left", ypos="head") ton "Oh, I've been wanting to spill the beans about this for ages. I just didn't want to get anyone in trouble at the ministry..." ("normal", "closed", "base", "mid") gen "What's to say I won't get you into trouble?" ("base", xpos="far_left", ypos="head") @@ -493,7 +505,7 @@ label nt_he_story_E8: label nt_he_story_intro_E9: - ton "Being an auror was quite a stressful job, you know." ("open", "closed", "shocked", "mid", ypos="head", flip=False) + ton "Being an auror was quite a stressful job, you know." ("open", "closed", "shocked", "mid", xpos="base", ypos="head", flip=False) gen "I--" ("base", xpos="far_left", ypos="head") ton "The ministry was mostly concerned about the criminals making up for their crimes." ("open", "base", "angry", "mid") ton "But I was more concerned about the victims involved." ("open", "closed", "base", "mid") @@ -530,7 +542,7 @@ label nt_he_story_intro_E9: label nt_he_story_intro_E10: call bld gen "Settled in okay?" ("base", xpos="far_left", ypos="head") - ton "Yes, I finally feel like I've found some sort of daily routine." ("grin", "wide", "base", "mid", ypos="head", flip=False) + ton "Yes, I finally feel like I've found some sort of daily routine." ("grin", "wide", "base", "mid", xpos="base", ypos="head", flip=False) ton "This school brings back so many memories. It's like, every time I turn a corner, I expect to see one of my old classmates." ("open", "base", "shocked", "R") gen "So, good memories?" ("base", xpos="far_left", ypos="head") ton "Mostly, it's a bit different now." ("base", "narrow", "shocked", "down") @@ -547,10 +559,10 @@ label nt_he_story_intro_E10: label nt_he_story_E11: - $ states.gen.ev.tonks.metamorphmagi_aware = True + $ states.gen.knowledge.tonks_metamorphmagi = True call bld gen "Tell me more about your time at Hogwarts, as a student..." ("base", xpos="far_left", ypos="head") - ton "Of course, [name_genie_tonks]." ("base", "base", "base", "mid", ypos="head", flip=False) + ton "Of course, [name_genie_tonks]." ("base", "base", "base", "mid", xpos="base", ypos="head", flip=False) ton "Well, as you may or may not know. I'm a metamorphmagus." ("open", "base", "base", "R") #metamorphmagus is a latin based word, therefore "-us" is the singular version and "-i" is the plural ton "It means I can change my physical appearance at will." ("base", "base", "raised", "mid") gen "Sounds useful." ("base", xpos="far_left", ypos="head") @@ -587,7 +599,7 @@ label nt_he_story_E11: label nt_he_story_E12: call bld gen "Tell me more about that shapeshifting ability of yours..." ("base", xpos="far_left", ypos="head") - ton "Of course..." ("base", "wide", "shocked", "mid", ypos="head", flip=False) + ton "Of course..." ("base", "wide", "shocked", "mid", xpos="base", ypos="head", flip=False) ton "Most of my escapades were kind of one-trick ponies." ("open", "base", "base", "R") gen "Sounds pretty foolproof to me..." ("base", xpos="far_left", ypos="head") gen "I mean, how many other students could change their appearance?" ("base", xpos="far_left", ypos="head") @@ -616,7 +628,7 @@ label nt_he_story_E12: gen "Right..." ("base", xpos="far_left", ypos="head") ton "I had been practising some charms, and taught myself a couple on my own, like the one for invisibility..." ("crooked_smile", "base", "base", "down") gen "Impressive." ("base", xpos="far_left", ypos="head") - ton "Thanks... Normally, you wouldn't learn that one until much later, so you'd easily be able to dispel it." ("silly", "happyCl", "base", "mid") + ton "Thanks... I had to \"borrow\" a book from the restricted section to learn that one... Normally, they don't teach it." ("silly", "happyCl", "base", "mid") gen "But you decided it was a good idea to teach it anyway?" ("base", xpos="far_left", ypos="head") ton "I didn't say it was a good idea." ("mad", "base", "base", "mid") ton "It didn't end up working anyway..." ("upset", "base", "worried", "R") diff --git a/game/scripts/characters/tonks/events/intro.rpy b/game/scripts/characters/tonks/events/intro.rpy index e5affedc..4431744a 100644 --- a/game/scripts/characters/tonks/events/intro.rpy +++ b/game/scripts/characters/tonks/events/intro.rpy @@ -342,7 +342,7 @@ label tonks_intro_E2: # You discuss Tonks and the Ministry with Snape. label ss_he_tonks_E1: - sna "........................." ("snape_31", ypos="head") + sna "........................." ("snape_31", xpos="base", ypos="head", flip=False) sna "That bloody wench has outdone herself, once again!" ("snape_35") gen "Granger?" ("base", xpos="far_left", ypos="head") sna "Yes! She and her cursed letters!" ("snape_08") @@ -544,7 +544,7 @@ label tonks_intro_E3: $ desk_OBJ.idle = "desk_dumbledore" $ chair_left_OBJ.hidden = True call cast_spell("revelio") - ton @ hair angry "{shake}Revelio!{/shake}" ("open_wide", "shocked", "annoyed", "mid", ypos="head", flip=False) + ton @ hair angry "{shake}Revelio!{/shake}" ("open_wide", "shocked", "annoyed", "mid", xpos="base", ypos="head", flip=False) call bld("hide") pause.6 @@ -706,7 +706,7 @@ label tonks_intro_E3: # You inform Snape that Tonks is now an ally and has been made a teacher. label ss_he_tonks_E2: - sna "........................." ("snape_31", ypos="head") + sna "........................." ("snape_31", xpos="base", ypos="head", flip=False) sna "So, here is the plan..." ("snape_03") sna "You get a shovel and a body-bag ready, and I'll do the \"Avada Kedavra\"!" ("snape_01") gen "\"Avra-ka--\"{w} What the fuck are you talking about?" ("base", xpos="far_left", ypos="head") @@ -834,7 +834,7 @@ label ss_he_tonks_E2: label ss_he_tonks_E3: call bld gen "Our new partner in crime, is she getting on well?" ("base", xpos="far_left", ypos="head") - sna "Tonks? I haven't seen her that much... I prefer not to fraternize with the other teachers..." ("snape_09", ypos="head") + sna "Tonks? I haven't seen her that much... I prefer not to fraternize with the other teachers..." ("snape_09", xpos="base", ypos="head", flip=False) sna "Shouldn't you know what that witch is up to? You made her a teacher, after all..." ("snape_01") gen "I'm sure she's still just settling down..." ("base", xpos="far_left", ypos="head") sna "Probably drinking booze down at Hogsmeade, more likely..." ("snape_35") diff --git a/game/scripts/events/ending.rpy b/game/scripts/events/ending.rpy index e4ab454e..918dc640 100644 --- a/game/scripts/events/ending.rpy +++ b/game/scripts/events/ending.rpy @@ -111,7 +111,7 @@ label ball_ending_E1: call sna_chibi("stand","door","base", flip=False) pause.5 - sna "One more thing though..." ("snape_01", ypos="head") + sna "One more thing though..." ("snape_01", xpos="base", ypos="head", flip=False) gen "Yes?" ("base", xpos="far_left", ypos="head") sna "If it all goes well..." ("snape_24") sna "Will I find the real Albus Dumbledore in that chair tomorrow?" @@ -501,7 +501,7 @@ label ball_ending_E2: gen "(There she is!)" ("grin", xpos="far_left", ypos="head") mal "Hermione, hey..." - her "Oh, hello." ("base", "base", "base", "mid", ypos="head", flip=False) + her "Oh, hello." ("base", "base", "base", "mid", xpos="base", ypos="head", flip=False) mal "You look... so beautiful tonight, Hermione." her "Thank you, you are too sweet." ("base", "closed", "base", "mid") mal2 "Can I have the next dance?" @@ -822,7 +822,7 @@ label ball_ending_E2: pause.5 gen "What on earth just happened, girl?!" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "What do you mean, sir?" ("soft", "narrow", "base", "R_soft", ypos="head", flip=False) + her @ cheeks blush "What do you mean, sir?" ("soft", "narrow", "base", "R_soft", xpos="base", ypos="head", flip=False) hide cg call hide_blkfade @@ -1057,11 +1057,11 @@ label ball_ending_E2: if "public" in states.her.ev.yule_ball.variant: # Public whore ending - sna "Miss Granger...?" ("snape_03", ypos="head") + sna "Miss Granger...?" ("snape_03", xpos="base", ypos="head", flip=False) sna "So you decided to show up after all." ("snape_04") sna "What an unpleasant surprise..." ("snape_03") - her "Professor..." ("upset", "base", "base", "mid", ypos="head", flip=False) + her "Professor..." ("upset", "base", "base", "mid", xpos="base", ypos="head", flip=False) sna "Well, go ahead then..." ("snape_10") sna "Here is the tiara..." @@ -1267,7 +1267,7 @@ label ball_ending_E2: her ".........................................................." call ctc - sna "Quiet down, everyone!" ("snape_12", ypos="head") + sna "Quiet down, everyone!" ("snape_12", xpos="base", ypos="head", flip=False) sna "As for you, Miss Granger..." ("snape_12") sna "I think that's enough." ("snape_12") sna "Cover up and get off the stage... Go..." ("snape_12") @@ -1288,16 +1288,16 @@ label ball_ending_E2: "Somebody from the crowd" "I love you, Hermione!" "Another voice from the crowd" "Gryffindor rules!!!" - sna "Miss Granger, I said that's enough!" ("snape_18", ypos="head") + sna "Miss Granger, I said that's enough!" ("snape_18", xpos="base", ypos="head", flip=False) pause.1 her "As you say, professor..." - sna "And wipe your face, girl. You look repulsive." ("snape_12", ypos="head") + sna "And wipe your face, girl. You look repulsive." ("snape_12", xpos="base", ypos="head", flip=False) pause.1 show her_ball speech h2 mouth_open eyes_none sperm_cum6 brows_none as cg her "Oh, this? This is just my--" - sna "Don't care! Get off the stage already!" ("snape_18", ypos="head") + sna "Don't care! Get off the stage already!" ("snape_18", xpos="base", ypos="head", flip=False) sna "Now!" ("snape_18") pause.1 @@ -1315,7 +1315,7 @@ label ball_ending_E2: call hide_blkfade call ctc - her @ cheeks blush "[name_genie_hermione]..." ("soft", "narrow", "base", "R_soft", ypos="head", flip=False) + her @ cheeks blush "[name_genie_hermione]..." ("soft", "narrow", "base", "R_soft", xpos="base", ypos="head", flip=False) her "There was something you wanted to discuss with me?" gen "Not right now, whore!" ("angry", xpos="far_left", ypos="head") call blkfade @@ -1922,7 +1922,7 @@ label ball_ending_E2: sly1 "Yeah, let's go!" sly2 "Bye, mudblood whore!" sly1 "Yeah, thank you for being such a slut!" - her @ cheeks blush tears mascara_soft ".........................." ("soft", "narrow", "annoyed", "up", ypos="head", flip=False) + her @ cheeks blush tears mascara_soft ".........................." ("soft", "narrow", "annoyed", "up", xpos="base", ypos="head", flip=False) play sound "sounds/footsteps.ogg" hide cg @@ -1984,9 +1984,9 @@ label ball_ending_E2: else: # Personal whore ending - sna "Miss Granger...?" ("snape_03", ypos="head") + sna "Miss Granger...?" ("snape_03", xpos="base", ypos="head", flip=False) sna "You decided to show up after all? What an unpleasant surprise..." ("snape_04") - her @ cheeks blush tears mascara "..............................." ("full", "narrow", "annoyed", "up", ypos="head", flip=False) + her @ cheeks blush tears mascara "..............................." ("full", "narrow", "annoyed", "up", xpos="base", ypos="head", flip=False) sna "What happened to your face, girl?" ("snape_13") her @ cheeks blush tears mascara "......................................." ("full", "narrow", "worried", "down") sna "*Hmm*... Well, go ahead then..." ("snape_13") @@ -2118,7 +2118,7 @@ label ball_ending_E2: stop music fadeout 1.0 gen "Great speech..." ("base", xpos="far_left", ypos="head") gen "Very arousing... *Ehm*... I mean inspiring." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "Thank you, sir." ("soft", "narrow", "base", "R_soft", ypos="head", flip=False) + her @ cheeks blush "Thank you, sir." ("soft", "narrow", "base", "R_soft", xpos="base", ypos="head", flip=False) gen "Swallowing my load in front of the entire school?" ("base", xpos="far_left", ypos="head") gen "A very nice touch." ("grin", xpos="far_left", ypos="head") her @ cheeks blush "........................................................" ("crooked_smile", "happyCl", "worried", "mid") @@ -2328,7 +2328,7 @@ label ball_ending_E2: pause.3 # Insertion - her @ cheeks blush tears soft "{bounce}*Ah*...{/bounce}" ("open", "wide", "worried", "stare", ypos="head", flip=False) + her @ cheeks blush tears soft "{bounce}*Ah*...{/bounce}" ("open", "wide", "worried", "stare", xpos="base", ypos="head", flip=False) her @ cheeks blush "Sir, no. You must listen to me--" ("open_tongue", "narrow", "worried", "mid_soft") play sound "sounds/gltch.ogg" with hpunch @@ -2440,7 +2440,7 @@ label ball_ending_E2: with hpunch pause.3 - her @ cheeks blush tears messy "..........." ("angry", "narrow", "annoyed", "up", ypos="head", flip=False) + her @ cheeks blush tears messy "..........." ("angry", "narrow", "annoyed", "up", xpos="base", ypos="head", flip=False) gen "There..." ("base", xpos="far_left", ypos="head") @@ -2571,8 +2571,8 @@ label ball_ending_E2: with d9 stop music fadeout 1.0 - her @ cheeks blush tears mascara_soft "*Ah*..." ("silly", "narrow", "annoyed", "up", ypos="head", flip=False) - her "I can... barely... stand..." + her @ cheeks blush tears mascara_soft "*Ah*..." ("silly", "narrow", "annoyed", "up", xpos="base", ypos="head", flip=False) + her "I can... barely... stand..."("silly", "narrow", "annoyed", "up") gen "I know what you mean, girl." ("angry", xpos="far_left", ypos="head") gen "This was our most intense fucking session yet!" ("angry", xpos="far_left", ypos="head") her @ cheeks blush tears mascara_soft "Yes... I never knew I could..." ("silly", "narrow", "annoyed", "up") diff --git a/game/scripts/events/ending_after.rpy b/game/scripts/events/ending_after.rpy index edd92a3e..c996e57a 100644 --- a/game/scripts/events/ending_after.rpy +++ b/game/scripts/events/ending_after.rpy @@ -117,7 +117,7 @@ label ending_after: nar "As she enters the hallway, you notice some Slytherin students looking in your direction, smirks spreading across their faces." $ hermione.equip(her_outfit_ball) - her @ cheeks blush "Back so soon?" ("base", "happy", "base", "L", ypos="head", flip=False) + her @ cheeks blush "Back so soon?" ("base", "happy", "base", "L", xpos="base", ypos="head", flip=False) gen "I... *Err*...{w=0.4} had a change of heart." ("base", xpos="far_left", ypos="head") her "I see... Yes, it is quite cold outside tonight, isn't it?" ("base", "base", "base", "mid") gen "Yes...{w=0.5} that's it." ("base", xpos="far_left", ypos="head") @@ -199,7 +199,7 @@ label ending_after: # Snape enters and walks up to desk call sna_walk(action="enter", xpos="desk") gen "What did I tell you about knocking!" ("angry", xpos="far_left", ypos="head") - sna "Who rule..." ("snape_03", ypos="head") + sna "Who rule--" ("snape_03", xpos="base", ypos="head", flip=False) sna "You motherfucker..." ("snape_01") sna "I knew it!" ("snape_02") sna "I knew you couldn't make yourself leave yet." ("snape_02") @@ -224,7 +224,7 @@ label ending_after: nar "Arriving at the great hall, you decide to take a quick glance through the doorway before heading back to your office." nar "Hermione is currently looking out one of the windows and is not aware of your presence." nar "You glance over at the high table and lock eyes with Snape, who quickly stands up and then slides towards you." - sna "Good evening sir...{w=0.5} I...{w=0.8} I didn't expect you so soon." ("snape_29", ypos="head") + sna "Good evening sir...{w=0.5} I...{w=0.8} I didn't expect you so soon." ("snape_29", xpos="base", ypos="head", flip=False) gen "Hello again Severus." ("base", xpos="far_left", ypos="head") gen "I have returned..." ("base", xpos="far_left", ypos="head") sna "*Ahem*...{w=0.4} I see..." ("snape_06") @@ -261,7 +261,7 @@ label ending_after: $ hermione.equip(her_outfit_ball) nar "As Snape slides back towards the teacher's table, Hermione notices your presence and quickly starts walking towards you." nar "Before you can even attempt to slip into the shadows again, she's already come through the doorway with one of her arms held out in front of her." - her @ cheeks blush "Care for a dance?" ("base", "happy", "base", "L", ypos="head", flip=False) # smiles + her @ cheeks blush "Care for a dance?" ("base", "happy", "base", "L", xpos="base", ypos="head", flip=False) # smiles gen "I...{w=0.4} Oh, what the hell... Why not." ("base", xpos="far_left", ypos="head") her @ cheeks blush "..." ("base", "narrow", "base", "down") # smiles nar "With your arms wrapped around Hermione's waist, the two of you begin moving along with the music." diff --git a/game/scripts/events/potions/intro.rpy b/game/scripts/events/potions/intro.rpy index d1c8564e..3323cb54 100644 --- a/game/scripts/events/potions/intro.rpy +++ b/game/scripts/events/potions/intro.rpy @@ -253,7 +253,7 @@ label potions_intro_E2: gen "..." ("angry", xpos="far_left", ypos="head") if states.map.snape_office.intro_e1: - sna "I thought I told you to call for me if you needed anything." ("snape_04", ypos="head", trans=d3) + sna "I thought I told you to call for me if you needed anything." ("snape_04", xpos="base", ypos="head", trans=d3) call gen_chibi("stand", flip=False) gen "That's weird..." ("base", xpos="far_left", ypos="head") sna "..." ("snape_04") diff --git a/game/scripts/minigames/dueling/snape_duel.rpy b/game/scripts/minigames/dueling/snape_duel.rpy index e77d4058..00e887c9 100644 --- a/game/scripts/minigames/dueling/snape_duel.rpy +++ b/game/scripts/minigames/dueling/snape_duel.rpy @@ -55,7 +55,7 @@ label duel: call bld gen "This is foolish... You are no match for me..." ("base", xpos="far_left", ypos="head") - sna "Amusing..." ("snape_01", ypos="head", wand=True) + sna "Amusing..." ("snape_01", xpos="base", ypos="head", wand=True) gen "{size=-4}(Actually my human body is quite weak...){/size}" ("base", xpos="far_left", ypos="head") gen "{size=-4}(But I should still be way more powerful than any human wizard...){/size}" ("base", xpos="far_left", ypos="head") sna "Let the duel begin!" ("snape_01", wand=True) @@ -75,7 +75,7 @@ label duel_main: if genie_hp <= 300 and not d_flag_01: $ d_flag_01 = True - sna "Ready to give up yet?" ("snape_01", ypos="head", wand=True) + sna "Ready to give up yet?" ("snape_01", xpos="base", ypos="head", wand=True) gen "*Tsk*..." ("angry", xpos="far_left", ypos="head") hide snape_main with d3 @@ -83,7 +83,7 @@ label duel_main: if snape_hp <= 400 and not d_flag_02: $ d_flag_02 = True gen "{size=-4}(He is getting weaker, I can feel it!){/size}" ("angry", xpos="far_left", ypos="head") - sna "*Panting*" ("snape_01", ypos="head", wand=True) + sna "*Panting*" ("snape_01", xpos="base", ypos="head", wand=True) hide snape_main with d3 diff --git a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy index cb7bd171..e52aa8e6 100644 --- a/game/scripts/minigames/mirror/events/a_christmas_tale.rpy +++ b/game/scripts/minigames/mirror/events/a_christmas_tale.rpy @@ -59,7 +59,7 @@ label a_christmas_tale: call sna_walk("mid", "base") pause.2 - sna "Genie? Where are you... I came here, to vent..." (face="snape_03", ypos="head") + sna "Genie? Where are you... I came here, to vent..." (face="snape_03", xpos="base", ypos="head") nar "He wondered if the genie had found a way home..." sna "Seems like a normal Christmas, spent all alone..." (face="snape_06") 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 b14ac51a..b00fee6e 100644 --- a/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy +++ b/game/scripts/minigames/mirror/events/a_spaced_out_conversation.rpy @@ -32,7 +32,7 @@ label a_spaced_out_conversation: nar "Sometimes, if the flames flickered just so, he almost appeared entirely different, as a burly, cowled man with a short curled beard." nar "They sat in front of the fire as they did on many nights and talked of worlds upon worlds. And of magic. The dark man was the first to speak." - sna "So, let me try to understand this..." ("snape_05", ypos="head", trans=d3) + sna "So, let me try to understand this..." ("snape_05", xpos="base", ypos="head", trans=d3) nar "Snape said slowly." sna "You live in a little bottle?" ("snape_05") nar "The gray figure nodded." diff --git a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy index ac759516..9e909c7c 100644 --- a/game/scripts/minigames/mirror/events/anal_pirate_event.rpy +++ b/game/scripts/minigames/mirror/events/anal_pirate_event.rpy @@ -110,7 +110,7 @@ label anal_pirate_event_common_1_2: pause 2 gen "*Hmm*..." ("base", xpos="far_left", ypos="head") play sound "sounds/boing02.ogg" - her "{shake}!!!{/shake}" ("angry", "wide", "base", "stare", ypos="head", flip=True) + her "{shake}!!!{/shake}" ("angry", "wide", "base", "stare", xpos="base", ypos="head", flip=False) play sound "sounds/slap_02.ogg" gen "Blistering barnacles!" ("angry", xpos="far_left", ypos="head") her @ tears soft_blink "{shudder}Ouch!{/shudder}" ("mad", "happyCl", "worried", "mid") @@ -128,7 +128,7 @@ label anal_pirate_event_common_1_2: play music "music/pirate.ogg" fadein 1 fadeout 1 if_changed play background "sounds/CreakingShip.ogg" - her "Just set sail, captain?!" ("angry", "wide", "base", "stare", ypos="head", flip=True) + her "Just set sail, captain?!" ("angry", "wide", "base", "stare", xpos="base", ypos="head", flip=False) play sound "sounds/spit.ogg" gen "*SPIT!*" ("angry", xpos="far_left", ypos="head") her "What are ye doing you Seadog!" ("scream", "happyCl", "worried", "mid") @@ -183,7 +183,7 @@ label anal_pirate_event_common_1_2: gen "{shake}ARGH!{/shake}" ("angry", xpos="far_left", ypos="head") "{size=-3}\"Lather me cannon balls first. Lubricate me pegleg!\"{/size}": - her "Oh... Alright..." ("open", "base", "base", "mid", ypos="head", flip=True) + her "Oh... Alright..." ("open", "base", "base", "mid", xpos="base", ypos="head", flip=False) play music "music/pirate.ogg" fadein 1 fadeout 1 if_changed play background "sounds/CreakingShip.ogg" @@ -242,7 +242,7 @@ label anal_pirate_event_common_1_2: with fade call ctc - her "*Slurp!* *Slurp!* *Slurp!*" (ypos="head", flip=False) + her "*Slurp!* *Slurp!* *Slurp!*" (xpos="base", ypos="head", flip=False) gen "Aye... good lass..." ("base", xpos="far_left", ypos="head") her "*Slurp!* *Slurp!* *Slurp!*" gen "Can ye taste yer arse on me cannon?" ("base", xpos="far_left", ypos="head") @@ -371,7 +371,7 @@ label anal_pirate_event_common_1_2: "-Sink her vessel, fill her up-": gen "Argh!" ("angry", xpos="far_left", ypos="head") play sound "sounds/fuse.ogg" - her "No! AH!" ("scream", "wide", "base", "stare", ypos="head", flip=True) + her "No! AH!" ("scream", "wide", "base", "stare", xpos="base", ypos="head", flip=False) play sound "sounds/cannon.ogg" call cum_block gen "{shake}ARGH!!!!!!!!!!!!!!!!{/shake}" ("angry", xpos="far_left", ypos="head") @@ -429,7 +429,7 @@ label anal_pirate_event_common_1_2: $ hermione.zorder = 15 # Reset zorder - her @ cheeks blush tears mascara "I apologise for saying that I hate you, captain..." ("base", "base", "base", "R", ypos="head", flip=True) + her @ cheeks blush tears mascara "I apologise for saying that I hate you, captain..." ("base", "base", "base", "R", xpos="base", ypos="head", flip=False) her @ cheeks blush tears mascara "And your cannon is not rusty..." her @ cheeks blush tears mascara "I don't know what's gotten into me..." ("grin", "narrow", "worried", "mid_soft") gen "My cannonfire!" ("grin", xpos="far_left", ypos="head") @@ -460,7 +460,7 @@ label anal_pirate_event_common_1_2: call cum_block call ctc - her "*Ah*...{heart}{heart}{heart}" ("silly", "narrow", "base", "dead", ypos="head", flip=True) + her "*Ah*...{heart}{heart}{heart}" ("silly", "narrow", "base", "dead", xpos="base", ypos="head", flip=False) gen "Aye!!! All over yer hold!" ("angry", xpos="far_left", ypos="head") her "*Ah*... No, me hull!" ("silly", "narrow", "annoyed", "up") hide screen bld1 @@ -474,7 +474,7 @@ label anal_pirate_event_common_1_2: pause.8 gen "Well, I'm done... You can get off my ship now." ("base", xpos="far_left", ypos="head") - her @ cheeks blush tears soft "Yes, captain..." ("silly", "base", "worried", "mid", ypos="head", flip=True) + her @ cheeks blush tears soft "Yes, captain..." ("silly", "base", "worried", "mid", xpos="base", ypos="head", flip=False) gen "You feeling alright?" ("base", xpos="far_left", ypos="head") her @ cheeks blush tears soft "Yes, captain. It still hurts a little, but..." ("shock", "base", "base", "R") gen "But what?" ("base", xpos="far_left", ypos="head") @@ -496,7 +496,7 @@ label anal_pirate_event_3: call blkfade $ desk_OBJ.hidden = True - her "........" ("annoyed", "base", "worried", "R", ypos="head", flip=True) + her "........" ("annoyed", "base", "worried", "R", xpos="base", ypos="head", flip=False) gen "*Hmm*..." ("base", xpos="far_left", ypos="head") her "..........." ("open", "base", "base", "mid") play sound "sounds/gltch.ogg" @@ -541,7 +541,7 @@ label anal_pirate_event_3: menu: gen "..." ("base", xpos="far_left", ypos="head") "{size=-3}\"I would leave me ship in a heartbeat!\"{/size}": - her "What?" ("open", "base", "base", "mid", ypos="head", flip=True) + her "What?" ("open", "base", "base", "mid", xpos="base", ypos="head", flip=False) gen "Aye, if only a lass like ye would board me ship..." ("base", xpos="far_left", ypos="head") her "... Aye...{heart}" ("base", "base", "base", "R") her ".............." ("base", "happy", "base", "mid") @@ -560,7 +560,7 @@ label anal_pirate_event_3: gen "Ye helm be leakin." ("base", xpos="far_left", ypos="head") "{size=-3}\"A pirate not plunderin t' be wit' ye be o' th' picture\"{/size}": - her @ cheeks blush tears crying "I be thinkin that..." ("shock", "narrow", "base", "down", ypos="head", flip=True) + her @ cheeks blush tears crying "I be thinkin that..." ("shock", "narrow", "base", "down", xpos="base", ypos="head", flip=False) gen "Oh... I jus' love that wee cavern o' yers!" ("base", xpos="far_left", ypos="head") her @ cheeks blush tears crying "....................." ("angry", "narrow", "base", "dead") her "Aye... Aft all th' thin's I had t' do fer me crew..." @@ -606,7 +606,7 @@ label anal_pirate_event_3: with hpunch call ctc - her "!!!" ("scream", "wide", "base", "stare", ypos="head", flip=True) + her "!!!" ("scream", "wide", "base", "stare", xpos="base", ypos="head", flip=False) gen "Shiver me timbers! Argh!" ("base", xpos="far_left", ypos="head") her "*Ah*!{heart} 'tis fillin' me up!{heart} me bilge is takin in water!{heart}" ("silly", "narrow", "annoyed", "up") gen "'tis nah water, wench!" ("base", xpos="far_left", ypos="head") @@ -634,7 +634,7 @@ label anal_pirate_event_3: with hpunch call ctc - her "*Ah-aha*! Ye're cummin'! {heart}{heart}{heart}" ("silly", "narrow", "base", "dead", ypos="head", flip=True) + her "*Ah-aha*! Ye're cummin'! {heart}{heart}{heart}" ("silly", "narrow", "base", "dead", xpos="base", ypos="head", flip=False) gen "{size=+7}Aye I do, wench{/size}" ("angry", xpos="far_left", ypos="head") her @ cheeks blush tears messy "Blisterin' Barnacles, me too! Me too!" ("scream", "happyCl", "worried", "mid") gen "{size=+7}FARRRGIN' WENCH!{/size}" ("angry", xpos="far_left", ypos="head") @@ -656,7 +656,7 @@ label anal_pirate_event_3: call her_chibi_scene("sex_pause", trans=fade) gen "Well, tis been intense..." ("base", xpos="far_left", ypos="head") - her @ cheeks blush tears messy "*Ah-ha*...{heart} *Ah*...{heart}" ("grin", "narrow", "base", "dead", ypos="head", flip=True) + her @ cheeks blush tears messy "*Ah-ha*...{heart} *Ah*...{heart}" ("grin", "narrow", "base", "dead", xpos="base", ypos="head", flip=False) gen "Ye be fine lass?" ("base", xpos="far_left", ypos="head") her @ cheeks blush tears messy "I reckon so... I be nah sure..." ("grin", "narrow", "base", "dead") her @ cheeks blush tears messy "I reckon I may still be leakin', captain." ("grin", "narrow", "base", "dead") diff --git a/game/scripts/minigames/mirror/events/blueballing_bad.rpy b/game/scripts/minigames/mirror/events/blueballing_bad.rpy index 5b4c9990..052e9005 100644 --- a/game/scripts/minigames/mirror/events/blueballing_bad.rpy +++ b/game/scripts/minigames/mirror/events/blueballing_bad.rpy @@ -40,7 +40,7 @@ label blueballing_bad: stop music fadeout 0.5 - her "{b}I AM NOT CRAZY!{/b}" ("scream", "closed", "angry", "mid", xpos="far_right", ypos="head") + her "{b}I AM NOT CRAZY!{/b}" ("scream", "closed", "angry", "mid", xpos="base", ypos="head", flip=False) play sound "sounds/MaleGasp.ogg" gen "What the--" ("open", xpos="far_left", ypos="head") @@ -50,7 +50,7 @@ label blueballing_bad: with d3 her "I'm not crazy..." ("mad", "base", "annoyed", "mid") - ton @ hair neutral "Miss Granger, you--" ("open", "wide", "shocked", "L", xpos="far_right", ypos="head") + ton @ hair neutral "Miss Granger, you--" ("open", "wide", "shocked", "L", xpos="base", ypos="head", flip=False) her "I {b}know{/b} what I saw. He has to be the one who stole my panties!" ("angry", "base", "annoyed", "mid") her "I knew that house elf was his!" ("mad", "base", "annoyed", "R") gen "The what?{w=0.5}{nw}" ("open", xpos="far_left", ypos="head") diff --git a/game/scripts/minigames/mirror/events/suck_and_run.rpy b/game/scripts/minigames/mirror/events/suck_and_run.rpy index 144d293a..8335360d 100644 --- a/game/scripts/minigames/mirror/events/suck_and_run.rpy +++ b/game/scripts/minigames/mirror/events/suck_and_run.rpy @@ -41,7 +41,7 @@ label suck_and_run: call setup_fireplace_hangout(char="snape") - sna "*Ah*... I've been looking forward to this..." ("snape_23", ypos="head") + sna "*Ah*... I've been looking forward to this..." ("snape_23", xpos="base", ypos="head", flip=False) gen "Rough day, I take it?" ("base", xpos="far_left", ypos="head") sna "Bloody slackers, all of them!" ("snape_17") gen "..." ("angry", xpos="far_left", ypos="head") @@ -256,7 +256,7 @@ label suck_and_run: play sound "sounds/punch01.ogg" with vpunch gen "Unhand me, foul demon!" ("angry", xpos="far_left", ypos="head") - ton @ hair angry "Of course, Sir..." ("grin", "base", "base", "L", ypos="head", flip=False) + ton @ hair angry "Of course, Sir..." ("grin", "base", "base", "L", xpos="base", ypos="head", flip=False) play sound "sounds/giggle2_loud.ogg" pause .8 ton @ hair angry "Right away, Sir..." ("crooked_smile", "base", "angry", "mid")