diff --git a/game/scripts/characters/cho/summon.rpy b/game/scripts/characters/cho/summon.rpy index ab131084..c07cf91e 100644 --- a/game/scripts/characters/cho/summon.rpy +++ b/game/scripts/characters/cho/summon.rpy @@ -47,7 +47,7 @@ label summon_cho: "Are you ready to begin the match?" "-Yes-": pass - "-no-": + "-No-": jump cho_requests jump start_hufflepuff_match @@ -59,7 +59,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 1309bfdc..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: 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)