Merge branch 'dev' into temporary-expressions

* Added support for temporary attribues
* Redesigned persistent expressions toggles and simplified them
* Improved defined expressions dictionary handling and added imap sorting
* Simplified parts of code
* Fixed prompt screen incompatibility with Text displayables

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:

game/scripts/characters/astoria/events/intro.rpy

@@ -180,7 +180,7 @@ label astoria_intro_E1:
                     gen "You can count on that!" ("grin", xpos="far_left", ypos="head")
                     ton "Hold on!{w} Are you going to hang it up here? In your office?!" ("open", "wide", "shocked", "stare")
                     gen "Sure... It's not like there are that many other rooms I can go to..." ("base", xpos="far_left", ypos="head")
-                    ton "Oh my... I'll have to put a concealment charm on it then..." ("upset", "base", "worried", "R", hair="horny")
+                    ton @ hair horny "Oh my... I'll have to put a concealment charm on it then..." ("upset", "base", "worried", "R")
                     gen "A what charm?" ("base", xpos="far_left", ypos="head")
                     ton "Only you will be able to see its true form... Everyone else..." ("open", "base", "base", "mid")
                     ton "Well they'll just see some dull landscape or another..." ("normal", "base", "base", "downR")
@@ -306,7 +306,7 @@ label astoria_intro_E2_hermione:
     gen "I'm certain that it's the work of another student..." ("base", xpos="far_left", ypos="head")
     gen "(or Snape has finally snapped...)" ("base", xpos="far_left", ypos="head")
     gen "so I'll need you to go undercover to find out who cast it." ("base", xpos="far_left", ypos="head")
-    her "Really? You're depending on me to find a criminal within our school?" ("soft", "narrow", "base", "down",cheeks="blush")
+    her @ cheeks blush "Really? You're depending on me to find a criminal within our school?" ("soft", "narrow", "base", "down")
     gen "If it's not too much troub--" ("base", xpos="far_left", ypos="head")
     her "I'd be honoured, [name_genie_hermione]!" ("scream", "closed", "base", "mid")
     her "It's no doubt the work of one of those despicable Slytherins..." ("open", "closed", "angry", "mid")
@@ -323,7 +323,7 @@ label astoria_intro_E2_hermione:
 
         "\"No one's getting sent to Azkaban...\"":
             gen "By the gods, [name_hermione_genie], what's wrong with you?" ("base", xpos="far_left", ypos="head")
-            her "What are you talking about, [name_genie_hermione]?" ("open", "base", "base", "R",cheeks="blush")
+            her @ cheeks blush "What are you talking about, [name_genie_hermione]?" ("open", "base", "base", "R")
             her "Everyone knows that life in Azkaban is the punishment for casting an unforgivable curse..." ("open", "closed", "base", "mid")
             gen "I've been given special permission to punish them as I see fit." ("base", xpos="far_left", ypos="head")
             her "Oh..." ("annoyed", "base", "base", "mid")
@@ -676,10 +676,10 @@ label astoria_intro_E3:
     call ast_chibi("stand","desk","base", flip=True)
     with d3
 
-    ton "Snape. How good to see you!" ("soft", "shocked", "base", "mid", hair="neutral", xpos="far_right", ypos="head")
+    ton @ hair neutral "Snape. How good to see you!" ("soft", "shocked", "base", "mid", xpos="far_right", ypos="head")
     sna "Save your compliments for someone else... I'm in a bit of a hurry." ("snape_03", xpos="far_right", ypos="head")
     ton "Still mad at me for taking your post?" ("base", "base", "angry", "mid")
-    ton "I'd be willing to compensate you for it, you know..." ("horny", "base", "base", "mid", hair="horny")
+    ton @ hair horny "I'd be willing to compensate you for it, you know..." ("horny", "base", "base", "mid")
     sna "..." ("snape_12")
     gen "*Ahem*..." ("base", xpos="far_left", ypos="head")
     sna "Would you mind?" ("snape_12")
@@ -698,7 +698,7 @@ label astoria_intro_E3:
     play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
     pause.1
     ast "" ("annoyed", "base", "base", "mid", trans=dissolve)
