From f66c5df6b7d34f08cccda26c6394f27d722063dd Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Tue, 2 May 2023 19:29:53 +0100 Subject: [PATCH] Face parameter removal (astoria) * Removed face parameter for Astoria and reposed events that relied on it. --- game/scripts/characters/astoria/common.rpy | 2 +- .../astoria/events/imperio_training.rpy | 6 +- game/scripts/characters/astoria/gifts.rpy | 450 +++++++++--------- game/scripts/characters/astoria/summon.rpy | 90 ++-- game/scripts/wardrobe/wardrobe.rpy | 2 - 5 files changed, 274 insertions(+), 276 deletions(-) diff --git a/game/scripts/characters/astoria/common.rpy b/game/scripts/characters/astoria/common.rpy index fe539e2a..60ade08a 100644 --- a/game/scripts/characters/astoria/common.rpy +++ b/game/scripts/characters/astoria/common.rpy @@ -33,7 +33,7 @@ define character.astoria_say = Character("name_astoria_genie", show_icon="astori init python: def ast(what, mouth=None, eyes=None, eyebrows=None, pupils=None, cheeks=None, tears=None, - emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs): + emote=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs): def show(): astoria.show() diff --git a/game/scripts/characters/astoria/events/imperio_training.rpy b/game/scripts/characters/astoria/events/imperio_training.rpy index feb1eb13..d22942eb 100644 --- a/game/scripts/characters/astoria/events/imperio_training.rpy +++ b/game/scripts/characters/astoria/events/imperio_training.rpy @@ -7,7 +7,7 @@ label ag_st_imperio: if ag_st_imperio.points == 0: # Intro for 1st event. - ast "" (face="neutral", xpos="right", ypos="base", trans=fade) + ast "" ("base", "base", "base", "mid", xpos="right", ypos="base", trans=fade) gen "Ready for your first day of detention?" ("base", xpos="far_left", ypos="head") ast "No..." ("annoyed", "base", "base", "R") ast "Do I really have to go?" ("clench", "base", "base", "mid") @@ -33,7 +33,7 @@ label ag_st_imperio: ast "See ya later!" ("smile", "base", "base", "mid") #smell ya later newbie! - gary oak elif ag_st_imperio.points == 3: # Intro for 4th event. - ast "" (face="annoyed", xpos="right", ypos="base", trans=fade) + ast "" ("annoyed", "base", "base", "mid", xpos="right", ypos="base", trans=fade) gen "Time for another lesson, don't you think?" ("base", xpos="far_left", ypos="head") ast "Do I really have to?" ("open", "narrow", "base", "R") ast "I'd rather not spend the day, getting yelled at..." ("annoyed", "narrow", "base", "down") @@ -43,7 +43,7 @@ label ag_st_imperio: ast "..." ("annoyed", "base", "base", "R") else: - ast "" (face="happy", xpos="right", ypos="base", trans=fade) + ast "" ("grin", "base", "base", "mid", xpos="right", ypos="base", trans=fade) random: gen "Ready for another lesson-- I mean detention?" ("base", xpos="far_left", ypos="head") gen "Looking forward to curse your teacher again?" ("base", xpos="far_left", ypos="head") diff --git a/game/scripts/characters/astoria/gifts.rpy b/game/scripts/characters/astoria/gifts.rpy index 8cd47bef..e6091ab1 100644 --- a/game/scripts/characters/astoria/gifts.rpy +++ b/game/scripts/characters/astoria/gifts.rpy @@ -9,18 +9,18 @@ label give_ast_gift(gift_item): if gift_item == lollipop_ITEM: if states.ast.level < 6: - ast "A lollipop?" (mouth="open", face="neutral") - ast "Why are you giving me sweets, I'm not a kid!" (face="angry") + ast "A lollipop?" ("horny", "narrow", "base", "mid") + ast "Why are you giving me sweets, I'm not a kid!" ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "A lollipop?" (mouth="open", face="neutral") + ast "A lollipop?" ("open", "narrow", "base", "mid") call give_gift("You give the lollipop to Astoria...", gift_item) - ast "why are you being so nice to me..." (face="angry") - ast "Although... the other students haven't had any left since the last Hogsmeade trip." (mouth="open", face="neutral") - ast "They'll be so jealous!" (mouth="grin", face="happy") + ast "why are you being so nice to me..." ("upset", "base", "angry", "mid") + ast "Although... the other students haven't had any left since the last Hogsmeade trip." ("open", "narrow", "base", "mid") + ast "They'll be so jealous!" ("grin", "narrow", "base", "mid") call ast_mood(-1) else: - ast "A lollipop?" (mouth="open", face="neutral") + ast "A lollipop?" ("open", "narrow", "base", "mid") call give_gift("You give the lollipop to Astoria...", gift_item) ast "That's going to take all day to suck on..." ast "I guess my mouth will be too busy to do anything else for the entire day!" @@ -29,19 +29,19 @@ label give_ast_gift(gift_item): elif gift_item == chocolate_ITEM: if states.ast.level < 6: - ast "Some chocolate?" (mouth="open", face="neutral") + ast "Some chocolate?" ("open", "narrow", "base", "mid") ast "Don't you have any dung-bombs?" ast "They're way more fun!" call ast_mood(0) elif states.ast.level > 5 and states.ast.level < 12: - ast "Some chocolate?" (mouth="open", face="neutral") + ast "Some chocolate?" ("open", "narrow", "base", "mid") call give_gift("You give the chocolate to Astoria...", gift_item) - ast "Thank you, [name_genie_astoria]." (mouth="open", face="neutral") - ast "I don't know what I did to deserve it." (mouth="annoyed", pupils="R", face="neutral") - ast "But I'm not going to say no..." (face="happy") + ast "Thank you, [name_genie_astoria]." ("open", "narrow", "base", "mid") + ast "I don't know what I did to deserve it." ("annoyed", "narrow", "base", "R") + ast "But I'm not going to say no..." ("smile", "narrow", "base", "mid") call ast_mood(-1) else: - ast "Some chocolate?" (mouth="open", face="neutral") + ast "Some chocolate?" ("open", "narrow", "base", "mid") call give_gift("You give the chocolate to Astoria...", gift_item) ast "Did you hear chocolate is supposed to be an aphrodisiac?" ast "Although it was a muggle that came up with that one so I doubt there's any truth to it." @@ -51,25 +51,25 @@ label give_ast_gift(gift_item): elif gift_item == plush_owl_ITEM: if states.ast.level < 6: - ast "An owl plushie?" (mouth="open", face="neutral") + ast "An owl plushie?" ("open", "narrow", "base", "mid") ast "Why are you giving me this?" ast "Toys are for children..." call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "An owl plushie?" (mouth="open", face="neutral") + ast "An owl plushie?" ("open", "narrow", "base", "mid") call give_gift("You give the stuffed toy to Astoria...", gift_item) - ast "I don't use stuffed toys..." (mouth="open", face="annoyed") - ast "I know someone that hates owls though... I'll put this in front of her face when she's waking up..." (mouth="annoyed", pupils="R", face="neutral") + ast "I don't use stuffed toys..." ("open", "narrow", "base", "mid") + ast "I know someone that hates owls though... I'll put this in front of her face when she's waking up..." ("annoyed", "narrow", "base", "R") call ast_mood(-1) elif states.ast.level > 11 and states.ast.level < 18: - ast "An owl plushie?" (mouth="open", face="neutral") + ast "An owl plushie?" ("open", "narrow", "base", "mid") call give_gift("You give the stuffed toy to Astoria...", gift_item) ast "Do I look like a girl that plays with toys?" ast "Actually, don't answer that..." ast "Guess it'd be rude not to take it..." call ast_mood(-1) else: - ast "An owl plushie?" (mouth="open", face="neutral") + ast "An owl plushie?" ("open", "narrow", "base", "mid") call give_gift("You give the stuffed toy to Astoria...", gift_item) ast "If you want to give me toys you better be prepared for me to call you daddy..." ast "So, thank you..." @@ -79,432 +79,432 @@ label give_ast_gift(gift_item): elif gift_item == butterbeer_ITEM: if states.ast.level < 6: - ast "Butterbeer?" (mouth="smile", face="happy") + ast "Butterbeer?" ("smile", "narrow", "base", "mid") call give_gift("You give the bottle to Astoria...", gift_item) - ast "Time to get smashed!" (face="happy") - ast "The other students will be so jealous I got beer into the school..." (mouth="annoyed", face="angry") + ast "Time to get smashed!" ("smile", "narrow", "base", "mid") + ast "The other students will be so jealous I got beer into the school..." ("annoyed", "base", "angry", "mid") call ast_mood(-2) elif states.ast.level > 5 and states.ast.level < 12: - ast "Butterbeer?" (mouth="smile", face="happy") + ast "Butterbeer?" ("smile", "narrow", "base", "mid") call give_gift("You give the bottle to Astoria...", gift_item) - ast "Don't you have something stronger?" (pupils="mid", face="annoyed") - ast "Like something you can't get in the school usually?" (pupils="R", face="annoyed") - ast "Fine, I'll take it!" (mouth="smile", face="happy") + ast "Don't you have something stronger?" ("annoyed", "narrow", "base", "mid") + ast "Like something you can't get in the school usually?" ("annoyed", "narrow", "base", "R") + ast "Fine, I'll take it!" ("smile", "narrow", "base", "mid") call ast_mood(-1) elif states.ast.level > 11 and states.ast.level < 18: - ast "Butterbeer?" (face="annoyed") + ast "Butterbeer?" ("annoyed", "narrow", "base", "mid") call give_gift("You give the bottle to Astoria...", gift_item) ast "This watered down piss-water can barely get a house elf tipsy." ast "Actually, that gives me an idea..." call ast_mood(-1) else: - ast "Butterbeer?" (mouth="open", face="neutral") + ast "Butterbeer?" ("open", "narrow", "base", "mid") call give_gift("You give the bottle to Astoria...", gift_item) - ast "It's more of a cider really isn't it?" (face="neutral") - ast "Thanks!" (mouth="smile", face="happy") + ast "It's more of a cider really isn't it?" ("base", "base", "base", "mid") + ast "Thanks!" ("smile", "narrow", "base", "mid") call ast_mood(-2) elif gift_item == science_mag_ITEM: if states.ast.level < 6: - ast "(...)" (pupils="down", face="annoyed") - ast "Creating your own itch powder using household ingredients?" (mouth="open", pupils="down", face="annoyed") - ast "Is the kitchen even open to students?" (pupils="down", face="annoyed") - ast "What am I supposed to do with this, [name_genie_astoria]?" (face="annoyed") + ast "(...)" ("annoyed", "narrow", "base", "down") + ast "Creating your own itch powder using household ingredients?" ("open", "narrow", "base", "down") + ast "Is the kitchen even open to students?" ("annoyed", "narrow", "base", "down") + ast "What am I supposed to do with this, [name_genie_astoria]?" ("annoyed", "narrow", "base", "mid") call ast_mood(0) elif states.ast.level > 5 and states.ast.level < 12: - ast "Magazines?" (mouth="open", face="annoyed") + ast "Magazines?" ("open", "narrow", "base", "mid") call give_gift("You give an assortment of educational magazines to Astoria...", gift_item) - ast "Making your own stink bombs..." (face="annoyed") + ast "Making your own stink bombs..." ("annoyed", "narrow", "base", "mid") ast "Looks like I might be able to make these in potions class..." - ast "If Snape doesn't catch me doing it." (mouth="clench", face="annoyed") + ast "If Snape doesn't catch me doing it." ("clench", "narrow", "base", "mid") call ast_mood(-1) elif states.ast.level > 11 and states.ast.level < 18: - ast "Magazines?" (mouth="angry", face="angry") - ast "You want me to do more school work?" (mouth="annoyed", face="angry") + ast "Magazines?" ("upset", "base", "angry", "mid") + ast "You want me to do more school work?" ("annoyed", "base", "angry", "mid") call ast_mood(1) else: - ast "magazines?" (mouth="open", face="annoyed") + ast "magazines?" ("open", "narrow", "base", "mid") call give_gift("You give an assortment of educational magazines to Astoria...", gift_item) - ast "I was hoping for something a bit more risqué..." (face="annoyed") + ast "I was hoping for something a bit more risqué..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) elif gift_item == girls_mag_ITEM: if states.ast.level < 6: - ast "Girl magazines?" (mouth="open", face="annoyed") - ast "This is that trash my sister reads." (mouth="clench", pupils="down", face="annoyed") - ast "Such a massive waste of time..." (face="annoyed") + ast "Girl magazines?" ("open", "narrow", "base", "mid") + ast "This is that trash my sister reads." ("clench", "narrow", "base", "down") + ast "Such a massive waste of time..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) elif states.ast.level > 5 and states.ast.level < 12: - ast "Girl magazines?" (face="disgusted") + ast "Girl magazines?" ("base", "narrow", "angry", "mid") call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item) - ast "I'll take it for the free mascara sample. I once drew a uni-brow on someone with it." (face="happy") + ast "I'll take it for the free mascara sample. I once drew a uni-brow on someone with it." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif states.ast.level > 11 and states.ast.level < 18: - ast "Girl magazines?" (face="annoyed") + ast "Girl magazines?" ("annoyed", "narrow", "base", "mid") call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item) - ast "Well, I am a girl so of course I'd want it!" (face="annoyed") + ast "Well, I am a girl so of course I'd want it!" ("annoyed", "narrow", "base", "mid") call ast_mood(-1) else: - ast "Girl magazines?" (face="annoyed") + ast "Girl magazines?" ("annoyed", "narrow", "base", "mid") call give_gift("You give an assortment of rather girly magazines to Astoria...", gift_item) - ast "Don't I look hot enough for you [name_genie_astoria]?" (mouth="open", eyes="closed", face="annoyed") - ast "I'm just teasing you, I'll have it." (face="happy") + ast "Don't I look hot enough for you [name_genie_astoria]?" ("open", "closed", "base", "mid") + ast "I'm just teasing you, I'll have it." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif gift_item == adult_mag_ITEM: if states.ast.level < 6: - ast "Adult magazines?" (mouth="clench", face="disgusted") - ast "I'm good thanks." (face="disgusted") + ast "Adult magazines?" ("clench", "narrow", "angry", "mid") + ast "I'm good thanks." ("base", "narrow", "angry", "mid") call ast_mood(0) elif states.ast.level > 5 and states.ast.level < 12: - ast "Adult magazines?" (face="annoyed") + ast "Adult magazines?" ("annoyed", "narrow", "base", "mid") call give_gift("You give an assortment of adult magazines to Astoria...", gift_item) - ast "Of course I read them. I'm an adult after all, it's in the name." (mouth="annoyed", pupils="R", face="angry") + ast "Of course I read them. I'm an adult after all, it's in the name." ("upset", "base", "angry", "mid") call ast_mood(-1) else: - ast "Adult magazines?" (face="annoyed") + ast "Adult magazines?" ("annoyed", "narrow", "base", "mid") call give_gift("You give an assortment of adult magazines to Astoria...", gift_item) - ast "This is that magazine Tonks was reading during our writing test..." (pupils="down", face="annoyed") - ast "Perhaps I'll wave it at her so she thinks I stole it..." (mouth="smile", pupils="mid", face="angry") + ast "This is that magazine Tonks was reading during our writing test..." ("annoyed", "narrow", "base", "down") + ast "Perhaps I'll wave it at her so she thinks I stole it..." ("smile", "base", "angry", "mid") call ast_mood(-1) elif gift_item == porn_mag_ITEM: if states.ast.level < 6: - ast "Porn magazines?" (face="disgusted") + ast "Porn magazines?" ("base", "narrow", "angry", "mid") call give_gift("You give an assortment of pornographic magazines to Astoria...", gift_item) - ast "I'll take it!" (mouth="grin", face="happy") - ast "I'll put one in Susan's bag when she's not looking. Can't wait to see that cows face when her friends notice." (mouth="open", face="angry") - ast "Thank you, [name_genie_astoria]." (face="happy") + ast "I'll take it!" ("grin", "narrow", "base", "mid") + ast "I'll put one in Susan's bag when she's not looking. Can't wait to see that cows face when her friends notice." ("open", "base", "angry", "mid") + ast "Thank you, [name_genie_astoria]." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif states.ast.level > 5 and states.ast.level < 12: - ast "Porn magazines?" (face="annoyed") - ast "Why do you have these?" (face="annoyed") - ast "Give them to Susan..." (pupils="R", face="annoyed") + ast "Porn magazines?" ("annoyed", "narrow", "base", "mid") + ast "Why do you have these?" ("annoyed", "narrow", "base", "mid") + ast "Give them to Susan..." ("annoyed", "narrow", "base", "R") call ast_mood(0) elif states.ast.level > 11 and states.ast.level < 18: - ast "Porn magazines?" (face="annoyed") + ast "Porn magazines?" ("annoyed", "narrow", "base", "mid") call give_gift("You give an assortment of pornographic magazines to Astoria...", gift_item) - ast "That's some extreme stuff you got there..." (face="disgusted") - ast "BDSM, what does that stand for..." (pupils="down", face="disgusted") + ast "That's some extreme stuff you got there..." ("base", "narrow", "angry", "mid") + ast "BDSM, what does that stand for..." ("clench", "base", "angry", "mid") ast "She looks like she's enjoying it. That's not fun..." ast "Although..." call ast_mood(-1) else: - ast "Porn magazines?" (face="happy") + ast "Porn magazines?" ("smile", "narrow", "base", "mid") call give_gift("You give an assortment of pornographic magazines to Astoria...", gift_item) - ast "Is this where you get your ideas from?" (face="angry") - ast "A swing? Why would you have that in a porn ma... oh there's the next page." (pupils="down", face="disgusted") - ast "Yeah fuck it, give it here..." (mouth="grin", face="angry") + ast "Is this where you get your ideas from?" ("upset", "base", "angry", "mid") + ast "A swing? Why would you have that in a porn ma... oh there's the next page." ("clench", "base", "angry", "mid") + ast "Yeah fuck it, give it here..." ("grin", "base", "angry", "mid") call ast_mood(-2) elif gift_item == krum_poster_ITEM: if states.ast.level < 6: - ast "Viktor Krum?" (face="annoyed") - ast "Is that the Quidditch player everyone seems to fancy?" (mouth="open", pupils="mid", face="annoyed") + ast "Viktor Krum?" ("annoyed", "narrow", "base", "mid") + ast "Is that the Quidditch player everyone seems to fancy?" ("open", "base", "base", "mid") call give_gift("You give the poster to Astoria...", gift_item) - ast "*Hmph*, I guess I'll take it if he's that popular..." (mouth="annoyed", pupils="R", face="neutral") + ast "*Hmph*, I guess I'll take it if he's that popular..." ("annoyed", "narrow", "base", "R") call ast_mood(0) elif states.ast.level > 5 and states.ast.level < 12: - ast "Viktor Krum?" (face="annoyed") - ast "Bet he could crush m... someone with his bare hands." (face="disgusted") - ast "Give it here..." (face="happy") + ast "Viktor Krum?" ("annoyed", "narrow", "base", "mid") + ast "Bet he could crush m... someone with his bare hands." ("base", "narrow", "angry", "mid") + ast "Give it here..." ("smile", "narrow", "base", "mid") call give_gift("You give the poster to Astoria...", gift_item) call ast_mood(-1) else: - ast "Viktor Krum?" (face="happy") - ast "His trousers aren't even off. What's the point..." (face="angry") + ast "Viktor Krum?" ("smile", "narrow", "base", "mid") + ast "His trousers aren't even off. What's the point..." ("upset", "base", "angry", "mid") call ast_mood(1) elif gift_item == sexy_lingerie_ITEM: if states.ast.level < 6: - ast "Lingerie?" (face="disgusted") + ast "Lingerie?" ("base", "narrow", "angry", "mid") ast "Sexy Lingerie?!?" - ast "Why do you care so much about what I wear? Isn't this shitty school uniform enough for you?" (face="angry") + ast "Why do you care so much about what I wear? Isn't this shitty school uniform enough for you?" ("upset", "base", "angry", "mid") call ast_mood(2) elif states.ast.level > 5 and states.ast.level < 12: - ast "Lingerie?" (mouth="open", face="neutral") - ast "I... No, I'd just end up looking like a tramp!" (face="angry") + ast "Lingerie?" ("open", "narrow", "base", "mid") + ast "I... No, I'd just end up looking like a tramp!" ("upset", "base", "angry", "mid") call ast_mood(0) elif states.ast.level > 11 and states.ast.level < 18: - ast "Lingerie?" (face="annoyed") - ast "Sexy..." (pupils="down", face="annoyed") - ast "Why not, I don't know if you could tell but I'm a bit of a rebel. Might even wear these in class." (mouth="grin", face="angry") + ast "Lingerie?" ("annoyed", "narrow", "base", "mid") + ast "Sexy..." ("annoyed", "narrow", "base", "down") + ast "Why not, I don't know if you could tell but I'm a bit of a rebel. Might even wear these in class." ("grin", "base", "angry", "mid") call give_gift("You give the sexy lingerie to Astoria...", gift_item) call ast_mood(-1) else: - ast "Lingerie?" (face="annoyed") + ast "Lingerie?" ("annoyed", "narrow", "base", "mid") call give_gift("You give the sexy lingerie to Astoria...", gift_item) - ast "Is this is the kind of clothes you want your students to dress in from now on?" (face="annoyed") - ast "*Heh*- I don't blame you, the school uniform is the most basic piece of trash ever without some spice..." (face="annoyed") + ast "Is this is the kind of clothes you want your students to dress in from now on?" ("annoyed", "narrow", "base", "mid") + ast "*Heh*- I don't blame you, the school uniform is the most basic piece of trash ever without some spice..." ("annoyed", "narrow", "base", "mid") call ast_mood(-1) elif gift_item == sexy_stockings_ITEM : if states.ast.level < 6: - ast "Stockings?" (face="disgusted") + ast "Stockings?" ("base", "narrow", "angry", "mid") ast "What happened to the dress code at this place?" - ast "What next, shorter skirts?" (face="angry") + ast "What next, shorter skirts?" ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "Stockings?" (mouth="open", face="neutral") + ast "Stockings?" ("open", "narrow", "base", "mid") call give_gift("You give the stockings to Astoria...", gift_item) - ast "Seems pretty elastic... I could totally lob some stink bombs with these." (mouth="grin", face="angry") + ast "Seems pretty elastic... I could totally lob some stink bombs with these." ("grin", "base", "angry", "mid") call ast_mood(-1) elif states.ast.level > 11 and states.ast.level < 18: - ast "Stockings?" (face="annoyed") - ast "Hah, you fool! With these you wont be able to stare at my legs anymore!" (mouth="grin", face="angry") + ast "Stockings?" ("annoyed", "narrow", "base", "mid") + ast "Hah, you fool! With these you wont be able to stare at my legs anymore!" ("grin", "base", "angry", "mid") call give_gift("You give the stockings to Astoria...", gift_item) call ast_mood(-2) else: - ast "Stockings?" (face="annoyed") - ast "These are almost as see-through as your wicked intentions..." (mouth="grin", face="angry") + ast "Stockings?" ("annoyed", "narrow", "base", "mid") + ast "These are almost as see-through as your wicked intentions..." ("grin", "base", "angry", "mid") call give_gift("You give the stockings to Astoria...", gift_item) - ast "Disgusting..." (face="angry") + ast "Disgusting..." ("upset", "base", "angry", "mid") call ast_mood(-1) elif gift_item == pink_condoms_ITEM: if states.ast.level < 6: - ast "Condoms?" (face="disgusted") - ast "Yeah, no... I'll take them but there's not going to be any dick going near these bad boys..." (face="annoyed") - ast "These will be the perfect thing to fill with water and drop down the staircase..." (mouth="smile", face="angry") + ast "Condoms?" ("base", "narrow", "angry", "mid") + ast "Yeah, no... I'll take them but there's not going to be any dick going near these bad boys..." ("annoyed", "narrow", "base", "mid") + ast "These will be the perfect thing to fill with water and drop down the staircase..." ("smile", "base", "angry", "mid") call give_gift("You give the pack of Condoms to Astoria...", gift_item) - ast "Cheers for the ammo, [name_genie_astoria]." (face="happy") + ast "Cheers for the ammo, [name_genie_astoria]." ("smile", "narrow", "base", "mid") call ast_mood(-2) elif states.ast.level > 5 and states.ast.level < 12: - ast "Condoms?" (face="neutral") - ast "Oh, thank you so much! I'll prick some holes in these and hand them out at once!" (mouth="grin", face="angry") - ast "What?" (face="annoyed") - ast "I see your concern... They probably would be able to trace it back to me." (face="annoyed") - ast "Oh well, a gift is a gift." (face="neutral") + ast "Condoms?" ("base", "base", "base", "mid") + ast "Oh, thank you so much! I'll prick some holes in these and hand them out at once!" ("grin", "base", "angry", "mid") + ast "What?" ("annoyed", "narrow", "base", "mid") + ast "I see your concern... They probably would be able to trace it back to me." ("annoyed", "narrow", "base", "mid") + ast "Oh well, a gift is a gift." ("base", "base", "base", "mid") call give_gift("You give the pack of Condoms to Astoria...", gift_item) call ast_mood(0) else: - ast "Condoms?" (face="annoyed") - ast "Why would I need condoms when I could just go in raw?" (mouth="grin", face="angry") - ast "*Ha-Ha-Hah* The look on your face, now that's something money can't buy." (face="happy") + ast "Condoms?" ("annoyed", "narrow", "base", "mid") + ast "Why would I need condoms when I could just go in raw?" ("grin", "base", "angry", "mid") + ast "*Ha-Ha-Hah* The look on your face, now that's something money can't buy." ("smile", "narrow", "base", "mid") call give_gift("You sheepishly give the pack of Condoms to Astoria...", gift_item) - ast "*Hmm*.... yeah why not." (face="neutral") + ast "*Hmm*.... yeah why not." ("base", "base", "base", "mid") call ast_mood(-1) elif gift_item == vibrator_ITEM: if states.ast.level < 6: - ast "A vibrator?" (face="disgusted") - ast "Gross, where did you even get that from?" (face="angry") + ast "A vibrator?" ("base", "narrow", "angry", "mid") + ast "Gross, where did you even get that from?" ("upset", "base", "angry", "mid") call ast_mood(2) elif states.ast.level > 5 and states.ast.level < 12: - ast "A vibrator?" (face="disgusted") - ast "Get the fuck out..." (face="angry") - ast "Oh right, I'm in your office... yeah that's going to be solid no on that one." (face="annoyed") + ast "A vibrator?" ("base", "narrow", "angry", "mid") + ast "Get the fuck out..." ("upset", "base", "angry", "mid") + ast "Oh right, I'm in your office... yeah that's going to be solid no on that one." ("annoyed", "narrow", "base", "mid") call ast_mood(1) elif states.ast.level > 11 and states.ast.level < 18: - ast "A vibrator?" (face="disgusted") - ast "Hold on a second, that's the noise I've been hearing in the girls chambers!" (face="happy") - ast "Do they work?" (face="happy") - ast "I mean, I'll take it I guess." (face="neutral") + ast "A vibrator?" ("base", "narrow", "angry", "mid") + ast "Hold on a second, that's the noise I've been hearing in the girls chambers!" ("smile", "narrow", "base", "mid") + ast "Do they work?" ("smile", "narrow", "base", "mid") + ast "I mean, I'll take it I guess." ("base", "base", "base", "mid") call give_gift("You give the vibrator to Astoria...",gift_item) call ast_mood(-1) else: - ast "A vibrator?" (face="neutral") + ast "A vibrator?" ("base", "base", "base", "mid") call give_gift("You give the vibrator to Astoria...",gift_item) - ast "That's disgusting! What a disgusting old man you are. Well aren't you being disgusting..." (face="angry") - ast "Disgusting..." (face="angry") - ast "Give it here." (face="happy") + ast "That's disgusting! What a disgusting old man you are. Well aren't you being disgusting..." ("upset", "base", "angry", "mid") + ast "Disgusting..." ("upset", "base", "angry", "mid") + ast "Give it here." ("smile", "narrow", "base", "mid") call ast_mood(-2) elif gift_item == anal_lube_ITEM: if states.ast.level < 6: - ast "Lube?" (mouth="open", face="neutral") - ast "I know the perfect staircase for this!" (face="happy") + ast "Lube?" ("open", "narrow", "base", "mid") + ast "I know the perfect staircase for this!" ("smile", "narrow", "base", "mid") call give_gift("You give the jar of lube to Astoria...", gift_item) - ast "Thank you, [name_genie_astoria]." (face="happy") + ast "Thank you, [name_genie_astoria]." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif states.ast.level > 5 and states.ast.level < 12: - ast "Anal Lube?" (mouth="smile", face="happy") - ast "Swiggity swooty I'm coming for that booty!" (mouth="smile", face="angry") - ast "Come on now, what's with that dry humour. Maybe you could use some of that lube?" (face="annoyed") + ast "Anal Lube?" ("smile", "narrow", "base", "mid") + ast "Swiggity swooty I'm coming for that booty!" ("smile", "base", "angry", "mid") + ast "Come on now, what's with that dry humour. Maybe you could use some of that lube?" ("annoyed", "narrow", "base", "mid") call give_gift("You cautiously give the jar of lube to Astoria...", gift_item) - ast "Boo!" (face="annoyed") - ast "*ha-ha-ha*!" (face="happy") + ast "Boo!" ("annoyed", "narrow", "base", "mid") + ast "*ha-ha-ha*!" ("smile", "narrow", "base", "mid") call ast_mood(-2) else: - ast "Anal Lube?" (face="happy") + ast "Anal Lube?" ("smile", "narrow", "base", "mid") call give_gift("You give the jar of lube to Astoria...", gift_item) - ast "Why would I need this, surely the initial pain is the best part..." (face="angry") - ast "Oh, for me? Duh!" (face="annoyed") - ast "Yeah, actually I'll take it..." (face="happy") + ast "Why would I need this, surely the initial pain is the best part..." ("upset", "base", "angry", "mid") + ast "Oh, for me? Duh!" ("annoyed", "narrow", "base", "mid") + ast "Yeah, actually I'll take it..." ("smile", "narrow", "base", "mid") call ast_mood(-2) elif gift_item == ballgag_and_cuffs_ITEM: if states.ast.level < 6: - ast "Handcuffs? And what.... a ball gag?" (face="disgusted") - ast "I don't know what you're trying to insinuate." (face="angry") - ast "The cuffs could be useful but why the ball gag?" (face="disgusted") - ast "I'd rather not." (face="annoyed") + ast "Handcuffs? And what.... a ball gag?" ("base", "narrow", "angry", "mid") + ast "I don't know what you're trying to insinuate." ("upset", "base", "angry", "mid") + ast "The cuffs could be useful but why the ball gag?" ("base", "narrow", "angry", "mid") + ast "I'd rather not." ("annoyed", "narrow", "base", "mid") call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "Handcuffs? And a Ball gag?" (face="annoyed") + ast "Handcuffs? And a Ball gag?" ("annoyed", "narrow", "base", "mid") call give_gift("You give the handcuffs to Astoria...", gift_item) - ast "I can break these cuffs!" (face="angry") - ast "*HNNNNNGH!" (face="angry") - ast "I can't break those cuffs..." (face="annoyed") - ast "Do you have a key?" (face="annoyed") + ast "I can break these cuffs!" ("upset", "base", "angry", "mid") + ast "*HNNNNNGH!" ("upset", "base", "angry", "mid") + ast "I can't break those cuffs..." ("annoyed", "narrow", "base", "mid") + ast "Do you have a key?" ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "Handcuffs? And a Ball gag?" (face="happy") + ast "Handcuffs? And a Ball gag?" ("smile", "narrow", "base", "mid") call give_gift("You give the handcuffs to Astoria...", gift_item) - ast "So I guess these are one of those BDSM items?" (face="neutral") - ast "Colour me intrigued..." (face="happy") + ast "So I guess these are one of those BDSM items?" ("base", "base", "base", "mid") + ast "Colour me intrigued..." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif gift_item == anal_plugs_ITEM: if states.ast.level < 6: - ast "anal plugs?" (face="disgusted") - ast "Yuck, what the hell is wrong with you... do you know where these go?" (face="angry") - ast "Of course you do... you detestable dingbat." (face="angry") + ast "anal plugs?" ("base", "narrow", "angry", "mid") + ast "Yuck, what the hell is wrong with you... do you know where these go?" ("upset", "base", "angry", "mid") + ast "Of course you do... you detestable dingbat." ("upset", "base", "angry", "mid") call ast_mood(2) elif states.ast.level > 5 and states.ast.level < 12: - ast "anal plugs?" (face="disgusted") - ast "Why don't you try and sit on one yourself..." (face="angry") + ast "anal plugs?" ("base", "narrow", "angry", "mid") + ast "Why don't you try and sit on one yourself..." ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 11 and states.ast.level < 18: - ast "anal plugs?" (face="disgusted") + ast "anal plugs?" ("base", "narrow", "angry", "mid") call give_gift("You give the anal plugs to Astoria...", gift_item) - ast "Why are you giving me this?" (face="annoyed") - ast "I'll take it I guess..." (face="annoyed") + ast "Why are you giving me this?" ("annoyed", "narrow", "base", "mid") + ast "I'll take it I guess..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "anal plugs?" (face="neutral") + ast "anal plugs?" ("base", "base", "base", "mid") call give_gift("You give the anal plugs to Astoria...", gift_item) - ast "You do know these hurts a bit if you're not used to them?" (face="annoyed") + ast "You do know these hurts a bit if you're not used to them?" ("annoyed", "narrow", "base", "mid") nar "Astoria absent-mindedly pockets the anal plug." - ast "Don't see why you'd give these out as if they were sweets..." (mouth="annoyed", face="neutral") + ast "Don't see why you'd give these out as if they were sweets..." ("annoyed", "base", "base", "mid") call ast_mood(-1) elif gift_item == testral_strapon_ITEM: if states.ast.level < 6: - ast "A strap-on?" (face="disgusted") - ast "Why would you give me this... it's so ribbed..." (face="angry") - ast "As if anyone would want something like that!" (face="angry") + ast "A strap-on?" ("base", "narrow", "angry", "mid") + ast "Why would you give me this... it's so ribbed..." ("upset", "base", "angry", "mid") + ast "As if anyone would want something like that!" ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "A strap-on?" (face="disgusted") - ast "What do you want me to do with this?" (face="annoyed") - ast "Well I know what you want me to do with it." (face="annoyed") - ast "It's not happening..." (face="angry") + ast "A strap-on?" ("base", "narrow", "angry", "mid") + ast "What do you want me to do with this?" ("annoyed", "narrow", "base", "mid") + ast "Well I know what you want me to do with it." ("annoyed", "narrow", "base", "mid") + ast "It's not happening..." ("upset", "base", "angry", "mid") call ast_mood(0) elif states.ast.level > 11 and states.ast.level < 18: - ast "A strap-on?" (face="angry") + ast "A strap-on?" ("upset", "base", "angry", "mid") call give_gift("You give the strap-on to Astoria...", gift_item) - ast "I'll strap it on your forehead and make you into a sex unicorn!" (mouth="grin", face="angry") - ast "I read about people having sex on top of a unicorn..." (face="disgusted") - ast "Bit of an odd segment that one was..." (face="annoyed") + ast "I'll strap it on your forehead and make you into a sex unicorn!" ("grin", "base", "angry", "mid") + ast "I read about people having sex on top of a unicorn..." ("base", "narrow", "angry", "mid") + ast "Bit of an odd segment that one was..." ("annoyed", "narrow", "base", "mid") call ast_mood(-1) else: - ast "A strap-on?" (face="annoyed") + ast "A strap-on?" ("annoyed", "narrow", "base", "mid") call give_gift("You give the strap-on to Astoria...", gift_item) - ast "It says Thestral on the side..." (face="annoyed") + ast "It says Thestral on the side..." ("annoyed", "narrow", "base", "mid") ast "Isn't' that the creature only people that has seen someone die can see?" - ast "That makes the person who made he mould kinda fucked up if you think about it..." (face="disgusted") - ast "I like it..." (face="happy") + ast "That makes the person who made he mould kinda fucked up if you think about it..." ("base", "narrow", "angry", "mid") + ast "I like it..." ("smile", "narrow", "base", "mid") call ast_mood(-2) elif gift_item == broom_2000_ITEM: if states.ast.level < 6: - ast "A broom?" (face="neutral") - ast "What's that sticking out on the top? That's not going to help me fly!" (face="annoyed") + ast "A broom?" ("base", "base", "base", "mid") + ast "What's that sticking out on the top? That's not going to help me fly!" ("annoyed", "narrow", "base", "mid") call ast_mood(1) elif states.ast.level > 5 and states.ast.level < 12: - ast "A broom?" (face="neutral") + ast "A broom?" ("base", "base", "base", "mid") call give_gift("You give the broom to Astoria...", gift_item) - ast "Now if anything will motivate you to fly, that will..." (mouth="grin", face="angry") - ast "Bit awkward during broom care though..." (face="annoyed") + ast "Now if anything will motivate you to fly, that will..." ("grin", "base", "angry", "mid") + ast "Bit awkward during broom care though..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "A broom?" (face="happy") + ast "A broom?" ("smile", "narrow", "base", "mid") call give_gift("You give the broom to Astoria...", gift_item) - ast "Now that will keep you sturdy." (mouth="grin", face="angry") - ast "What a depraved little invention..." (mouth="smile", face="angry") + ast "Now that will keep you sturdy." ("grin", "base", "angry", "mid") + ast "What a depraved little invention..." ("smile", "base", "angry", "mid") ast "Totally something I'd come up with!" - ast "You look sceptical..." (face="annoyed") + ast "You look sceptical..." ("annoyed", "narrow", "base", "mid") call ast_mood(-1) elif gift_item == sexdoll_ITEM: if states.ast.level < 6: - ast "A sex doll?" (face="disgusted") - ast "That's gross [name_genie_astoria]!" (face="angry") - ast "Yuck, it smells gross too!" (face="angry") + ast "A sex doll?" ("base", "narrow", "angry", "mid") + ast "That's gross [name_genie_astoria]!" ("upset", "base", "angry", "mid") + ast "Yuck, it smells gross too!" ("upset", "base", "angry", "mid") call ast_mood(2) elif states.ast.level > 5 and states.ast.level < 12: - ast "A sex doll?" (face="disgusted") - ast "This is literally worthless to me, why would you even consider this a good gift?" (face="angry") + ast "A sex doll?" ("base", "narrow", "angry", "mid") + ast "This is literally worthless to me, why would you even consider this a good gift?" ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 11 and states.ast.level < 18: - ast "A sex doll?" (face="angry") + ast "A sex doll?" ("upset", "base", "angry", "mid") call give_gift("You give the doll to Astoria...", gift_item) - ast "I hope you got this for cheap. It looks awful..." (face="annoyed") - ast "I mean... why thank you, I shall cherish this forever!" (face="annoyed") + ast "I hope you got this for cheap. It looks awful..." ("annoyed", "narrow", "base", "mid") + ast "I mean... why thank you, I shall cherish this forever!" ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "A sex doll?" (face="disgusted") + ast "A sex doll?" ("base", "narrow", "angry", "mid") call give_gift("You give the doll to Astoria...", gift_item) - ast "But I'm a girl..." (face="annoyed") - ast "I'll leave it in the Slytherin common room to see if anyone has balls enough to takes it..." (mouth="grin", face="angry") + ast "But I'm a girl..." ("annoyed", "narrow", "base", "mid") + ast "I'll leave it in the Slytherin common room to see if anyone has balls enough to takes it..." ("grin", "base", "angry", "mid") call ast_mood(-1) elif gift_item == anal_beads_ITEM: if states.ast.level < 6: - ast "Anal beads?" (face="disgusted") - ast "Like, ones that you putt in your ass?" (face="angry") - ast "What... the hell!" (face="angry") + ast "Anal beads?" ("base", "narrow", "angry", "mid") + ast "Like, ones that you putt in your ass?" ("upset", "base", "angry", "mid") + ast "What... the hell!" ("upset", "base", "angry", "mid") call ast_mood(2) elif states.ast.level > 5 and states.ast.level < 12: - ast "Anal beads?" (face="disgusted") - ast "Put it up your own ass and I'll let er rip!" (face="angry") + ast "Anal beads?" ("base", "narrow", "angry", "mid") + ast "Put it up your own ass and I'll let er rip!" ("upset", "base", "angry", "mid") call ast_mood(1) elif states.ast.level > 11 and states.ast.level < 18: - ast "Anal beads?" (face="disgusted") - ast "Why would I need these?" (face="annoyed") - ast "I'll pass..." (face="annoyed") + ast "Anal beads?" ("base", "narrow", "angry", "mid") + ast "Why would I need these?" ("annoyed", "narrow", "base", "mid") + ast "I'll pass..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "Anal beads?" (face="neutral") - ast "Looks painful." (face="annoyed") + ast "Anal beads?" ("base", "base", "base", "mid") + ast "Looks painful." ("annoyed", "narrow", "base", "mid") call give_gift("You give the anal beads to Astoria...", gift_item) - ast "And they're green... Did you get these made just for me?" (mouth="annoyed", face="neutral") + ast "And they're green... Did you get these made just for me?" ("annoyed", "base", "base", "mid") call ast_mood(-1) elif gift_item == wine_ITEM: if states.ast.level < 6: - ast "Wine?" (face="disgusted") + ast "Wine?" ("base", "narrow", "angry", "mid") call give_gift("You give the wine to Astoria...", gift_item) - ast "You're joking right?" (face="annoyed") - ast "Snape would murder me if he saw me bringing alcohol into the common room." (face="angry") - ast "I can't make you shut up after hours even without alcohol in your system..." (face="annoyed") - ast "Such a slimy slithering killjoy..." (face="annoyed") + ast "You're joking right?" ("annoyed", "narrow", "base", "mid") + ast "Snape would murder me if he saw me bringing alcohol into the common room." ("upset", "base", "angry", "mid") + ast "I can't make you shut up after hours even without alcohol in your system..." ("annoyed", "narrow", "base", "mid") + ast "Such a slimy slithering killjoy..." ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "Wine?" (face="happy") - ast "Well aren't we fancy?" (face="neutral") + ast "Wine?" ("smile", "narrow", "base", "mid") + ast "Well aren't we fancy?" ("base", "base", "base", "mid") call give_gift("You give the wine to Astoria...", gift_item) - ast "This is the real shit. Look at the date on that." (face="neutral") - ast "You really are ancient if you bought it new..." (face="happy") + ast "This is the real shit. Look at the date on that." ("base", "base", "base", "mid") + ast "You really are ancient if you bought it new..." ("smile", "narrow", "base", "mid") call ast_mood(-1) elif gift_item == firewhisky_ITEM: if states.ast.level < 6: - ast "Firewhisky?" (face="neutral") - ast "That's the stuff Tonks always reeks off." (face="disgusted") - ast "I'm not gonna drink whatever she does." (face="annoyed") - ast "It'd be like wearing old peoples perfume!" (face="annoyed") + ast "Firewhisky?" ("base", "base", "base", "mid") + ast "That's the stuff Tonks always reeks off." ("base", "narrow", "angry", "mid") + ast "I'm not gonna drink whatever she does." ("annoyed", "narrow", "base", "mid") + ast "It'd be like wearing old peoples perfume!" ("annoyed", "narrow", "base", "mid") call ast_mood(0) else: - ast "Firewhisky?" (face="happy") - ast "Fine, I'll give in. If Tonks likes it so much it can't be that bad..." (face="happy") + ast "Firewhisky?" ("smile", "narrow", "base", "mid") + ast "Fine, I'll give in. If Tonks likes it so much it can't be that bad..." ("smile", "narrow", "base", "mid") call give_gift("You give the firewhisky to Astoria...", gift_item) - ast "*Hmm*... not made using real fire.. well that's bloody obvious..." (face="neutral") - ast "Might experience a slight pain and burning sensation when consuming..." (face="disgusted") - ast "Why didn't you say so before!" (face="angry") - ast "I might even take a sip or two myself..." (face="happy") + ast "*Hmm*... not made using real fire.. well that's bloody obvious..." ("base", "base", "base", "mid") + ast "Might experience a slight pain and burning sensation when consuming..." ("base", "narrow", "angry", "mid") + ast "Why didn't you say so before!" ("upset", "base", "angry", "mid") + ast "I might even take a sip or two myself..." ("smile", "narrow", "base", "mid") call ast_mood(-1) ast "" (xpos="base",ypos="base") diff --git a/game/scripts/characters/astoria/summon.rpy b/game/scripts/characters/astoria/summon.rpy index d94ec75e..1823b6fd 100644 --- a/game/scripts/characters/astoria/summon.rpy +++ b/game/scripts/characters/astoria/summon.rpy @@ -61,9 +61,9 @@ label summon_astoria: stop music fadeout 3.0 if game.daytime: - ast "I will go back to classes then, [name_genie_astoria]." ( face="neutral") + ast "I will go back to classes then, [name_genie_astoria]." ("base", "base", "base", "mid") else: - ast "Oh, alright. Good night, [name_genie_astoria]." ( face="neutral") + ast "Oh, alright. Good night, [name_genie_astoria]." ("base", "base", "base", "mid") play sound "sounds/door.ogg" @@ -153,73 +153,73 @@ label astoria_talk: "-Sir-": label .sir: $ name_genie_astoria = "Sir" - ast "Very well, [name_genie_astoria]." ( face="neutral") + ast "Very well, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Dumbledore-": label .dumbledore: $ name_genie_astoria = "Dumbledore" - ast "Of course, [name_genie_astoria]." ( face="neutral") + ast "Of course, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Professor-": label .professor: $ name_genie_astoria = "Professor" - ast "Of course, [name_genie_astoria]." ( face="neutral") + ast "Of course, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Old man-": label .old_man: $ name_genie_astoria = "Old man" - ast "Alrighty, [name_genie_astoria]." ( face="neutral") + ast "Alrighty, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Genie-": label .genie: $ name_genie_astoria = "Genie" - ast "What?! You are a genie? For real?" ( face="happy") - ast "That's so cool!" ( face="happy") + ast "What?! You are a genie? For real?" ("grin", "base", "base", "mid") + ast "That's so cool!" ("grin", "base", "base", "mid") gen "(Oh right. Nobody is supposed to know that.)" ("base", xpos="far_left", ypos="head") gen "It's just my name, [name_astoria_genie]..." ("base", xpos="far_left", ypos="head") - ast "Oh... Okay, [name_genie_astoria]." ( face="neutral") + ast "Oh... Okay, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Lord Voldemort-": label .lord_voldemort: $ name_genie_astoria = "Lord Voldemort" - ast "Voldemort? Like that mean, evil wizard?" ( face="disgusted") - ast "You aren't him, are you?" ( face="disgusted") + ast "Voldemort? Like that mean, evil wizard?" ("clench", "narrow", "angry", "mid") + ast "You aren't him, are you?" ("clench", "narrow", "angry", "mid") gen "No, just role-playing..." ("base", xpos="far_left", ypos="head") - ast "Oh, alrighty then!" ( face="happy") - ast "[name_genie_astoria]." ( face="happy") + ast "Oh, alrighty then!" ("grin", "base", "base", "mid") + ast "[name_genie_astoria]." ("grin", "base", "base", "mid") jump astoria_talk "-Daddy-": label .daddy: $ name_genie_astoria = "Daddy" - ast "Daddy? Don't you think that's a little weird?" ( face="disgusted") - gen "Not at all!" ("base", xpos="far_left", ypos="head") - ast "*Hmph*..." ( face="angry") - ast "Alright, why not. Nobody knows about it anyways." ( face="neutral") + ast "Daddy? Don't you think that's a little weird?" ("clench", "narrow", "angry", "mid") + gen "Not at all!" ("base", "narrow", "angry", "mid", xpos="far_left", ypos="head") + ast "*Hmph*..." ("upset", "narrow", "angry", "mid") + ast "Alright, why not. Nobody knows about it anyways." ("base", "base", "base", "mid") jump astoria_talk "-Master-" (style="disabled") if states.ast.level < 18: label .master_fail: $ name_genie_astoria = "Dumby" # Tricked - ast "*Ha-ha-ha-ha*-- you want me to call you master?" ( face="happy") - ast "That's so dumb!" ( face="happy") - ast "Oh I know!" ( face="happy") - ast "How about I'll call you \"Dumby\" instead? It fits you really well." ( face="happy") + ast "*Ha-ha-ha-ha*-- you want me to call you master?" ("grin", "base", "base", "mid") + ast "That's so dumb!" ("grin", "base", "base", "mid") + ast "Oh I know!" ("grin", "base", "base", "mid") + ast "How about I'll call you \"Dumby\" instead? It fits you really well." ("grin", "base", "base", "mid") gen "(...)" ("base", xpos="far_left", ypos="head") - ast "*Ha-ha-ha-ha*--" ( face="happy") - gen "Are you done now?" ("base", xpos="far_left", ypos="head") - ast "Yes... I'm sorry... {w=1.0}Dumby..." ( face="happy") - gen "(Damn brat! We'll see who will be laughing later.)" ("angry", xpos="far_left", ypos="head") + ast "*Ha-ha-ha-ha*--" ("grin", "base", "base", "mid") + gen "Are you done now?" ("base", "base", "base", "mid", xpos="far_left", ypos="head") + ast "Yes... I'm sorry... {w=1.0}Dumby..." ("grin", "base", "base", "mid") + gen "(Damn brat! We'll see who will be laughing later.)" ("angry", "base", "base", "mid", xpos="far_left", ypos="head") jump astoria_talk "-Master-" if states.ast.level >= 18: label .master: $ name_genie_astoria = "Master" - ast "*Ha-ha-ha-ha*-- You want me to call you master?" ( face="happy") - ast "That's so silly!" ( face="happy") + ast "*Ha-ha-ha-ha*-- You want me to call you master?" ("grin", "base", "base", "mid") + ast "That's so silly!" ("grin", "base", "base", "mid") gen "(...)" ("base", xpos="far_left", ypos="head") - ast "Well alright... M-master--" ( face="happy") - ast "*Ha-ha-ha-ha*--{w=1.0}{nw}" ( face="happy") + ast "Well alright... M-master--" ("grin", "base", "base", "mid") + ast "*Ha-ha-ha-ha*--{w=1.0}{nw}" ("grin", "base", "base", "mid") with hpunch gen "Shut it... Or there will be consequences!" ("angry", xpos="far_left", ypos="head") - ast "I'm sorry... It won't happen again, master..." ( face="neutral") + ast "I'm sorry... It won't happen again, master..." ("base", "base", "base", "mid") jump astoria_talk "-Custom Input-" (style="disabled") if states.ast.level < 18: gen "(I don't think she's yet ready for that)" ("base", xpos="far_left", ypos="head") @@ -237,7 +237,7 @@ label astoria_talk: jump astoria_talk else: $ name_genie_astoria = temp_name - ast "*Uhm*... Okay... I will call you [name_genie_astoria]." ( face="neutral") + ast "*Uhm*... Okay... I will call you [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Never mind-": jump astoria_talk @@ -248,43 +248,43 @@ label astoria_talk: "-Miss Greengrass-": label .miss_greengrass: $ name_astoria_genie = "Miss Greengrass" - ast "Sure, [name_genie_astoria]." ( face="happy") + ast "Sure, [name_genie_astoria]." ("grin", "base", "base", "mid") jump astoria_talk "-Astoria-": label .Astoria: $ name_astoria_genie = "Astoria" - ast "Finally getting rid of this formal bullshit? I approve!" ( face="happy") + ast "Finally getting rid of this formal bullshit? I approve!" ("grin", "base", "base", "mid") jump astoria_talk "-Girl-": label .girl: $ name_astoria_genie = "Girl" - ast "Okay, [name_genie_astoria]." ( face="neutral") + ast "Okay, [name_genie_astoria]." ("base", "base", "base", "mid") jump astoria_talk "-Princess-": label .princess: $ name_astoria_genie = "Princess" - ast "I really do feel like a princess!" ( face="happy") - ast "After all, I can do whatever I want!" ( face="angry") + ast "I really do feel like a princess!" ("grin", "base", "base", "mid") + ast "After all, I can do whatever I want!" ("upset", "narrow", "angry", "mid") jump astoria_talk "-Cutie-": label .cutie: $ name_astoria_genie = "Cutie" - ast "Fine... If you really have to, [name_genie_astoria]." ( face="disgusted") + ast "Fine... If you really have to, [name_genie_astoria]." ("clench", "narrow", "angry", "mid") jump astoria_talk "-Slave-" (style="disabled") if states.ast.level < 18: label .slave_fail: - ast "I'm not your slave, [name_genie_astoria]!" ( face="angry") + ast "I'm not your slave, [name_genie_astoria]!" ("upset", "narrow", "angry", "mid") gen "Of course you aren't! We are just playing a game, that's all..." ("base", xpos="far_left", ypos="head") - ast "Well, I don't like your games!" ( face="angry") - ast "Forget it!" ( face="angry") + ast "Well, I don't like your games!" ("upset", "narrow", "angry", "mid") + ast "Forget it!" ("upset", "narrow", "angry", "mid") jump astoria_talk "-Slave-" if states.ast.level >= 18: label .slave: $ name_astoria_genie = "Slave" - ast "I'm not your slave, [name_genie_astoria]!" ( face="angry") + ast "I'm not your slave, [name_genie_astoria]!" ("upset", "narrow", "angry", "mid") gen "Of course you aren't! We are just playing a game, that's all..." ("base", xpos="far_left", ypos="head") - ast "Oh I like games!" ( face="happy") - ast "Alrighty then!" ( face="happy") + ast "Oh I like games!" ("grin", "base", "base", "mid") + ast "Alrighty then!" ("grin", "base", "base", "mid") jump astoria_talk "-Custom Input-" (style="disabled") if states.ast.level < 18: @@ -303,10 +303,10 @@ label astoria_talk: jump astoria_talk else: $ name_astoria_genie = temp_name - ast "That's a bit much, don't you think, [name_genie_astoria]?" ( face="disgusted") + ast "That's a bit much, don't you think, [name_genie_astoria]?" ("clench", "narrow", "angry", "mid") gen "Not at all!" ("base", xpos="far_left", ypos="head") gen "I will only call you that when we are alone!" ("base", xpos="far_left", ypos="head") - ast "Well... Okay then..." ( face="neutral") + ast "Well... Okay then..." ("base", "base", "base", "mid") jump astoria_talk "-Never mind-": jump astoria_talk diff --git a/game/scripts/wardrobe/wardrobe.rpy b/game/scripts/wardrobe/wardrobe.rpy index a829be50..93163227 100644 --- a/game/scripts/wardrobe/wardrobe.rpy +++ b/game/scripts/wardrobe/wardrobe.rpy @@ -381,11 +381,9 @@ label wardrobe_menu(): if wardrobe_music: wardrobe_music = False renpy.music.play(last_track) - get_character_sayer(states.active_girl)("", face="happy") else: wardrobe_music = True renpy.music.play("music/Spring_In_My_Step.ogg", fadein=1) - get_character_sayer(states.active_girl)("", face="happy") elif _choice == "randomise": python: