From 803f3a36cee1601143500ceb20aafe96890ff49a Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Wed, 26 Apr 2023 00:29:33 +0100 Subject: [PATCH] Refactoring blush and tears (Astoria) * Converted blush face statements to temporary blush face attributes * Fixed previously omitted Tonks' hair calls --- game/scripts/characters/astoria/chitchats.rpy | 2 +- game/scripts/characters/astoria/events/imperio_training.rpy | 6 +++--- game/scripts/characters/astoria/wardrobe_reactions.rpy | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/game/scripts/characters/astoria/chitchats.rpy b/game/scripts/characters/astoria/chitchats.rpy index 0f8b70e1..cc1ca913 100644 --- a/game/scripts/characters/astoria/chitchats.rpy +++ b/game/scripts/characters/astoria/chitchats.rpy @@ -56,7 +56,7 @@ label astoria_chitchat: block: ast "I found the perfect use for the Wingardium leviosa charm today..." ("smile", "base", "base", "mid") ast "Granger was being especially annoying, prancing around one of the corridors, so I used it to lift her skirt up!" ("open", "base", "angry", "down") - ast "But she didn't even see that I did it! she just punched that Weasley boy on the arm." ("angry", "narrow", "base", "down", cheeks="blush") + ast @ cheeks blush "But she didn't even see that I did it! she just punched that Weasley boy on the arm." ("angry", "narrow", "base", "down") ast "Snap-- {i}Professor{/i} Snape saw it though. I thought I was in trouble for a moment, but he just corrected me on my pronunciation." ("grin", "narrow", "base", "mid") block: diff --git a/game/scripts/characters/astoria/events/imperio_training.rpy b/game/scripts/characters/astoria/events/imperio_training.rpy index 81e9cfa2..f5d54e32 100644 --- a/game/scripts/characters/astoria/events/imperio_training.rpy +++ b/game/scripts/characters/astoria/events/imperio_training.rpy @@ -741,7 +741,7 @@ label ag_st_imperio_E3: ast "If I can pull off the Imperius curse on Professor Tonks..." ("open", "closed", "base", "mid") ast "Any of the other girls will be easy game for me!" ("smile", "narrow", "angry", "down") # Game as in "prey". ast "I'll make them rue the day they ever made fun of me!" ("clench", "closed", "angry", "mid") - ton "..................................................." ("annoyed", "wide", "shocked", "stare", hair="annoyed") # Angry at Astoria + ton "..................................................." ("annoyed", "wide", "shocked", "stare", hair="upset") # Angry at Astoria gen "......................." ("base", xpos="far_left", ypos="head") ast "Tomorrow, I shall have Susan walk through school - parading those ridiculous udders of hers for all to see! That'll show her!" ("angry", "narrow", "angry", "R") ton "!!!" ("upset", "wide", "shocked", "stare", hair="angry") # Very angry @@ -1253,7 +1253,7 @@ label ag_st_imperio_E5: ton "" ("base", "base", "base", "ahegao", cheeks="blush") pause.8 - ast "She did it!" ("smile", "base", "base", "mid", cheeks="blush") + ast @ cheeks blush "She did it!" ("smile", "base", "base", "mid") gen "Well{w=0.5} {i}fucking{/i}{w=0.7} done!" ("grin", xpos="far_left", ypos="head") gen "Next, I'd like you to--" ("base", xpos="far_left", ypos="head") ast "Ask her to take off her trousers!" ("grin", "base", "angry", "L") @@ -1472,7 +1472,7 @@ label ag_st_imperio_E5: with d3 pause.5 - ton "Shit!" ("mad", "base", "angry", "L", hair="annoyed", xpos="left", flip=True) + ton "Shit!" ("mad", "base", "angry", "L", hair="upset", xpos="left", flip=True) hide tonks_main hide screen bld1 with d3 diff --git a/game/scripts/characters/astoria/wardrobe_reactions.rpy b/game/scripts/characters/astoria/wardrobe_reactions.rpy index e1a7fd78..5ba4c809 100644 --- a/game/scripts/characters/astoria/wardrobe_reactions.rpy +++ b/game/scripts/characters/astoria/wardrobe_reactions.rpy @@ -72,7 +72,7 @@ label ast_reaction_touch(what): random: block: - ast "What do you think you're doing?" ("clench", "base", "base", "mid", cheeks="blush") + ast @ cheeks blush "What do you think you're doing?" ("clench", "base", "base", "mid") gen "Kissing you?" ("base", xpos="far_left", ypos="head") ast "Surely that's against some rule..." ("annoyed", "base", "base", "R") gen "Worried about rule breaking all of a sudden are we?" ("base", xpos="far_left", ypos="head") @@ -81,7 +81,7 @@ label ast_reaction_touch(what): ast "Aren't you a bold one..." ("base", "narrow", "base", "mid") block: ast "Thought you could slip past my wards did you?" ("clench", "base", "base", "mid") - ast "I'll have you know I felt none of that!" ("open", "closed", "base", "mid", cheeks="blush") + ast @ cheeks blush "I'll have you know I felt none of that!" ("open", "closed", "base", "mid") return