-    ton "Hello, Professor." ("base", "base", "base", "mid", hair="neutral", xpos="base", ypos="base", trans=dissolve)
+    ton @ hair neutral "Hello, Professor." ("base", "base", "base", "mid", xpos="base", ypos="base", trans=dissolve)
 
     ton "Astoria? What are you doing here?" ("upset", "base", "worried", "L")
     ton "You didn't cause any mischief, I hope." ("open", "narrow", "base", "L")
@@ -706,7 +706,7 @@ label astoria_intro_E3:
     ton "Wait. Is she the one who cursed Miss Bones?" ("clench", "wide", "shocked", "stare")
     ton "" ("upset", "base", "worried", "mid")
     gen "Yep." ("base", xpos="far_left", ypos="head")
-    ton "(Oh shit!)" ("horny", "base", "raised", "L", hair="horny")
+    ton @ hair horny "(Oh shit!)" ("horny", "base", "raised", "L")
 
     ast "I'm really sorry! I promise I won't ever cast it again!" ("open", "narrow", "base", "R")
     ton "Really? It was you who cast the spell?" ("grin", "base", "raised", "L")
@@ -849,8 +849,8 @@ label nt_he_astoria_E1:
     ton "Astoria Greengrass." ("open", "wide", "base", "mid")
     gen "Ah yes, the hot-headed one." ("base", xpos="far_left", ypos="head")
     ton "Yes, she's pretty cute isn't she..." ("base", "happyCl", "base", "mid")
-    ton "I wouldn't mind giving her a thorough robe inspection - if you know what I'm saying." ("horny", "base", "raised", "mid", hair="horny")
+    ton @ hair horny "I wouldn't mind giving her a thorough robe inspection - if you know what I'm saying." ("horny", "base", "raised", "mid")
-    ton "This girl...{w=0.5} she's special...{w=0.8} different..." ("open", "base", "base", "R", hair="neutral")
+    ton @ hair neutral "This girl...{w=0.5} she's special...{w=0.8} different..." ("open", "base", "base", "R")
     gen "You've got the hots for this girl?" ("base", xpos="far_left", ypos="head")
     ton "She's a Slytherin!" ("mad", "base", "raised", "mid")
     gen "People keep saying that, as if I'd know what the problem is." ("base", xpos="far_left", ypos="head")
@@ -924,7 +924,7 @@ label nt_he_astoria_E1:
     ton "It's not contagious, you numpty!" ("open", "base", "annoyed", "mid")
     ton "Have you not been paying attention? It's a family curse!" ("mad", "base", "angry", "mid")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "That being said, I'd rather have her do it with me..." ("base", "base", "raised", "R", hair="horny")
+    ton @ hair horny "That being said, I'd rather have her do it with me..." ("base", "base", "raised", "R")
     gen "Are we still talking about the \"Imperio\" thingy?" ("base", xpos="far_left", ypos="head")
     ton "Yes..." ("soft", "narrow", "raised", "downR")
     gen "So your goal is to get rid of this curse she's inherited by somehow awakening her sexuality?" ("base", xpos="far_left", ypos="head")

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
 

game/scripts/characters/cho/chitchats.rpy

@@ -93,7 +93,7 @@ label cho_chitchat:
 
             block:
                 cho "I can't believe I thought the Quidditch robes would be enough for the crowd not to notice me wearing a skirt during the last game." ("angry", "narrow", "base", "down")
-                cho "I wonder how many people saw it before Granger pointed it out..." ("soft", "narrow", "base", "down", cheeks="blush")
+                cho @ cheeks blush "I wonder how many people saw it before Granger pointed it out..." ("soft", "narrow", "base", "down")
 
             block:
                 cho "People skirting the rules in Quidditch is more common than most people think." ("open", "closed", "base", "mid")
@@ -108,7 +108,7 @@ label cho_chitchat:
         random:
             block:
                 cho "I've been getting some odd looks from other students lately." ("soft", "narrow", "base", "R")
-                cho "*Hmph*... Jealousy, no doubt." ("open", "closed", "base", "mid", cheeks="blush")
+                cho @ cheeks blush "*Hmph*... Jealousy, no doubt." ("open", "closed", "base", "mid")
 
             block:
                 cho "[name_genie_cho], can you do anything about those Slytherins?" ("angry", "closed", "base", "mid")
@@ -124,9 +124,9 @@ label cho_chitchat:
                 cho "Though, a lot of the chants do seem to involve my ass..." ("soft", "narrow", "base", "R")
 
             block:
