diff --git a/game/images/CG/lun_grind/lun_grind_background.webp b/game/images/CG/lun_grind/lun_grind_background.webp new file mode 100644 index 00000000..72ad684c --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_background.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:077dec073d73dfbee933cd719b817c0fe11ee301dcda28f982abfb88529f5aa1 +size 2185168 diff --git a/game/images/CG/lun_grind/lun_grind_body_grind.webp b/game/images/CG/lun_grind/lun_grind_body_grind.webp new file mode 100644 index 00000000..4b88bc38 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_body_grind.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4655816aad8cf5c42729d79ef39e0bb8dc6f1afbd730e8989b88b5cb2ef82a4 +size 1639340 diff --git a/game/images/CG/lun_grind/lun_grind_body_idle.webp b/game/images/CG/lun_grind/lun_grind_body_idle.webp new file mode 100644 index 00000000..61234393 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_body_idle.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4a0a4e5e56b54fd9823150c3a8ce392614fea9446c065d5c225bb07937ec668 +size 1603018 diff --git a/game/images/CG/lun_grind/lun_grind_body_spread.webp b/game/images/CG/lun_grind/lun_grind_body_spread.webp new file mode 100644 index 00000000..e795e3da --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_body_spread.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a00420fc333713a205602d3aba7ea112c00030d467a9e55eaa5d902f1a0af46e +size 1704798 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame0.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame0.webp new file mode 100644 index 00000000..f5915c19 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac488bcb3be6a61408c43581576000d7a0fcabfd43c38137c3a2fdd61c44e3b3 +size 8332 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame1.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame1.webp new file mode 100644 index 00000000..12a712f1 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8dcfc4f5d7c425e1bb506fbb109518fe4c51d88ab8b81603284f8297aa2b724 +size 15338 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame2.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame2.webp new file mode 100644 index 00000000..c08b9d70 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame2.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be879241991fa7d401bf9cb5fbd183ca7cf03a8bc3f252913d7d83e533b4643 +size 34100 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame3.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame3.webp new file mode 100644 index 00000000..7f848c44 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame3.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49b67956cabb1f5c411df5e94a3e7410312dce0d421dea56ac08433de917bbda +size 43844 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame4.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame4.webp new file mode 100644 index 00000000..9b19708b --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame4.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66c9ceb9d41b6ca8a3742968377e04f0354bd53c370b9d846fb2d402fefa3506 +size 58300 diff --git a/game/images/CG/lun_grind/lun_grind_cumshot_frame5.webp b/game/images/CG/lun_grind/lun_grind_cumshot_frame5.webp new file mode 100644 index 00000000..5a076e63 --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_cumshot_frame5.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64a0f1f4d8418177fb76dbe379901069e760d1efd654740b4548a76855547dd5 +size 70588 diff --git a/game/images/CG/lun_grind/lun_grind_penis_grind_frame0.webp b/game/images/CG/lun_grind/lun_grind_penis_grind_frame0.webp new file mode 100644 index 00000000..6bedb6be --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_penis_grind_frame0.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50ad2d2585afe2f8dd5a992b6cc57802e8404d6fdb5807dd1061e1960cdd892b +size 99226 diff --git a/game/images/CG/lun_grind/lun_grind_penis_grind_frame1.webp b/game/images/CG/lun_grind/lun_grind_penis_grind_frame1.webp new file mode 100644 index 00000000..6e6751ca --- /dev/null +++ b/game/images/CG/lun_grind/lun_grind_penis_grind_frame1.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70b7690761f42b8606c93c971656cbde942b9466fb2c0699032febb7e64e6b0f +size 100162 diff --git a/game/scripts/cg/luna.rpy b/game/scripts/cg/luna.rpy index e173c392..6700a54e 100644 --- a/game/scripts/cg/luna.rpy +++ b/game/scripts/cg/luna.rpy @@ -294,8 +294,6 @@ image lun_blowjob_personal_loop_ahegao_hold_down: pause 0.10 repeat - - image lun_blowjob_personal_pose1_handjob_slow: Fixed( "lun_blowjob_personal_pose1_luna_stroke_down_shadow", @@ -333,3 +331,82 @@ image lun_blowjob_personal_pose1_handjob_fast: pause 0.2 repeat + +layeredimage lun_grind: + fit "contain" + fit_first True + + always "lun_grind_background" + + group body: + attribute idle "lun_grind_idle" default + attribute grind "lun_grind_grind" default + attribute spread "lun_grind_spread" default + attribute cumshot "lun_grind_cumshot" default + +image lun_grind_idle: + Fixed( + "lun_grind_body_idle", + "lun_grind_penis_grind_frame0") + +image lun_grind_grind: + Fixed( + "lun_grind_body_idle", + "lun_grind_penis_grind_frame0") + + pause 0.44 + + Fixed( + "lun_grind_body_grind", + "lun_grind_penis_grind_frame1") + + pause 0.44 + repeat + +image lun_grind_spread: + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1") + +image lun_grind_cumshot: + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame0") + + pause 0.12 + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame1") + + pause 0.12 + + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame2") + + pause 0.12 + + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame3") + + pause 0.12 + + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame4") + + pause 0.12 + + Fixed( + "lun_grind_body_spread", + "lun_grind_penis_grind_frame1", + "lun_grind_cumshot_frame5") + + pause 1 + repeat diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy index 12640316..392da71d 100644 --- a/game/scripts/characters/cho/summon.rpy +++ b/game/scripts/characters/cho/summon.rpy @@ -45,7 +45,7 @@ label summon_cho: "Are you ready to begin the match?" "-Yes-": pass - "-no-": + "-No-": jump cho_requests jump start_hufflepuff_match @@ -57,7 +57,7 @@ label summon_cho: "Are you ready to begin the match?" "-Yes-": pass - "-no-": + "-No-": jump cho_requests jump start_slytherin_match diff --git a/game/scripts/characters/hermione/talk.rpy b/game/scripts/characters/hermione/talk.rpy index c3a552a6..f4571059 100644 --- a/game/scripts/characters/hermione/talk.rpy +++ b/game/scripts/characters/hermione/talk.rpy @@ -199,7 +199,87 @@ label hermione_talk: label genie_change: - her "Okay, from now on I'll call you [name_genie_hermione]." ("base", "base", "base", "mid") + # NickName responses + if name_genie_hermione == "Sir": + if states.her.level < 19: + random: + her "Certainly, [name_genie_hermione]." ("base", "base", "base", "mid") + her "Yes, [name_genie_hermione]." ("base", "base", "base", "mid") + her "Of course, [name_genie_hermione]." ("base", "base", "base", "mid") + else: + her "Do I really have to be so formal, [name_genie_hermione]?" ("annoyed", "happy", "base", "mid") + her "...{w=0.4} Alright then." ("open", "happy", "base", "mid") + elif name_genie_hermione == "Dumbledore": + if states.her.level < 3: + her "You'd like me to call you...{w=0.4} [name_genie_hermione]?" ("soft", "base", "base", "mid") + gen "That's my name...{w=0.4} Right?" ("base", xpos="far_left", ypos="head") + her "Yes, but...{w=0.4} You're a teacher." ("angry", "base", "base", "mid") + gen "So?" ("base", xpos="far_left", ypos="head") + her "Well...{w=0.4} I just figured...{w=0.4} Alright then..." ("soft", "squint", "base", "R") + else: + her "Of course, [name_genie_hermione]." ("base", "base", "base", "mid") + elif name_genie_hermione == "Professor": + her "Certainly, [name_genie_hermione]." ("base", "base", "base", "mid") + elif name_genie_hermione == "Old man": + her "Old man?" ("soft", "base", "base", "mid") + gen "That's right." ("base", xpos="far_left", ypos="head") + her "Okay then, if you say so..." ("base", "base", "base", "mid") + elif name_genie_hermione == "Genie": + her "Why, [name_genie_hermione]?" ("soft", "base", "base", "mid") + gen "Because that's my--" ("base", xpos="far_left", ypos="head") + gen "*Err*..." ("angry", xpos="far_left", ypos="head") + gen "Because the main role of a headmaster is to grant the wishes of their students!" ("grin", xpos="far_left", ypos="head") + her "..." ("soft", "happy", "base", "mid") + gen "Don't you reckon it'd be a fitting nickname?" ("base", xpos="far_left", ypos="head") + her "Isn't the primary responsibility of the headmaster to prepare students for life after school and to ensure their overall well-being?" ("open", "base", "base", "mid") + gen "Well, you could say that I've ensured your well-being by granting your wish to earn points for your house..." ("base", xpos="far_left", ypos="head") + her "I guess...{w=0.4} Although--" ("disgust", "base", "base", "mid") + gen "Although I suppose compared to a genie, I could always change my mind..." ("base", xpos="far_left", ypos="head") + her "Well, since you'd never do that, then I suppose calling you [name_genie_hermione] would be fitting!" ("angry", "closed", "worried", "mid") + gen "Yes! That's what I thought!" ("base", xpos="far_left", ypos="head") + elif name_genie_hermione == "My Lord": + if states.her.level < 13: + her "*Hmm*... Well, I suppose you're technically a high-ranking member of an institution..." ("soft", "base", "base", "R") + gen "A befitting title, is it not?" ("base", xpos="far_left", ypos="head") + her "But, is it not a bit...{w=0.4} Old fashioned?" ("open", "base", "base", "mid") + gen "Just because it's old...{w=0.4} I mean...{w=0.4} Well, I like it, okay?" ("base", xpos="far_left", ypos="head") + her "I see... If you say so, [name_genie_hermione]." ("base", "base", "base", "mid") + elif states.her.level < 22: + her "If you say so, [name_genie_hermione]." ("base", "base", "base", "mid") + else: + her "Of course, [name_genie_hermione]..." ("base", "base", "base", "mid") + elif name_genie_hermione == "Darling": + if states.her.level < 13: + her "[name_genie_hermione]?!" ("angry", "base", "base", "stare") + gen "That's right... Unless, you think I'm not important to you?" ("base", xpos="far_left", ypos="head") + her "I... Well, I suppose..." ("disgust", "base", "base", "stare") + elif states.her.level < 19: + her "[name_genie_hermione]..." ("soft", "narrow", "base", "down") + her "Alright then..." ("base", "narrow", "base", "down") + else: + her "Yes, [name_genie_hermione]..." ("base", "base", "base", "mid") + elif name_genie_hermione == "Lord Voldemort": + her "You want me to call you--" ("angry", "base", "base", "stare") + her "I was under the impression that witches and wizards usually avoided mentioning that name." ("angry", "base", "base", "mid") + gen "Is that so?" ("base", xpos="far_left", ypos="head") + her "From what I've read--" ("open", "closed", "base", "mid") + gen "You shall not use the lord's name in vain?" ("base", xpos="far_left", ypos="head") + her "*Huh*?" ("disgust", "base", "base", "mid") + gen "I'm sure using it's fine, as long as you're not being disrespectful..." ("base", xpos="far_left", ypos="head") + her "I... Alright then..." ("disgust", "happy", "base", "mid") + elif name_genie_hermione == "Daddy": + if states.her.level < 22: + her "*Ehm*... Of course, [name_genie_hermione]." ("disgust", "happy", "base", "down") + else: + her "Yes, [name_genie_hermione]." ("base", "base", "base", "mid") + elif name_genie_hermione == "Master": + if states.her.level < 22: + her "[name_genie_hermione]..." ("soft", "narrow", "base", "down") + her "Alright then..." ("base", "narrow", "base", "down") + else: + her "Yes, [name_genie_hermione]..." ("base", "base", "base", "mid") + else: + her "Okay, from now on, I'll call you [name_genie_hermione]." ("base", "base", "base", "mid") jump hermione_talk label genie_change_fail: @@ -209,110 +289,95 @@ label genie_change_fail: label hermione_change: if temp_name == "Miss Granger": if states.her.level <=0: - her "Sure, [name_genie_hermione]." ("base", "base", "base", "mid") + random: + her "Sure, [name_genie_hermione]." ("base", "base", "base", "mid") + her "Of course, [name_genie_hermione]." ("base", "base", "base", "mid") else: her "You don't have to be so formal, [name_genie_hermione], you know?" ("base", "closed", "base", "mid") her "" ("base", "base", "base", "mid") elif temp_name == "Hermione": - her "Of course [name_genie_hermione]." ("base", "base", "base", "mid") + her "Of course, [name_genie_hermione]." ("base", "base", "base", "mid") elif temp_name == "Girl": - if states.her.level >=1 and states.her.level < 3: - her "This girl thing again?" ("annoyed", "happy", "base", "mid") + if states.her.level < 3: + her "This \"girl\" thing again?" ("annoyed", "happy", "base", "mid") her "*Sigh*..." ("soft", "happy", "base", "R") - elif states.her.level >=3: - her "Fine... I don't mind." ("soft", "base", "base", "R") + elif states.her.level < 13: + her "Fine...{w=0.4} I don't mind." ("soft", "base", "base", "R") + else: + her "Of course..." ("soft", "base", "base", "R") elif temp_name == "Nerd": - if states.her.level >=3 and states.her.level < 5: - her "*sigh* I just enjoy books, that's all." ("annoyed", "narrow", "worried", "down") + if states.her.level < 5: + her "*Sigh*...{w=0.4} I just enjoy books, that's all." ("annoyed", "narrow", "worried", "down") gen "I'm sure you'll find other things to enjoy soon enough..." ("base", xpos="far_left", ypos="head") her "Like what exactly?" ("normal", "narrow", "base", "mid_soft") gen "Nothing to worry about, things will work out..." ("base", xpos="far_left", ypos="head") gen "Nerd..." ("grin", xpos="far_left", ypos="head") her "*Tsk* ..." ("soft", "narrow", "base", "R_soft") her "" ("normal", "narrow", "base", "R_soft") - elif states.her.level >= 5 and states.her.level < 19: + elif states.her.level < 19: her "I can be a bit nerdy sometimes I suppose..." ("angry", "happyCl", "base", "mid", emote="sweat") her "" ("base", "base", "base", "mid") - elif states.her.level >= 19: + else: her "I don't read as much as I used to anymore." ("grin", "narrow", "base", "R_soft", emote="sweat") her "" ("base", "narrow", "base", "mid_soft") elif temp_name == "Hottie": - if states.her.level >=5 and states.her.level < 7: + if states.her.level < 7: her @ cheeks blush "[name_genie_hermione]?!" ("angry", "wide", "angry", "mid") gen "What? That's true, you're hot." ("base", xpos="far_left", ypos="head") her @ cheeks blush "That's inappropriate." ("annoyed", "base", "worried", "R") her "But I'll let it slide, I guess." - elif states.her.level >=7 and states.her.level < 19: + elif states.her.level < 19: her "Thank you, [name_genie_hermione]." ("soft", "wink", "base", "mid") her "" ("normal", "base", "base", "mid") - elif states.her.level >=19: + else: her @ cheeks blush "... Glad you think so." ("smile", "wink", "base", "mid") her @ cheeks blush "" ("base","happy", "base", "mid") - elif temp_name == "Good Girl": - if states.her.level >=5 and states.her.level < 7: - her "Well, I do try my best, [name_genie_hermione]." ("base", "closed", "base", "mid") - her "" ("base", "base", "base", "mid") - elif states.her.level >=7 and states.her.level < 19: + elif temp_name == "Good Girl": #Custom nickname (21+) + if states.her.level <=23: her "I'm not sure if I'd qualify, but fine." ("annoyed", "wink", "base", "mid") her "" ("normal", "base", "base", "mid") - elif states.her.level >=19: - her @ cheeks blush "I could act like a good girl if you really want me to..." ("smile", "wink", "base", "mid") + else: + her @ cheeks blush "I'm not sure that's true..." ("soft", "narrow", "base", "mid") + her @ cheeks blush "But I could act like a good girl if you really want me to..." ("smile", "wink", "base", "mid") her @ cheeks blush "" ("base","happy", "base", "mid") elif temp_name == "Angel": - if states.her.level >=7 and states.her.level < 9: + if states.her.level < 9: her "What's going on with these silly nicknames of yours all of a sudden?" ("normal", "squint", "angry", "mid") gen "What do you mean by silly?" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "Ugh, forget I said anything..." ("open", "narrow", "base", "down") + her @ cheeks blush "*Ugh*... forget I said anything..." ("open", "narrow", "base", "down") her @ cheeks blush "" ("normal", "base", "base", "R") - elif states.her.level >=9 and states.her.level < 19: + elif states.her.level < 19: her @ cheeks blush "I like it..." ("soft", "narrow", "base", "R_soft") her @ cheeks blush "" ("base", "narrow", "base", "R_soft") - elif states.her.level >= 19: + else: + her @ cheeks blush "After everything you've put me through, I certainly must be..." ("base", "narrow", "base", "R_soft") her @ cheeks blush "I'm surprised I didn't grow wings yet." ("base", "narrow", "worried", "mid_soft") - elif temp_name == "Little Girl": - if states.her.level >=7 and states.her.level < 9: - her "What's going on with these silly nicknames of yours all of a sudden?" ("normal", "squint", "angry", "mid") - gen "What do you mean by silly?" ("base", xpos="far_left", ypos="head") - her "It makes it sound as if I'm your..." ("soft", "base", "worried", "R") - her @ cheeks blush "Ugh, forget I said anything..." ("open", "narrow", "base", "down") - her @ cheeks blush "" ("normal", "base", "base", "R") - elif states.her.level >=9 and states.her.level < 19: - her "Bit of an odd request but..." ("normal", "narrow", "base", "down") - her @ cheeks blush "I like it..." ("soft", "narrow", "base", "R_soft") - her @ cheeks blush "" ("base", "narrow", "base", "R_soft") - elif states.her.level >= 19: - her @ cheeks blush "Yes, [name_genie_hermione]." ("base", "narrow", "worried", "mid_soft") - elif temp_name == "Bad Girl": - if states.her.level >=9 and states.her.level < 11: - her "I guess I am a bit." ("soft", "narrow", "worried", "down") - her "I did fail that test after all..." ("disgust", "narrow", "base", "down") - her "" ("normal", "narrow", "worried", "mid_soft") - her "" ("normal", "base", "base", "mid") - elif states.her.level >=11 and states.her.level < 17: - her @ cheeks blush "I may be a little bit naughty at times." ("base", "happy", "base", "R") - elif states.her.level >=17: - her @ cheeks blush "I may be a little bit naughty at times." ("base", "happy", "base", "R") - her @ cheeks blush "" ("base", "base", "base", "mid") + elif temp_name == "Little Girl": #Custom nickname (21+) + her @ cheeks blush "Little...{w=0.4} Girl..." ("soft", "narrow", "worried", "mid_soft") + her @ cheeks blush "Yes, [name_genie_hermione]..." ("base", "narrow", "worried", "mid_soft") + elif temp_name == "Bad Girl": #Custom nickname (21+) + her @ cheeks blush "I suppose I may be a little bit naughty at times." ("base", "happy", "base", "R") + her @ cheeks blush "" ("base", "base", "base", "mid") elif temp_name == "Minx": - if states.her.level >=9 and states.her.level < 11: + if states.her.level < 15: her "I guess I am a bit." ("soft", "narrow", "worried", "down") her "" ("normal", "narrow", "worried", "mid_soft") - elif states.her.level >=11 and states.her.level < 17: + elif states.her.level < 19: her @ cheeks blush "I may be a little bit naughty at times." ("base", "happy", "base", "R") - elif states.her.level >=17: + else: her @ cheeks blush "I may be a little bit naughty at times." ("base", "happy", "base", "R") her @ cheeks blush "" ("base", "base", "base", "mid") elif temp_name == "Princess": - if states.her.level >= 11 and states.her.level < 13: - her @ cheeks blush "That would make you my prince wouldn't it?" ("open", "base", "base", "R") + if states.her.level < 15: + her @ cheeks blush "That would make you my prince, wouldn't it?" ("open", "base", "base", "R") her @ cheeks blush "" ("base", "base", "base", "mid") - elif states.her.level >= 13: - her "Yes... My prince." ("smile","happy", "base", "mid") + else: + her "Yes...{w=0.4} My prince." ("smile","happy", "base", "mid") gen "..." ("base", xpos="far_left", ypos="head") - her "I-I mean, [name_genie_hermione]." ("smile", "happyCl", "base", "mid", emote="sweat") + her "I--{w=0.2} I mean, [name_genie_hermione]." ("smile", "happyCl", "base", "mid", emote="sweat") her "" ("base", "base", "base", "mid") elif temp_name == "Pet": - if states.her.level >= 11 and states.her.level < 13: + if states.her.level < 15: her "You want to call me....{w=0.5} a pet?" ("normal", "squint", "angry", "mid") gen "Yes." ("base", xpos="far_left", ypos="head") her ".... {w=0.5}.... {w=0.5}.... {w=0.5}...." ("normal", "happy", "base", "mid") @@ -321,117 +386,97 @@ label hermione_change: her "May I at least know why?" ("open", "squint", "base", "mid") gen "No." ("base", xpos="far_left", ypos="head") her "...." ("annoyed", "base", "worried", "mid") - elif states.her.level >= 13: + else: her "*Meow*" ("smile","happyCl", "base", "mid") her "" ("smile","happy", "base", "mid") gen "Don't do that..." ("base", xpos="far_left", ypos="head") her "Such a party pooper." ("annoyed","happyCl", "base", "mid") her "" ("base", "base", "base", "mid") elif temp_name == "Bitch": - if states.her.level >=13 and states.her.level < 15: + if states.her.level < 19: her "Isn't this a bit inappropriate [name_genie_hermione]?" ("mad", "narrow", "worried", "down") gen "And doing favours for house points isn't?" ("base", xpos="far_left", ypos="head") her @ cheeks blush "Fine..." ("base", "narrow", "base", "down") - elif states.her.level >= 15 and states.her.level < 17: + elif states.her.level < 21: her @ cheeks blush "..." ("normal", "narrow", "worried", "down") gen "Any objections?" ("base", xpos="far_left", ypos="head") her @ cheeks blush "..." ("soft", "base", "worried", "R") gen "Okay then..." ("grin", xpos="far_left", ypos="head") - elif states.her.level >= 17: + else: her @ cheeks blush "Alright." ("base", "happyCl", "base", "mid") her @ cheeks blush "" ("base","happy", "base", "mid") elif temp_name == "Slut": - if states.her.level >=15 and states.her.level < 17: - her "[name_genie_hermione]?!" ("shock", "wide", "worried", "stare") - her "You can't just call someone that!" ("mad", "wide", "base", "stare") - gen "It'll just be between us..." ("base", xpos="far_left", ypos="head") - her "..." ("disgust", "squint", "base", "mid") - gen "Nothing to add?" ("base", xpos="far_left", ypos="head") - her "" ("clench", "closed", "base", "mid", emote="angry") - gen "So you'll let me call you that or not?" ("base", xpos="far_left", ypos="head") - her "{size=+5}FINE!{/size}" ("clench", "closed", "angry", "mid", emote="angry") - gen "..." ("base", xpos="far_left", ypos="head") - her "" ("normal", "narrow", "angry", "R") - elif states.her.level >= 17: - her @ cheeks blush "I guess if you have to call me that, sure..." ("base", "narrow", "base", "down") - elif states.her.level >= 19: + if states.her.level < 21: + her @ cheeks blush "I suppose if you have to call me that, sure..." ("base", "narrow", "base", "down") + else: her @ cheeks blush "I don't mind..." ("smile", "happyCl", "base", "mid") elif temp_name == "Cumslut": - if states.her.level >= 17 and states.her.level < 19: - her "A cumslut?!" ("open", "wide", "worried", "stare") - gen "Something wrong?" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "You have to even ask?" ("soft", "narrow", "worried", "down") - her @ cheeks blush "This is so degrading..." ("normal", "narrow", "base", "down") - her @ cheeks blush "(But I kinda am a slut begging for cum aren't I...)" ("base", "happyCl", "base", "mid") - elif states.her.level >= 19: + if states.her.level < 22: + her "I suppose if you have to call me that, sure..." ("base", "narrow", "base", "down") + else: her "..." ("soft", "narrow", "base", "up") her @ cheeks blush "(When did I start enjoying it so much...)" ("open", "narrow", "base", "up") - her @ cheeks blush "(That taste, the texture...)" ("open", "narrow", "annoyed", "up") + her @ cheeks blush "(That taste, even the texture...)" ("open", "narrow", "annoyed", "up") her @ cheeks blush "(So warm, sticky, and--)" ("silly", "narrow", "base", "up") gen "Are you okay there, [temp_name]?" ("base", xpos="far_left", ypos="head") her "Wha--" ("mad", "wide", "base", "stare") her @ cheeks blush "Of course I am!" ("smile", "base", "base", "R") elif temp_name == "Slytherin Whore": - if states.her.level >=19 and states.her.level < 21: - her "Do you really have to call me that, [name_genie_hermione]?" ("disgust", "base", "worried", "mid") - her @ cheeks blush "Referring to me as a bitch or a slut for your own amusement is one thing..." ("mad", "narrow", "worried", "down") - her "You're aware of how much I loathe Slytherin." ("open", "narrow", "worried", "mid_soft") - her "And I'm definitely not a whore..." ("soft", "closed", "base", "mid") - her "I refuse!" - menu: - "-Say it's fine-": - gen "Fine, I won't call you that..." ("base", xpos="far_left", ypos="head") - her "You won't?" ("open", "base", "base", "mid") - her "" ("soft", "base", "base", "mid") - gen "Of course..." ("base", xpos="far_left", ypos="head") - her "I am glad we're on the same page on this one, [name_genie_hermione]." ("open", "closed", "base", "mid") - her "" ("base", "closed", "base", "mid") - gen "In fact, from this point forward you don't have to call me [name_genie_hermione] or exchange any favours..." ("base", xpos="far_left", ypos="head") - her "" ("soft", "base", "base", "mid", emote="confused") - gen "Let's just void this whole... deal of yours, shall we?" ("base", xpos="far_left", ypos="head") - her "B-but, [name_genie_hermione]?!" ("mad", "wide", "base", "mid", emote="shocked") - her "" ("mad", "wide", "base", "mid") - gen "I must apologise {b}Miss Granger{/b}, I thought we had come to some kind of agreeable arrangement by now..." ("base", xpos="far_left", ypos="head") - her "But I--" ("mad", "wide", "worried", "stare") - gen "I should have known better to believe that this sort of thing would work out..." ("base", xpos="far_left", ypos="head") - her "Maybe I coul--" ("clench","happyCl", "worried", "stare") - gen "I thought we both had what we wanted..." ("base", xpos="far_left", ypos="head") - her "Liste--" ("soft", "narrow", "worried", "down") - her "" ("normal", "closed", "angry", "mid") - gen "Might as well hand in my resignation with the ministry and--" ("base", xpos="far_left", ypos="head") - with hpunch - her @ cheeks blush "{size=+10}I AM A SLYTHERIN WHORE!!!{/size}" ("scream", "closed", "angry", "mid") - her "" ("normal", "closed", "base", "mid") - gen "..." ("base", xpos="far_left", ypos="head") - her "Now please, [name_genie_hermione]... Let's just forget this conversation ever happened." ("disgust", "base", "worried", "mid") - gen "Are you sure that's what you want, [temp_name]?" ("base", xpos="far_left", ypos="head") - her "... Yes." ("disgust", "narrow", "worried", "down", emote="sweat") - gen "(This girl really is beyond redemption...)" ("base", xpos="far_left", ypos="head") - her "" ("base", "narrow", "worried", "down") - "-Threaten her-": - gen "Either accept my offer or Gryffindor lose five hundred points..." ("angry", xpos="far_left", ypos="head") - with hpunch - her "FIVE HUNDRED?!" ("shock", "wide", "base", "stare") - her "[name_genie_hermione]... This is blackmailing!" ("scream", "closed", "angry", "mid") - her "" ("mad", "closed", "angry", "mid") - gen "It is?" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "What else would it be?" ("mad", "base", "angry", "mid") - gen "Negotiations..." ("grin", xpos="far_left", ypos="head") - her @ cheeks blush "You..." ("clench", "closed", "angry", "mid") - gen "That's not an answer..." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "{size=-10}Okay...{/size}" ("soft", "narrow", "angry", "R") - gen "What was that? I didn't hear you." ("base", xpos="far_left", ypos="head") - her @ cheeks blush "I said yes, you can call me a Slytherin whore... or whatever." ("normal", "narrow", "annoyed", "mid") - her @ cheeks blush "Happy now?!" ("open", "closed", "angry", "mid") - gen "Very." ("grin", xpos="far_left", ypos="head") - her @ cheeks blush "{size=-6}You are the worst.{/size}" ("normal", "narrow", "base", "R_soft") - $ states.her.mood += 15 - elif states.her.level >= 21: - her "Please, [name_genie_hermione], couldn't you call me something else instead?" ("open", "base", "worried", "mid") - gen "But where's the fun in that?" ("base", xpos="far_left", ypos="head") - her @ cheeks blush "Why do I even bother... *sigh*" ("soft", "narrow", "base", "R_soft") + her "Do you really have to call me that, [name_genie_hermione]?" ("disgust", "base", "worried", "mid") + her @ cheeks blush "Referring to me as a bitch or a slut for your own amusement is one thing..." ("mad", "narrow", "worried", "down") + her "I know you're aware of how much I loathe Slytherin..." ("open", "narrow", "worried", "mid_soft") + her "And I'm definitely not a whore..." ("soft", "closed", "base", "mid") + her "I refuse!" + menu: + "-Say it's fine-": + gen "Fine, I won't call you that..." ("base", xpos="far_left", ypos="head") + her "You won't?" ("open", "base", "base", "mid") + her "" ("soft", "base", "base", "mid") + gen "Of course..." ("base", xpos="far_left", ypos="head") + her "I am glad we're on the same page on this one, [name_genie_hermione]." ("open", "closed", "base", "mid") + her "" ("base", "closed", "base", "mid") + gen "In fact, from this point forward you don't have to call me [name_genie_hermione], or exchange any favours..." ("base", xpos="far_left", ypos="head") + her "" ("soft", "base", "base", "mid", emote="confused") + gen "Let's just void this whole... deal of yours, shall we?" ("base", xpos="far_left", ypos="head") + her "B-but, [name_genie_hermione]?!" ("mad", "wide", "base", "mid", emote="shocked") + her "" ("mad", "wide", "base", "mid") + gen "I must apologise {b}Miss Granger{/b}, I thought we had come to some kind of agreeable arrangement by now..." ("base", xpos="far_left", ypos="head") + her "But I--" ("mad", "wide", "worried", "stare") + gen "I should have known better to believe that this sort of thing would work out..." ("base", xpos="far_left", ypos="head") + her "Maybe I could--" ("clench","happyCl", "worried", "stare") + gen "I thought we both had what we wanted..." ("base", xpos="far_left", ypos="head") + her "Listen--" ("soft", "narrow", "worried", "down") + her "" ("normal", "closed", "angry", "mid") + gen "Might as well hand in my resignation with the ministry and--" ("base", xpos="far_left", ypos="head") + with hpunch + her @ cheeks blush "{size=+10}I AM A SLYTHERIN WHORE!!!{/size}" ("scream", "closed", "angry", "mid") + her "" ("normal", "closed", "base", "mid") + gen "..." ("base", xpos="far_left", ypos="head") + her "Now please, [name_genie_hermione]... Let's just forget this conversation ever happened." ("disgust", "base", "worried", "mid") + gen "Are you sure that's what you want, [temp_name]?" ("base", xpos="far_left", ypos="head") + her "... Yes." ("disgust", "narrow", "worried", "down", emote="sweat") + gen "(This girl really is beyond redemption...)" ("base", xpos="far_left", ypos="head") + her "" ("base", "narrow", "worried", "down") + "-Threaten her-": + gen "Either accept my offer or Gryffindor lose five hundred points..." ("angry", xpos="far_left", ypos="head") + with hpunch + her "{size=+4}Five hundred?!{/size}" ("shock", "wide", "base", "stare") + her "[name_genie_hermione]... This is blackmailing!" ("scream", "closed", "angry", "mid") + her "" ("mad", "closed", "angry", "mid") + gen "It is?" ("base", xpos="far_left", ypos="head") + her @ cheeks blush "What else would it be?" ("mad", "base", "angry", "mid") + gen "Negotiations..." ("grin", xpos="far_left", ypos="head") + her @ cheeks blush "You..." ("clench", "closed", "angry", "mid") + gen "That's not an answer..." ("base", xpos="far_left", ypos="head") + her @ cheeks blush "{size=-10}Okay...{/size}" ("soft", "narrow", "angry", "R") + gen "What was that? I didn't hear you." ("base", xpos="far_left", ypos="head") + her @ cheeks blush "I said yes, you can call me a Slytherin whore... or whatever." ("normal", "narrow", "annoyed", "mid") + her @ cheeks blush "Happy now?!" ("open", "closed", "angry", "mid") + gen "Very." ("grin", xpos="far_left", ypos="head") + her @ cheeks blush "{size=-6}You are the worst.{/size}" ("normal", "narrow", "base", "R_soft") + $ states.her.mood += 15 elif temp_name == "Mudblood": - her "A{w=0.5}...{w=0.5} {size=+6}{b}{cps=20}mud{w=0.5}blood{/cps}{/b}?!{/size}" ("shock", "wide", "base", "stare") + her "A...{w=0.5} {size=+6}{b}{cps=20}mud{w=0.5}blood{/cps}{/b}?!{/size}" ("shock", "wide", "base", "stare") her "Did I hear you right, [name_genie_hermione]?!" ("normal", "wide", "base", "mid") menu: "-Confirm-": @@ -509,7 +554,7 @@ label hermione_change: gen "And I {b}will{/b} call you however I want!" ("base", xpos="far_left", ypos="head") her @ tears mascara "...." ("angry", "narrow", "base", "up") else: #Custom/fallback - her "That's a bit odd... But sure, you can call me that." ("soft", "squint", "base", "mid") + her "That's a bit odd...{w=0.4} But sure, you can call me that." ("soft", "squint", "base", "mid") $ name_hermione_genie = temp_name jump hermione_talk @@ -523,21 +568,35 @@ label hermione_change_fail: her "{size=-4}And I'm not a nerd...{/size}" ("annoyed", "base", "worried", "mid") if states.her.level >= 1: her "(I think...)" ("annoyed", "base", "worried", "R") + elif temp_name == "Hottie": + her "I don't think that would be appropriate, [name_genie_hermione]..." ("open", "closed", "base", "mid") + gen "You'd feel a lot better if you tried to be less critical of yourself... " ("base", xpos="far_left", ypos="head") + her "*Huh*?" ("open", "base", "base", "mid") + elif temp_name == "Angel": + her "I certainly am!" ("open", "closed", "base", "mid") + her "But I won't let you call me that..." ("open", "base", "base", "mid") + elif temp_name == "Minx": + her "That is neither appropriate, nor true!" ("annoyed", "closed", "base", "mid") elif temp_name == "Good Girl": her "I'm not letting you call me that, [name_genie_hermione]!" ("open", "closed", "angry", "mid") if states.her.level >= 3: her "(Although it's kinda cute he said that...)" ("base", "base", "base", "R") - elif temp_name == "Little Girl": - her "I won't let you call me that, [name_genie_hermione]!" ("open", "closed", "angry", "mid") - if states.her.level >= 5: - her "(I hope they'd grow out more...)" ("disgust", "narrow", "worried", "down") - her "*sigh*" ("annoyed", "closed", "base", "mid") - her "" ("normal", "base", "base", "R") - elif temp_name == "Bad Girl": - her "I am not a [temp_name]!" ("open", "base", "angry", "mid") - if states.her.level >= 7: - her "(Or am I...?)" ("disgust", "base", "base", "R") - her "" ("normal", "base", "base", "R") + #elif temp_name == "Little Girl": + #her "What's going on with these silly nicknames of yours all of a sudden?" ("normal", "squint", "angry", "mid") + #gen "What do you mean by silly?" ("base", xpos="far_left", ypos="head") + #her "It makes it sound as if I'm your..." ("soft", "base", "worried", "R") + #her "I won't let you call me that, [name_genie_hermione]!" ("open", "closed", "angry", "mid") + #if states.her.level >= 16: + #her "(Surely my chest is big enough...)" ("disgust", "narrow", "worried", "down") + #her "*Sigh*" ("annoyed", "closed", "base", "mid") + #her "" ("normal", "base", "base", "R") + #elif temp_name == "Bad Girl": + #her "I guess I am a bit." ("soft", "narrow", "worried", "down") + #her "I did fail that test after all..." ("disgust", "narrow", "base", "down") + #her "Wait... You meant it in a--{w=0.2} I am not a [temp_name]!" ("open", "base", "angry", "mid") + #if states.her.level >= 7: + #her "(Or am I...?)" ("disgust", "base", "base", "R") + #her "" ("normal", "base", "base", "R") elif temp_name == "Princess": her "This is inappropriate, [name_genie_hermione]!" ("open", "base", "angry", "mid") if states.her.level >= 9: @@ -546,6 +605,37 @@ label hermione_change_fail: her "Are you joking, [name_genie_hermione]?" ("open", "base", "worried", "mid") if states.her.level >= 11: her "(Why would he even suggest that?)" ("annoyed", "base", "base", "R") + elif temp_name == "Bitch": + her "I am not a dog!" ("open", "closed", "angry", "mid") + gen "That's not..." ("base", xpos="far_left", ypos="head") + gen "Alrighty then..." ("base", xpos="far_left", ypos="head") + elif temp_name == "Slut": + her "[name_genie_hermione]?!" ("shock", "wide", "worried", "stare") + her "You can't just call someone that!" ("mad", "wide", "base", "stare") + gen "It'll just be between us..." ("base", xpos="far_left", ypos="head") + her "..." ("disgust", "squint", "base", "mid") + gen "Nothing to add?" ("base", xpos="far_left", ypos="head") + her "" ("clench", "closed", "base", "mid", emote="angry") + gen "So, you'll let me call you that or not?" ("base", xpos="far_left", ypos="head") + her "{size=+5}No!{/size}" ("clench", "closed", "angry", "mid", emote="angry") + gen "..." ("base", xpos="far_left", ypos="head") + elif temp_name == "Cumslut": + her "{size=+5}A what?!{/size}" ("open", "wide", "worried", "stare") + gen "Something wrong?" ("base", xpos="far_left", ypos="head") + her @ cheeks blush "Do you even have to ask?" ("soft", "narrow", "angry", "down") + her @ cheeks blush "Calling someone--{w=0.4} That is so degrading!" ("angry", "narrow", "angry", "down") + her "I won't allow it!" ("angry", "closed", "angry", "down") + elif temp_name == "Slytherin Whore": + her "What did you just call me?!" ("open", "wide", "worried", "stare") + gen "*Err*... Nothing..." ("base", xpos="far_left", ypos="head") + her "*Hmph*..." ("annoyed", "narrow", "angry", "mid") + elif temp_name == "Mudblood": + her "A...{w=0.5} A...{w=0.5}{nw} " ("shock", "wide", "base", "stare") + her "A... A... M--Mm..." ("normal", "wide", "base", "stare") + gen "(This will end up badly...)" ("base", xpos="far_left", ypos="head") + gen "Mad stud! That's what I said" ("base", xpos="far_left", ypos="head") + her "*Huh?*" ("normal", "wide", "base", "mid") + gen "Let's resume the favour trading... You mad stud, you..." ("base", xpos="far_left", ypos="head") else: her "I won't let you call me that!" ("shock", "closed", "angry", "mid") her "" ("normal", "base", "angry", "mid") diff --git a/game/scripts/characters/susan/summon.rpy b/game/scripts/characters/susan/summon.rpy index b902a645..da182a4a 100644 --- a/game/scripts/characters/susan/summon.rpy +++ b/game/scripts/characters/susan/summon.rpy @@ -194,7 +194,7 @@ label susan_talk: gen "Being called a slut always boosts a girl's confidence!" ("base", xpos="far_left", ypos="head") sus @ cheeks blush "R-- Really?" ("soft", "happy", "sad", "mid") gen "Yes. Now... shall we try it?" ("base", xpos="far_left", ypos="head") - sus @ cheeks blush "... alright, [name_genie_susan]..." ("base", "happy", "sad", "mid") + sus @ cheeks blush "... Alright, [name_genie_susan]..." ("base", "happy", "sad", "mid") jump susan_talk "-Custom Input-": $ temp_name = renpy.input("(Please enter the name.)", name_susan_genie, ALLOWED_CHARACTERS, length=14) diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy index 3d1d6979..69442165 100644 --- a/game/scripts/options.rpy +++ b/game/scripts/options.rpy @@ -88,6 +88,7 @@ define config.tag_zorder = { "xray_overlay": -1, "xray_mask": -1, "cg": 17, + "cg2": 18, } # Saving and loading diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy index 5c64df2a..80d4846c 100644 --- a/game/scripts/rooms/main_room/objects/weather.rpy +++ b/game/scripts/rooms/main_room/objects/weather.rpy @@ -22,6 +22,8 @@ image weather overcast = ConditionSwitch( # final ) transform cloud_move: + animation + subpixel True choice: yoffset 0