diff --git a/game/scripts/characters/tonks/talk.rpy b/game/scripts/characters/tonks/talk.rpy index 6ec35ed9..562575a4 100644 --- a/game/scripts/characters/tonks/talk.rpy +++ b/game/scripts/characters/tonks/talk.rpy @@ -57,17 +57,17 @@ label tonks_talk: label .sir: # Local label unavailable from global scope $ ton_genie_name = "Sir" ton "Of course, [ton_genie_name]." ("base", "base", "base", "mid") - jump tonks_talk + "-Dumbledore-": label .dumbledore: $ ton_genie_name = "Dumbledore" ton "Sure thing, [ton_genie_name]." ("base", "base", "base", "mid") - jump tonks_talk + "-Professor-": label .professor: $ ton_genie_name = "Professor" ton "Alright, [ton_genie_name]." ("base", "base", "base", "mid") - jump tonks_talk + "-Old man-": label .old_man: $ ton_genie_name = "Old man" @@ -83,7 +83,7 @@ label tonks_talk: ton "Didn't you say you were an \"all knowing\" being?" ("open", "base", "angry", "mid") ton "I guess you really are an \"old man\", Genie..." ("base", "base", "base", "mid") gen "..............." ("base", xpos="far_left", ypos="head") - jump tonks_talk + "-Genie-": label .genie: $ ton_genie_name = "Genie" @@ -104,7 +104,7 @@ label tonks_talk: ton "(I guess I can jerk him off some other time...)" ("mad", "base", "worried", "R") gen "If you find a golden, shiny looking lamp, return it to me..." ("base", xpos="far_left", ypos="head") ton "Sure, [ton_genie_name]..." ("upset", "base", "base", "R") - jump tonks_talk + "-Lord Voldemort-": label .lord_voldemort: $ ton_genie_name = "Lord Voldemort" @@ -130,7 +130,7 @@ label tonks_talk: gen "Are you going to call me \"Lord Voldemort\" now or what?" ("base", xpos="far_left", ypos="head") ton "Fine... I will call you, [ton_genie_name], if it makes you happy..." ("base", "base", "base", "mid") gen "Yippee!" ("grin", xpos="far_left", ypos="head") - jump tonks_talk + "-Daddy-": label .daddy: $ ton_genie_name = "Daddy" @@ -139,7 +139,7 @@ label tonks_talk: gen "(Geezers?)" ("base", xpos="far_left", ypos="head") gen "But I thought you didn't mind it?" ("base", xpos="far_left", ypos="head") ton "Oh, I don't mind at all, [ton_genie_name]!" ("horny", "base", "base", "mid") - jump tonks_talk + "-Lover-" (style="disabled") if ton_friendship < 60: label .lover_fail: ton "You mean that you \"love how well we work together\", right?" ("base", "narrow", "raised", "mid") @@ -156,6 +156,7 @@ label tonks_talk: ton "Just a little bit." ("base", "narrow", "base", "R") gen "Well, I suppose that's what lovers do, am I right?" ("base", xpos="far_left", ypos="head") ton "Nice try..." ("base", "narrow", "base", "mid") + "-Lover-" if ton_friendship >= 60: label .lover: $ ton_genie_name = "Lover" @@ -163,6 +164,7 @@ label tonks_talk: gen "Just \"Lover\" is fine." ("base", xpos="far_left", ypos="head") ton "Yes my love..." ("base", "narrow", "base", "mid") gen "..." ("base", xpos="far_left", ypos="head") + "-Master-" (style="disabled") if ton_friendship < 60: label .master_fail: ton "No." ("base", "base", "base", "R") @@ -173,7 +175,7 @@ label tonks_talk: gen "!!!" ("angry", xpos="far_left", ypos="head") ton "Until then you can forget about it..." ("base", "base", "base", "mid") gen "...................." ("base", xpos="far_left", ypos="head") - jump tonks_talk + "-Master-" if ton_friendship >= 60: label .master: $ ton_genie_name = "Master" @@ -185,10 +187,10 @@ label tonks_talk: gen "You have permission to speak?" ("base", xpos="far_left", ypos="head") ton "Thank you, [ton_genie_name]." ("base", "base", "base", "down") gen "(I could get used to that.)" ("grin", xpos="far_left", ypos="head") - jump tonks_talk + "-Custom Input--" (style="disabled") if ton_friendship < 60: gen "(I don't think she's yet ready for that)" ("base", xpos="far_left", ypos="head") - jump tonks_talk + "-Custom Input-" if ton_friendship >= 60: $ temp_name = renpy.input("(Please enter the name.)", ton_genie_name, ALLOWED_CHARACTERS, length=14) $ temp_name = temp_name.strip() @@ -197,16 +199,15 @@ label tonks_talk: if temp_name.lower() == "master" and ton_friendship < 60: jump tonks_talk.master_fail $ renpy.jump("tonks_talk."+temp_name.lower().replace(" ", "_")) # Jump to local label - elif temp_name == "": - jump tonks_talk else: $ ton_genie_name = temp_name ton "*Hmm*... [ton_genie_name]... I like it." ("horny", "base", "raised", "mid") jump tonks_talk "-Never mind-": - jump tonks_talk + pass + jump tonks_talk "-From now on I will address you as-": menu: @@ -214,7 +215,7 @@ label tonks_talk: label .tonks: # Local label unavailable from global scope. $ tonks_name = "Tonks" ton "Sure, [ton_genie_name]." ("base", "base", "base", "mid") - jump tonks_talk + "-Nymphadora-": $ tonks_name = "Nymphadora" label .nymphadora: @@ -223,14 +224,14 @@ label tonks_talk: ton "I hate that name..." ("open", "base", "worried", "R") gen "Well you better get used to hearing it then, [tonks_name]..." ("base", xpos="far_left", ypos="head") ton "................" ("upset", "base", "angry", "R") - jump tonks_talk + "-Nympho-": label .nympho: $ tonks_name = "Nympho" ton "You think I'm a nympho, [ton_genie_name]?" ("horny", "base", "raised", "mid") ton "Like a filthy, sex craved maniac? Who wouldn't shy away from fulfilling every single one of her fantasies?" ("grin", "base", "shocked", "mid") ton "It fits quite well, actually." ("base", "base", "base", "R") - jump tonks_talk + "-Bitch-": label .bitch: $ tonks_name = "Bitch" @@ -238,7 +239,7 @@ label tonks_talk: ton "If only you knew..." ("horny", "base", "raised", "R") gen "(...)" ("base", xpos="far_left", ypos="head") gen "(What does she mean by that?)" ("angry", xpos="far_left", ypos="head") - jump tonks_talk + #"-Fuck Puppet-": #label .fuck_puppet_fail: #ton "A what?" ("soft", "wide", "shocked", "mid") @@ -247,6 +248,7 @@ label tonks_talk: #ton "Just another puppet for you to fuck?" ("open", "closed", "angry", "mid") #gen "That's right... And such a fine puppet as well." ("base", xpos="far_left", ypos="head") #ton "*Hmph*... Sorry, but this puppet comes with a brain included." ("annoyed", "narrow", "angry", "R") + "-Fuck Puppet-": label .fuck_puppet: $ tonks_name = "Fuck Puppet" @@ -255,13 +257,14 @@ label tonks_talk: gen "Wouldn't anyone." ("base", xpos="far_left", ypos="head") ton "Such a charmer..." ("base", "base", "raised", "R") ton "Of course, [ton_genie_name]... you can call me that if you like." ("horny", "base", "base", "mid") - jump tonks_talk + #"-Slut-": #label .slut_fail: #ton "You're not my dad, I can dress however I like!" ("open", "narrow", "angry", "R") #gen "..." ("base", xpos="far_left", ypos="head") #ton "Don't ask..." ("open", "closed", "worried", "mid") #gen "I wasn't going to." ("base", xpos="far_left", ypos="head") + "-Slut-": $ tonks_name = "Slut" ton "Maybe I am..." ("base", "narrow", "base", "R") @@ -269,6 +272,7 @@ label tonks_talk: gen "Weird thing to say in bed but I ain't judging." ("base", xpos="far_left", ypos="head") ton "Oh, you mean like that..." ("grin", "narrow", "raised", "mid") ton "In that case, I'm the \"sluttiest slut\" of them all." ("base", "narrow", "base", "mid") + #"-Whore-": #Todo put under public checks #label .whore_fail: #ton "A what?!" ("clench", "wide", "shocked", "mid") @@ -279,6 +283,7 @@ label tonks_talk: #gen "You-- Hold on, what did you say?" ("base", xpos="far_left", ypos="head") #ton "I've not slept around enough to have the privilege of you calling me that." ("annoyed", "base", "angry", "R") #gen "I feel like this relationship of ours is backwards for some reason..." ("base", xpos="far_left", ypos="head") + "-Whore-": #Todo put under public checks label .whore: $ tonks_name = "Whore" @@ -289,6 +294,7 @@ label tonks_talk: ton "But I can assure you it's to encourage them to do better during class." ("base", "narrow", "base", "R") gen "Sure... Doesn't make you less of a whore though." ton "*Mmm*... Alright, fine, If calling me a whore is the punishment for being a good teacher then you can call me a whore any day..." ("horny", "narrow", "base", "mid") + "-Cunt-" (style="disabled") if ton_friendship < 60: label .cunt_fail: ton "[ton_genie_name], I'm used to getting insulted by my many previous lovers..." ("base", "base", "raised", "mid") @@ -298,7 +304,7 @@ label tonks_talk: gen "Of course.{w} And I will respect that." ("base", xpos="far_left", ypos="head") ton "I'm glad.{w} You are a very polite man, [ton_genie_name]..." ("base", "base", "base", "mid") gen "..........................." ("base", xpos="far_left", ypos="head") - jump tonks_talk + "-Cunt-" if ton_friendship >= 60: label .cunt: $ tonks_name = "Cunt" @@ -306,13 +312,14 @@ label tonks_talk: ton "You better not call me that in front of a student..." ("open", "base", "base", "mid") gen "What if I do?" ("grin", xpos="far_left", ypos="head") ton "Do it, I dare you!" ("horny", "base", "base", "mid", hair="horny") - jump tonks_talk + "-Slave-"(style="disabled") if ton_friendship < 60: label .slave_fail: ton "To who?" ("soft", "base", "raised", "mid") gen "To me." ("grin", xpos="far_left", ypos="head") ton "*giggles*" ("grin", "closed", "base", "mid") ton "No, I don't think so [ton_genie_name]." ("base", "base", "base", "mid") + "-Slave-" if ton_friendship >= 60: label .slave: $ tonks_name = "Slave" @@ -334,9 +341,9 @@ label tonks_talk: ton "At least it's better that you're doing it to forget rather some power fantasy to stick the middle finger to humanity and your creator." ("base", "base", "base", "mid") gen "Yep." ("base", xpos="far_left", ypos="head") gen "Now give me ten push-ups, slave!" ("base", xpos="far_left", ypos="head") + "-Custom Input--" (style="disabled") if ton_friendship < 60: gen "(I don't think she's yet ready for that)" ("base", xpos="far_left", ypos="head") - jump tonks_talk "-Custom Input-" if ton_friendship >= 60: $ temp_name = renpy.input("(Please enter the name.)", tonks_name, ALLOWED_CHARACTERS, length=14) @@ -345,8 +352,6 @@ label tonks_talk: if temp_name.lower() == "cunt" and ton_friendship < 60: jump tonks_talk.cunt_fail $ renpy.jump("tonks_talk."+temp_name.lower().replace(" ", "_")) # Jump to local label - elif temp_name == "": - jump tonks_talk else: $ tonks_name = temp_name ton "*Hmm*..." ("base", "base", "base", "R") @@ -356,9 +361,9 @@ label tonks_talk: ton "I've been called quite many things by my lovers!" ("base", "base", "base", "R") gen "I'm your lover now?" ("grin", xpos="far_left", ypos="head") ton "Never say never." ("base", "base", "base", "mid") - jump tonks_talk "-Never mind-": - jump tonks_talk + pass + jump tonks_talk "-Never mind-": jump tonks_requests