-                cho "If it helps the team win, I don't mind debasing myself." ("open", "closed", "base", "mid", cheeks="blush")
+                cho @ cheeks blush "If it helps the team win, I don't mind debasing myself." ("open", "closed", "base", "mid")
-                cho "All the greatest sportspeople in history made sacrifices!" ("open", "closed", "base", "mid", cheeks="blush")
+                cho @ cheeks blush "All the greatest sportspeople in history made sacrifices!" ("open", "closed", "base", "mid")
-                cho "Y-- yeah, that's what I'll tell them..." ("soft", "narrow", "base", "downR", cheeks="blush")
+                cho @ cheeks blush "Y-- yeah, that's what I'll tell them..." ("soft", "narrow", "base", "downR")
 
             block:
                 cho "You know, I have this weird feeling that this Quidditch season is revolving all around me. Like I'm some sort of protagonist in a book." ("disgust", "narrow", "base", "L")
@@ -156,12 +156,12 @@ label cho_chitchat:
                 cho "Of course Madam Hooch is there setting things up for the day but she doesn't mind." ("base", "narrow", "base", "R")
 
             block:
-                cho "I wonder how many others have adopted Hooch's flying techniques after that last match." ("soft", "narrow", "base", "R", cheeks="blush")
+                cho @ cheeks blush "I wonder how many others have adopted Hooch's flying techniques after that last match." ("soft", "narrow", "base", "R")
-                cho "Hopefully they won't ban it... It is quite literally a game changer..." ("grin", "narrow", "base", "mid", cheeks="blush")
+                cho @ cheeks blush "Hopefully they won't ban it... It is quite literally a game changer..." ("grin", "narrow", "base", "mid")
 
             block:
                 cho "Madam Hooch let me keep her broom which I'm very thankful for." ("smile", "base", "base", "mid")
-                cho "Although perhaps it's time I do some personal adjustments..." ("base", "narrow", "base", "R", cheeks="blush")
+                cho @ cheeks blush "Although perhaps it's time I do some personal adjustments..." ("base", "narrow", "base", "R")
 
             block:
                 cho "People are still talking about the Ravenclaw versus Gryffindor game." ("smile", "wink", "base", "mid")
@@ -176,7 +176,7 @@ label cho_chitchat:
 
             block:
                 cho "Robes sure are useful don't you think?" ("smile", "narrow", "base", "mid")
-                cho "As long as I keep them closed I could be wearing nothing underneath and nobody would ever know..." ("smile", "narrow", "base", "R", cheeks="blush")
+                cho @ cheeks blush "As long as I keep them closed I could be wearing nothing underneath and nobody would ever know..." ("smile", "narrow", "base", "R")
 
             block:
                 cho "The Slytherin students have been a lot nicer to me lately." ("soft", "base", "base", "mid")

game/scripts/characters/cho/events/intro.rpy

@@ -210,9 +210,9 @@ label cho_intro_E1:
 
     play sound "sounds/slap_02.ogg"
     cho "{size=-5}Whore...{/size}" ("clench", "closed", "angry", "mid", trans=hpunch)
-    her "..." ("normal", "squint", "angry", "L", cheeks="blush")
+    her @ cheeks blush "..." ("normal", "squint", "angry", "L")
     cho "..." ("upset", "narrow", "base", "L")
-    her "So... What have you been discussing?{w=0.4} Anything I should know?" ("open", "squint", "base", "mid", cheeks="blush")
+    her @ cheeks blush "So... What have you been discussing?{w=0.4} Anything I should know?" ("open", "squint", "base", "mid")
     cho "Oh, it's nothing that you need to worry your pretty little head about..." ("smile", "closed", "angry", "mid")
     gen "(This could take a while...)" ("base", xpos="far_left", ypos="head")
 
@@ -249,29 +249,29 @@ label cho_intro_E1:
         with hpunch
         cho "\"Things\"?" ("angry", "narrow", "angry", "R")
         cho "Oh, miss perfect Hermione Granger.{w=0.8} Too afraid to even use the word \"tits\"..." ("open", "narrow", "angry", "R")
-        her "Well yours hardly qualify as such..." ("annoyed", "narrow", "angry", "L", cheeks="blush")
+        her @ cheeks blush "Well yours hardly qualify as such..." ("annoyed", "narrow", "angry", "L")
         cho "How dare you!" ("clench", "closed", "angry", "mid")
         cho "And so what? What's wrong with being confident about your body..." ("open", "narrow", "angry", "down")
         cho "You should try it some time... You might even get a boyfriend one day..." ("soft", "narrow", "angry", "R")
         cho "Though what do I know..." ("open", "closed", "base", "mid")
         cho "I didn't need to get my teeth shortened so I wouldn't be confused for a rabbit!" ("grin", "closed", "angry", "mid")
-        her "..." ("normal", "narrow", "angry", "down", cheeks="blush")
+        her @ cheeks blush "..." ("normal", "narrow", "angry", "down")
         cho "Not that anyone would even see them through that horribly bushy hair of yours..." ("smile", "narrow", "angry", "R")
-        her "Well, I heard that you were caught snogging someone in one of the carriages after the triwizard tournament." ("soft", "closed", "base", "mid", cheeks="blush")
+        her @ cheeks blush "Well, I heard that you were caught snogging someone in one of the carriages after the triwizard tournament." ("soft", "closed", "base", "mid")
-        her "I'm sure that will go down in the Hogwarts book of history..." ("grin", "narrow", "base", "mid", cheeks="blush")
+        her @ cheeks blush "I'm sure that will go down in the Hogwarts book of history..." ("grin", "narrow", "base", "mid")
         gen "(How naughty, didn't expect such indecent behaviour from a girl with such a cute face...)" ("grin", xpos="far_left", ypos="head")
         cho "Yeah? You ever even kissed a boy before, Granger?" ("soft", "narrow", "raised", "R")
-        her "" ("normal", "base", "worried", "R", cheeks="blush")
+        her @ cheeks blush "" ("normal", "base", "worried", "R")
         cho "And I'm talking about a real kiss, and not your daddy kissing you good night..." ("soft", "narrow", "raised", "R")
-        her "Oh...{w=0.5} Of course I have!" ("angry", "base", "worried", "R", cheeks="blush")
+        her @ cheeks blush "Oh...{w=0.5} Of course I have!" ("angry", "base", "worried", "R")
-        her "Just because I don't jump on every opportunity to glimpse random boys' wands..." ("soft", "closed", "base", "mid", cheeks="blush")
+        her @ cheeks blush "Just because I don't jump on every opportunity to glimpse random boys' wands..." ("soft", "closed", "base", "mid")
-        her "Unlike some other girls at this school..." ("normal", "narrow", "angry", "L", cheeks="blush")
+        her @ cheeks blush "Unlike some other girls at this school..." ("normal", "narrow", "angry", "L")
-        her "That doesn't mean I've never kissed anyone..." ("soft", "base", "worried", "mid", cheeks="blush")
+        her @ cheeks blush "That doesn't mean I've never kissed anyone..." ("soft", "base", "worried", "mid")
         gen "..." ("grin", xpos="far_left", ypos="head")
-        her "And I didn't need to have my breasts enlarged so that I wouldn't be confused for a boy!" ("annoyed", "narrow", "annoyed", "L", cheeks="blush")
+        her @ cheeks blush "And I didn't need to have my breasts enlarged so that I wouldn't be confused for a boy!" ("annoyed", "narrow", "annoyed", "L")
         cho "Oh yeah... Like you haven't been flaunting yours around either..." ("open", "narrow", "angry", "R")
         cho "Don't you try and act all innocent!" ("upset", "narrow", "angry", "R")
-        her "As If..." ("normal", "narrow", "annoyed", "mid", cheeks="blush")
+        her @ cheeks blush "As If..." ("normal", "narrow", "annoyed", "mid")
         cho "I wouldn't doubt that's why you're here in the first place!" ("open", "closed", "base", "mid")
         cho "To push your stupid agendas, whilst you push your breasts together at the same time." ("clench", "narrow", "angry", "L")
         gen "{size=-4}You fucking sluts!{/size}" ("angry", xpos="far_left", ypos="head")
@@ -960,17 +960,17 @@ label cho_intro_E3:
     gen "Isn't the point of a Headmaster to make sure that their students' talents aren't wasted?" ("base", xpos="far_left", ypos="head")
     cho "I suppose so, but--" ("open", "base", "base", "downR")
     gen "Well, as soon as you first stepped through that door I could tell that this girl has got what it takes to make it big." ("base", xpos="far_left", ypos="head")
-    cho "...{w} You could tell that just by looking at me?" ("angry", "narrow", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "...{w} You could tell that just by looking at me?" ("angry", "narrow", "base", "mid")
     gen "Indeed, there's no doubts about it!" ("base", xpos="far_left", ypos="head")
     gen "Or are you telling me that I'm wrong?" ("base", xpos="far_left", ypos="head")
-    cho "Of course not, but--" ("soft", "base", "base", "R", cheeks="blush")
+    cho @ cheeks blush "Of course not, but--" ("soft", "base", "base", "R")
     gen "Great!" ("grin", xpos="far_left", ypos="head")
     gen "Then I shall summon you shortly so we can further discuss this arrangement." ("grin", xpos="far_left", ypos="head")
-    cho "(Arrangement?)" ("soft", "narrow", "base", "down", cheeks="blush")
+    cho @ cheeks blush "(Arrangement?)" ("soft", "narrow", "base", "down")
     gen "That will be all for now Miss Chang, you may leave." ("grin", xpos="far_left", ypos="head")
-    cho "...{w} Alright then, sir." ("normal", "base", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "...{w} Alright then, sir." ("normal", "base", "base", "mid")
-    cho "(He could tell just by looking at me?)" ("normal", "narrow", "base", "down", cheeks="blush")
+    cho @ cheeks blush "(He could tell just by looking at me?)" ("normal", "narrow", "base", "down")
-    cho "(...)" ("soft", "narrow", "base", "R", cheeks="blush")
+    cho @ cheeks blush "(...)" ("soft", "narrow", "base", "R")
 
     # Cho leaves.
     call cho_walk(action="leave")

game/scripts/characters/cho/events/panties.rpy

@@ -12,7 +12,7 @@ label cho_panties_response_T2:
     cho "Hello, [name_genie_cho]." ("soft", "narrow", "worried", "mid", xpos="right", ypos="base")
     gen "Sup..." ("base", xpos="far_left", ypos="head")
     cho "*Uhm*..." ("annoyed", "narrow", "worried", "R")
-    cho "I forgot to take my underwear with me the last time I was here." ("soft", "narrow", "worried", "downR", cheeks="blush")
+    cho @ cheeks blush "I forgot to take my underwear with me the last time I was here." ("soft", "narrow", "worried", "downR")
 
     if states.cho.ev.panty_thief.soaked:
         gen "Your panties! Of course, [name_cho_genie]!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
@@ -105,9 +105,9 @@ label cho_panties_response_T3:
     with d3
 
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
-    cho "Hello, [name_genie_cho]." ("base", "narrow", "base", "downR", cheeks="blush", xpos="right", ypos="base")
+    cho @ cheeks blush "Hello, [name_genie_cho]." ("base", "narrow", "base", "downR", xpos="right", ypos="base")
     gen "[name_cho_genie]..." ("base", xpos="far_left", ypos="head")
-    cho "I believe I left you something of mine..." ("open", "narrow", "base", "down", cheeks="blush")
+    cho @ cheeks blush "I believe I left you something of mine..." ("open", "narrow", "base", "down")
     gen "Ah, yes... Your panties, I've got them right here." ("grin", xpos="far_left", ypos="head")
     cho "Great!" ("base", "base", "base", "mid")
     if states.cho.ev.panty_thief.soaked:
@@ -117,16 +117,16 @@ label cho_panties_response_T3:
 
         call give_reward("You hand over the panties...", "interface/icons/panties_cum.webp")
 
-        cho "(...)" ("upset", "base", "base", "down", cheeks="blush", xpos="mid", ypos="base", trans=blackfade)
+        cho @ cheeks blush "(...)" ("upset", "base", "base", "down", xpos="mid", ypos="base", trans=blackfade)
         gen "Something wrong?" ("base", xpos="far_left", ypos="head")
-        cho "You came on them didn't you?" ("mad", "narrow", "base", "downR", cheeks="blush")
+        cho @ cheeks blush "You came on them didn't you?" ("mad", "narrow", "base", "downR")
         gen "Of course, what did you think would happen when you left them here?" ("base", xpos="far_left", ypos="head")
-        cho "..." ("annoyed", "narrow", "base", "down", cheeks="blush")
+        cho @ cheeks blush "..." ("annoyed", "narrow", "base", "down")
-        cho "I suppose you're just a man after all, I would've been more shocked if you hadn't done it." ("open", "closed", "base", "mid", cheeks="blush")
+        cho @ cheeks blush "I suppose you're just a man after all, I would've been more shocked if you hadn't done it." ("open", "closed", "base", "mid")
-        cho "I'll just have to make sure to clean them before I use them next time..." ("soft", "narrow", "base", "down", cheeks="blush")
+        cho @ cheeks blush "I'll just have to make sure to clean them before I use them next time..." ("soft", "narrow", "base", "down")
         gen "Or you could put them on now..." ("base", xpos="far_left", ypos="head")
-        cho "..." ("annoyed", "base", "base", "downR", cheeks="blush")
+        cho @ cheeks blush "..." ("annoyed", "base", "base", "downR")
-        cho "*Hmm*... No, I don't think so..." ("base", "narrow", "base", "mid", cheeks="blush")
+        cho @ cheeks blush "*Hmm*... No, I don't think so..." ("base", "narrow", "base", "mid")
         gen "Worth a shot..." ("base", xpos="far_left", ypos="head")
         gen "There, take them..." ("base", xpos="far_left", ypos="head")
 

game/scripts/characters/cho/events/quidditch/gryffindor_practice.rpy

@@ -12,16 +12,16 @@ label cc_gt_start:
     cho "It's a real rule! Excessive use of elbows, otherwise known as cobbing--" ("mad", "narrow", "base", "mid")
     gen "Alright fine, no elbow touching." ("base", xpos="far_left", ypos="head")
     gen "You won't need them to turn some bums red." ("base", xpos="far_left", ypos="head")
-    cho "So that's what you meant by getting intimate? Smacking the Gryffindor's bums until they turn red?" ("disgust", "narrow", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "So that's what you meant by getting intimate? Smacking the Gryffindor's bums until they turn red?" ("disgust", "narrow", "base", "mid")
     gen "Yeah!" ("base", xpos="far_left", ypos="head")
-    cho "Isn't that a bit extreme?" ("angry", "narrow", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "Isn't that a bit extreme?" ("angry", "narrow", "base", "mid")
     gen "A good ole love tap is hardly extreme." ("base", xpos="far_left", ypos="head")
     gen "If you do it well enough, then I'm sure Miss Granger will notice." ("base", xpos="far_left", ypos="head")
-    cho "Well enough, [name_genie_cho]?" ("angry", "narrow", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "Well enough, [name_genie_cho]?" ("angry", "narrow", "base", "mid")
     gen "Yeah, make those slaps echo across the pitch!" ("base", xpos="far_left", ypos="head")
-    cho "*Hmm*... Alright then, I'll make sure of that..." ("open", "narrow", "base", "downR", cheeks="blush")
+    cho @ cheeks blush "*Hmm*... Alright then, I'll make sure of that..." ("open", "narrow", "base", "downR")
     gen "Great! Then get out there and spank some booty, [name_cho_genie]." ("base", xpos="far_left", ypos="head")
-    cho "On it, [name_genie_cho]!" ("angry", "closed", "base", "mid", cheeks="blush")
+    cho @ cheeks blush "On it, [name_genie_cho]!" ("angry", "closed", "base", "mid")
 
     # Cho leaves.
     call cho_walk(action="leave")
@@ -47,12 +47,12 @@ label cc_gt_return:
 
     gen "[name_cho_genie]!" ("base", xpos="far_left", ypos="head")
     gen "Had a fruitful day, smacking some peaches?" ("base", xpos="far_left", ypos="head")
-    cho "I did not!" ("disgust", "narrow", "angry", "mid", xpos="mid", ypos="base", cheeks="blush", trans=d3)
+    cho @ cheeks blush "I did not!" ("disgust", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=d3)
     gen "Too bad, I was so sure it would have worked." ("base", xpos="far_left", ypos="head")
-    cho "Oh it worked alright..." ("annoyed", "closed", "angry", "mid", cheeks="blush")
+    cho @ cheeks blush "Oh it worked alright..." ("annoyed", "closed", "angry", "mid")
     gen "It did?" ("base", xpos="far_left", ypos="head")
-    cho "In fact, it worked so well I'm not sure what was redder, Katie's bum, or Hermione's face..." ("angry", "narrow", "base", "R", cheeks="blush")
+    cho @ cheeks blush "In fact, it worked so well I'm not sure what was redder, Katie's bum, or Hermione's face..." ("angry", "narrow", "base", "R")
-    cho "She was fuming!" ("base", "narrow", "angry", "mid", cheeks="blush")
+    cho @ cheeks blush "She was fuming!" ("base", "narrow", "angry", "mid")
     gen "Splendid! Then what's the problem?" ("base", xpos="far_left", ypos="head")
     cho "It's my broom..." ("angry", "closed", "worried", "R") # Sad
     cho "Those bloody Weasley twins, they destroyed my broom!" ("clench", "narrow", "angry", "mid")

game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy

@@ -598,18 +598,18 @@ label hufflepuff_match:
     her "" ("base", "base", "base", "mid")
     nar "The blue grandstand shakes violently with enthusiasm."
     sna "At least try to sound like you're awake, Miss Granger." ("snape_03", ypos="head")
-    her "..." ("normal", "closed", "angry", "mid", cheeks="blush")
+    her @ cheeks blush "..." ("normal", "closed", "angry", "mid")
 
     call quidditch_stands(crowd_react=[None, None, None])
     with d3
 
-    her "And coming onto the field to face them are the equally impressive, Hufflepuff!" ("open", "base", "base", "mid", cheeks="blush")
+    her @ cheeks blush "And coming onto the field to face them are the equally impressive, Hufflepuff!" ("open", "base", "base", "mid")
     play sound "sounds/crowd_cheer2.ogg"
 
     call quidditch_stands(crowd_react=[None, None, "emo8"])
     with d3
 
-    her "" ("base", "base", "base", "mid", cheeks="blush")
+    her @ cheeks blush "" ("base", "base", "base", "mid")
     nar "The yellow grandstand bursts into a mix of applause and whistles."
     hide hermione_main
     with d3
@@ -687,8 +687,8 @@ label hufflepuff_match:
     call quidditch_stands(crowd_react=[None, None, None])
     with d3
     play background "sounds/crowd_low.ogg" fadein 0.5 fadeout 0.5
-    her "Now then..." ("open", "closed", "base", "mid", cheeks="blush", flip=True, xpos=290, ypos="base", trans=d3)
+    her @ cheeks blush "Now then..." ("open", "closed", "base", "mid", flip=True, xpos=290, ypos="base", trans=d3)
-    her "Let's begin!" ("base", "happy", "base", "mid_soft", cheeks="blush")
+    her @ cheeks blush "Let's begin!" ("base", "happy", "base", "mid_soft")
     hide hermione_main
     with d3
     pause .1
@@ -721,12 +721,12 @@ label hufflepuff_match:
 
     call ctc
 
-    her "" ("open", "wide", "worried", "shocked", cheeks="blush")
+    her @ cheeks blush "" ("open", "wide", "worried", "shocked")
     qcr "!!!" # [screenshake?]
     play background "sounds/crowd.ogg" fadein 2
     mal "..."
     play sound "sounds/murmur.ogg"
-    her "" ("open", "happyCl", "base", "mid", cheeks="blush")
+    her @ cheeks blush "" ("open", "happyCl", "base", "mid")
     mal "She totally is!"
     play sound "sounds/giggle2_loud.ogg"
     hide hermione_main
@@ -745,7 +745,7 @@ label hufflepuff_match:
 
     her "Professor, why won't you say something?{w=0.8} She's clearly breaking the very basics of Quidditch rules!" ("clench", "narrow", "angry", "mid", ypos="head", flip=False)
     gen "I fail to see anything wrong with the way she's dressed." ("base", xpos="far_left", ypos="head")
-    her "But... she's wearing a skirt!" ("clench", "wide", "base", "stare", cheeks="blush")
+    her @ cheeks blush "But... she's wearing a skirt!" ("clench", "wide", "base", "stare")
     her "Surely that must be against some kind of regulation..." ("annoyed", "narrow", "angry", "mid")
     gen "You tell me Miss Granger, you've got the rulebook right there..." ("base", xpos="far_left", ypos="head")
     sna "..." ("snape_13", ypos="head")
@@ -986,7 +986,7 @@ label hufflepuff_match:
     #cho "{size=+10}!!!{/size}" ("clench", "closed", "angry", "mid")
     hide hermione_main
     with d3
-    cho "" ("normal", "wide", "base", "L", cheeks="heavy_blush")
+    cho @ cheeks heavy_blush "" ("normal", "wide", "base", "L")
 
     play background "sounds/crowd.ogg" fadein 1 fadeout 1
     play sound "sounds/crowd_applause.ogg"
@@ -996,9 +996,9 @@ label hufflepuff_match:
     with d3
     call ctc
 
-    cho "" ("quiver", "base", "worried", "downR", cheeks="blush")
+    cho @ cheeks blush "" ("quiver", "base", "worried", "downR")
     nar "Hermione's commentating is drowned out by the sound of the Ravenclaw grandstand cheering."
-    cho "{size=+6}You are done, Granger!{/size}" ("scream", "closed", "angry", "L", cheeks="blush")
+    cho @ cheeks blush "{size=+6}You are done, Granger!{/size}" ("scream", "closed", "angry", "L")
     hide cho_main
     with d3
     pause .1
@@ -1110,12 +1110,12 @@ label hufflepuff_match_return:
     cho "I can't believe that we've broken our six year dry streak and won a real game!" ("smile", "happyCl", "base", "mid")
     cho "We could actually win the cup!" ("open", "wide", "base", "mid")
     gen "And you weren't embarrassed?" ("base", xpos="far_left", ypos="head")
-    cho "I was a little at the start of the game..." ("quiver", "narrow", "worried", "downR", cheeks="blush")
+    cho @ cheeks blush "I was a little at the start of the game..." ("quiver", "narrow", "worried", "downR")
     cho "But once I realised how much it was affecting those slack-jawed Hufflepuffs..." ("smile", "narrow", "angry", "R")
     cho "It was like having my own personal weapon of mass distraction!" ("smile", "wide", "angry", "mid")
-    cho "I don't think Cedric even knew where the snitch was, most of the time!" ("horny", "base", "base", "downR", cheeks="blush")
+    cho @ cheeks blush "I don't think Cedric even knew where the snitch was, most of the time!" ("horny", "base", "base", "downR")
-    cho "All he seemed to do was follow me around..." ("horny", "narrow", "worried", "down", cheeks="blush")
+    cho @ cheeks blush "All he seemed to do was follow me around..." ("horny", "narrow", "worried", "down")
-    cho "Him {size=-2}and {size=-2}half {size=-2}the {size=-2}team...{/size}{/size}{/size}{/size}" ("quiver", "narrow", "worried", "downR", cheeks="heavy_blush")
+    cho @ cheeks heavy_blush "Him {size=-2}and {size=-2}half {size=-2}the {size=-2}team...{/size}{/size}{/size}{/size}" ("quiver", "narrow", "worried", "downR")
     cho "This might be the first real chance Ravenclaw has ever had to win the cup." ("open", "closed", "worried", "mid")
     gen "I'm sure this must mean a lot to you..." ("base", xpos="far_left", ypos="head")
     cho "It does... I might even get picked up by a pro team!" ("smile", "base", "base", "mid")

game/scripts/characters/cho/events/quidditch/hufflepuff_practice.rpy

@@ -165,11 +165,11 @@ label cc_ht_talk:
         gen "(Oh right... I didn't discuss our new tactic with her yet.)" ("base", xpos="far_left", ypos="head")
     elif states.cho.level < 3: # Has Cho enough confidence?
         gen "So, how about those tactics?" ("base", xpos="far_left", ypos="head")
-        cho "I don't know if I can do...{w=0.4} That..." ("disgust", "narrow", "base", "mid", cheeks="blush")
+        cho @ cheeks blush "I don't know if I can do...{w=0.4} That..." ("disgust", "narrow", "base", "mid")
         gen "What do you mean you can't? It's the perfect strategy!" ("base", xpos="far_left", ypos="head")
-        cho "But..." ("soft", "base", "base", "down", cheeks="blush")
+        cho @ cheeks blush "But..." ("soft", "base", "base", "down")
         gen "Where's your confidence, your spirit?" ("base", xpos="far_left", ypos="head")
-        cho "I'm sorry, [name_genie_cho], forget I said anything..." ("open", "happyCl", "base", "mid", cheeks="blush")
+        cho @ cheeks blush "I'm sorry, [name_genie_cho], forget I said anything..." ("open", "happyCl", "base", "mid")
         gen "(*Hmm*... She doesn't look very confident to me...)" ("base", xpos="far_left", ypos="head")
         gen "(Perhaps I should train her more in private.)" ("base", xpos="far_left", ypos="head")
     else: