Refactoring Tonks dynamic hair

* Converted hair parameter assignment to temporary attribute
* Fixed Tonks' hair remaining stuck in a temporary colour
* Unified character parameters

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")
@@ -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/cho/events/quidditch/intros.rpy

@@ -823,8 +823,8 @@ label cho_quid_E8:
     gen "Yes, the little Ravenclaw minx, correct." ("base", xpos="far_left", ypos="head")
     ton "Well, I figured you'd be talking about her - if it has to do with Quidditch." ("open", "base", "base", "R")
     gen "She's one of the girls I buy favours from." ("base", xpos="far_left", ypos="head")
-    ton "No way!" ("open_wide", "shocked", "shocked", "mid", hair="horny")
+    ton @ hair horny "No way!" ("open_wide", "shocked", "shocked", "mid")
-    ton "You got that little hotty--" ("horny", "base", "raised", "R", hair="horny")
+    ton @ hair horny "You got that little hotty--" ("horny", "base", "raised", "R")
     ton "*Ehm*... hot-head to sell you favours?" ("mad", "base", "raised", "R")
     gen "Once or twice..." ("base", xpos="far_left", ypos="head")
     ton "Impressive." ("horny", "base", "raised", "mid")
@@ -836,11 +836,11 @@ label cho_quid_E8:
             gen "She's been stripping for me." ("base", xpos="far_left", ypos="head")
             ton "Cho?! And I'm supposed to believe that?" ("upset", "wide", "raised", "mid")
             gen "Oh, you better believe it!" ("grin", xpos="far_left", ypos="head")
-            ton "Holy shit!" ("upset", "wide", "shocked", "stare", hair="horny")
+            ton @ hair horny "Holy shit!" ("upset", "wide", "shocked", "stare")
             ton "I'd pay so much gold to watch that girl take her clothes off..." ("base", "base", "raised", "R")
-            ton "You need to invite me next time!" ("annoyed", "base", "angry", "mid", hair="angry") # angry
+            ton @ hair angry "You need to invite me next time!" ("annoyed", "base", "angry", "mid") # angry
             gen "And how would I get her to agree to that?" ("base", xpos="far_left", ypos="head")
-            ton "Well... *Ehm*..." ("upset", "base", "worried", "down", hair="horny")
+            ton @ hair horny "Well... *Ehm*..." ("upset", "base", "worried", "down")
             gen "It was difficult enough to get her to strip just for me..." ("base", xpos="far_left", ypos="head")
             gen "She only did it because I helped her win against Hufflepuff." ("base", xpos="far_left", ypos="head")
             ton "So that was your idea with the skirt? Very clever." ("horny", "base", "annoyed", "mid")
@@ -857,7 +857,7 @@ label cho_quid_E8:
             gen "Miss Chang wouldn't like anybody to know." ("base", xpos="far_left", ypos="head")
             ton "I can keep a secret!" ("upset", "base", "worried", "R")
             gen "I really shouldn't..." ("base", xpos="far_left", ypos="head")
-            ton "Tell me, or I'll jinx your balls off!" ("upset", "base", "angry", "mid", hair="angry")
+            ton @ hair angry "Tell me, or I'll jinx your balls off!" ("upset", "base", "angry", "mid")
             gen "*Ghzzz!* Alright! Alright!" ("angry", xpos="far_left", ypos="head")
             gen "You sure know how to get me to talk..." ("base", xpos="far_left", ypos="head")
 
@@ -937,7 +937,7 @@ label cho_quid_E8:
     with hpunch
     play sound "sounds/hiccup_fem.ogg"
     ton "*Hick*!... whoopsie..." ("upset", "wide", "base", "mid")
-    ton "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R", hair="horny")
+    ton @ hair horny "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R")
 
     if game.daytime:
         nar "You finish your drinks before calling it a day."

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

@@ -129,8 +129,8 @@ label slytherin_match:
     ton "I'd love to be able to watch her--{w} The game from the commentator booth." ("clench", "narrow", "raised", "R")
     ton "So... *Ahem*... May I be allowed to accompany you on the way to the pitch?" ("base", "base", "base", "mid") #sad
     gen "Of course! I'd be delighted to have you!" ("grin", xpos="far_left", ypos="head")
-    ton "Thank you, [name_genie_tonks].{heart}" ("base", "happyCl", "base", "mid", hair="happy")
+    ton @ hair happy "Thank you, [name_genie_tonks].{heart}" ("base", "happyCl", "base", "mid")
-    ton "Are we to expect another great performance this time around?" ("horny", "narrow", "base", "downR", hair="neutral")
+    ton @ hair neutral "Are we to expect another great performance this time around?" ("horny", "narrow", "base", "downR")
     gen "Oh, you'll see..." ("grin", xpos="far_left", ypos="head")
     ton "Great, shall we?" ("base", "wink", "shocked", "mid")
     gen "We certainly shall!" ("grin", xpos="far_left", ypos="head")
@@ -401,12 +401,12 @@ label slytherin_match:
 
     ton "{size=-4}Do I hear some jealousy back there?{/size}" ("grin", "narrow", "raised", "R", ypos="head", flip=True)
     sna "{size=-4}Of course not... just a cough,{w=0.3} {cps=15}Nymphadora{/cps}.{/size}" ("snape_03", ypos="head")
-    ton "{size=-2}That's Tonks to you...{w=0.3} {i}dungeon dweller.{/i}{/size}" ("open", "wide", "angry", "R", hair="angry")
+    ton @ hair angry "{size=-2}That's Tonks to you...{w=0.3} {i}dungeon dweller.{/i}{/size}" ("open", "wide", "angry", "R")
     sna "Dungeon dw--" ("snape_32", ypos="head")
     sna "I'll give you a dungeon dweller in a minute you--" ("snape_08", ypos="head")
 
     her "Professor Tonks, your hair!" ("soft", "base", "base", "L", ypos="head", flip=False)
-    ton "Whoopsie...{w=0.5} Miss Granger, so glad to see you!" ("base", "happyCl", "base", "L", hair="neutral", ypos="head", flip=True)
+    ton @ hair neutral "Whoopsie...{w=0.5} Miss Granger, so glad to see you!" ("base", "happyCl", "base", "L", ypos="head", flip=True)
     sna "{size=-2}*Hmph*{/size}" ("snape_31", ypos="head")
     her "Of course, as you know I take my responsibilities seriously!" ("open", "base", "angry", "L")
 
@@ -552,7 +552,7 @@ label slytherin_match:
     her "Oh! Davies catches it and passes to Bradley..." ("smile", "base", "angry", "up")
     ton "She's pretty cute when she's excited, isn't she." ("soft", "narrow", "base", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "I feel like we've got the best seats in the house, right behind the podium..." ("horny", "narrow", "raised", "L", hair="horny")
+    ton @ hair horny "I feel like we've got the best seats in the house, right behind the podium..." ("horny", "narrow", "raised", "L")
     her "" ("open", "base", "angry", "up")
     ton "Who cares about the match if you've got a view like that..." ("horny", "base", "angry", "L")
     play sound "sounds/ball_hit.ogg"
@@ -606,7 +606,7 @@ label slytherin_match:
     sna "That's my boys!" ("snape_37")
     sna "Thick as oatmeal, but built like a brick shithouse." ("snape_28")
     play sound "sounds/ball_hit.ogg"
-    ton "They're so strong... I've never seen a bludger hit its target from that far before..." ("horny", "base", "base", "up", hair="horny") #horny
+    ton @ hair horny "They're so strong... I've never seen a bludger hit its target from that far before..." ("horny", "base", "base", "up") #horny
     ton @ cheeks blush "Is it me or is it getting a bit hot in here?" ("normal", "closed", "raised", "downR")
     sna "Something to cool you down perhaps?" ("snape_02")
     ton "Good idea, did you bring any of that firewhisky, Professor Dumbledore?" ("soft", "wink", "raised", "mid")
@@ -620,8 +620,8 @@ label slytherin_match:
     nar "Tonks' cheeks turning redder as the game continues."
     her "" ("annoyed", "base", "base", "up")
     gen "Doesn't look great..." ("base", xpos="far_left", ypos="head")
-    ton "What do you mean?" ("open", "base", "base", "L", hair="horny")
+    ton @ hair horny "What do you mean?" ("open", "base", "base", "L")
-    ton "Only thing that would make this better would be those firm cheeks on my lap!" ("horny", "narrow", "annoyed", "L", hair="horny")
+    ton @ hair horny "Only thing that would make this better would be those firm cheeks on my lap!" ("horny", "narrow", "annoyed", "L")
     sna "He's talking about the game..." ("snape_09")
     ton "Game? What game..." ("open", "wide", "raised", "L")
     ton "Oh, Quidditch! Of course!" ("clench", "wide", "base", "mid")
@@ -696,12 +696,12 @@ label slytherin_match:
 
     sna "I'm surprised she didn't swallow that one... with how wide she was blabbing her mouth." ("snape_42", ypos="head")
     sna "To think that liquid luck--" ("snape_45")
-    ton @ cheeks blush "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", hair="neutral", ypos="head", flip=True, trans=vpunch)
+    ton @ cheeks blush hair neutral "{size=+5}What?{/size}" ("scream", "shocked", "base", "stare", ypos="head", flip=True, trans=vpunch)
     gen "What the fuck is liquid luck?" ("angry", xpos="far_left", ypos="head")
-    ton @ cheeks blush "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L", hair="angry")
+    ton @ cheeks blush hair angry "You gave those brutes a luck potion?!" ("mad", "base", "angry", "L")
     sna "Well..." ("snape_14")
     ton @ cheeks blush "I can't believe you, Snape...{w=0.5} look what they've done to her face!" ("mad", "base", "worried", "down")
-    ton @ cheeks blush "Her beautiful face..." ("upset", "base", "worried", "down", hair="sad")
+    ton @ cheeks blush hair sad "Her beautiful face..." ("upset", "base", "worried", "down")
     sna "Looks like an improvement to me." ("snape_46")
 
     menu:
@@ -715,7 +715,7 @@ label slytherin_match:
             gen "So yes, I think you owe me." ("base", xpos="far_left", ypos="head")
             sna "Surely you can't be--" ("snape_14")
         "\"10 points to Gryffindor!\"":
-            ton "Are you mad?" ("scream", "base", "angry", "R", hair="angry")
+            ton @ hair angry "Are you mad?" ("scream", "base", "angry", "R")
             gen "What? I'm just joking, I'm sure she'll be fine..." ("base", xpos="far_left", ypos="head")
             sna "{size=-4}10 points to Slytherin.{/size}" ("snape_38")
             gen "Did you say something--" ("base", xpos="far_left", ypos="head")
@@ -723,9 +723,9 @@ label slytherin_match:
             $ slytherin += 10
 
 
-    ton "Quiet!" ("mad", "base", "angry", "L", hair="angry")
+    ton @ hair angry "Quiet!" ("mad", "base", "angry", "L")
     gen "..." ("base", xpos="far_left", ypos="head")
-    ton "I'm taking her to the hospital wing..." ("open", "base", "angry", "down", hair="neutral")
+    ton @ hair neutral "I'm taking her to the hospital wing..." ("open", "base", "angry", "down")
     gen "What about the game...?" ("base", xpos="far_left", ypos="head")
     ton "Leave it to me..." ("open", "base", "angry", "mid")
     gen "What?" ("angry", xpos="far_left", ypos="head")

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

@@ -1035,7 +1035,7 @@ label nt_he_hermione_E1:
         gen "Not yet." ("base", xpos="far_left", ypos="head")
         ton "Why you better let him know then... I wouldn't want to step on any toes..." ("annoyed", "base", "raised", "down") # looks down
         nar "Tonks moves her gaze towards your feet."
-        ton "Unless that's something you're into..." ("horny", "narrow", "base", "mid", hair="horny") # looks at Genie
+        ton @ hair horny "Unless that's something you're into..." ("horny", "narrow", "base", "mid") # looks at Genie
         play sound "sounds/gulp.ogg"#Genie gulps
         gen "..." ("angry", xpos="far_left", ypos="head")
         if game.daytime:
@@ -1067,7 +1067,7 @@ label nt_he_hermione_E1:
     gen "That would indeed be very helpful. She's stubborn in that regard." ("base", xpos="far_left", ypos="head")
     ton "You don't have to tell me. She's been lecturing me about those \"sexual favours\" since the very day I got here..." ("upset", "base", "base", "R")
     ton "But I shouldn't complain about that..." ("open", "closed", "base", "mid")
-    ton "Hearing those naughty words spill out of her gorgeous little mouth really gets me going!" ("soft", "narrow", "base", "R", hair="horny")
+    ton @ hair horny "Hearing those naughty words spill out of her gorgeous little mouth really gets me going!" ("soft", "narrow", "base", "R")
     gen "I can imagine so." ("grin", xpos="far_left", ypos="head")
     ton "When she describes all the wrongdoings of those \"filthy Slytherin girls\"..." ("soft", "base", "shocked", "stare")
     ton "How could I possibly get tired of that!" ("crooked_smile", "narrow", "base", "stare")

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

@@ -408,7 +408,7 @@ label luna_intro_E1:
     gen "Yes, Miss Tonks. What in the great desert sands are you wearing?" ("angry", xpos="far_left", ypos="head")
     gen "Is this a school or a brothel?" ("grin", xpos="far_left", ypos="head")
 
-    ton "It's my nightgown... You don't like it?" ("horny", "narrow", "raised", "L", hair="horny") # Flirtatious
+    ton @ hair horny "It's my nightgown... You don't like it?" ("horny", "narrow", "raised", "L") # Flirtatious
     # Fun option
     menu:
 
@@ -420,9 +420,9 @@ label luna_intro_E1:
 
     her @ cheeks blush "Professor!" ("mad", "base", "base", "mid")
     her @ cheeks blush "How could you say such a thing!?" ("open", "happyCl", "base", "mid")
-    ton "Yes... Such a rude thing to say to your staff. {heart}" ("soft", "narrow", "annoyed", "mid", hair="horny")
+    ton @ hair horny "Yes... Such a rude thing to say to your staff. {heart}" ("soft", "narrow", "annoyed", "mid")
     gen "I'm a man of simple truths, I'm only stating the obvious." ("base", xpos="far_left", ypos="head")
-    ton "So my current attire is too slutty for you, *huh*?" ("base", "narrow", "base", "L", hair="horny")
+    ton @ hair horny "So my current attire is too slutty for you, *huh*?" ("base", "narrow", "base", "L")
     gen "I didn't say that, Miss Tonks..." ("grin", xpos="far_left", ypos="head")
     gen "I said you look like a slut... There's a difference." ("grin", xpos="far_left", ypos="head")
     her @ cheeks blush "What if a student saw you professor?! You can't walk around the castle wearing... This!" ("angry", "narrow", "base", "down")
@@ -449,7 +449,7 @@ label luna_intro_E1:
     #Tonks walks to the door
 
     lun "But I'm not tired mummy..." ("annoyed", "closed", "base", "mid", trans=dissolve)
-    ton @ cheeks blush "..." ("disgust", "shocked", "base", "mid", hair="horny") #wide eyed
+    ton @ cheeks blush hair horny "..." ("disgust", "shocked", "base", "mid") #wide eyed
     gen "What a weirdo..." ("base", xpos="far_left", ypos="head")
     ton "Just...{w=0.4} be a good girl and follow me back to bed..." ("upset", "narrow", "worried", "L")
     lun "Yes, mummy..." ("base", "closed", "base", "mid")

game/scripts/characters/tonks/common.rpy

@@ -40,7 +40,7 @@ define character.tonks_say = Character("name_tonks_genie", show_icon="tonks", dy
 
 init python:
     def ton(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, hair=None, **kwargs):
+    emote=None, face=None, xpos=None, ypos=None, pos=None, flip=None, trans=None, animation=False, **kwargs):
 
         def show():
             tonks.show()
@@ -50,6 +50,7 @@ init python:
 
         face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
         temp_face = renpy.game.context().temporary_attributes
+        temp_hair = None
         redraw = False
         tag = tonks.tag
         layer = tonks.layer
@@ -70,23 +71,21 @@ init python:
             last_face = tonks.get_face()
 
             d = dict(zip(temp_face[::2], temp_face[1::2]))
+            temp_hair = d.pop("hair", None)
+
             tonks.set_face(**d)
             redraw = True
 
+        if temp_hair:
+            last_hair = tonks.get_equipped("hair").color
+            col = tonks_haircolor_table.get(temp_hair)
+            tonks.get_equipped("hair").set_color(col)
+            redraw = True
+
         if emote:
             tonks.set_emote(emote)
             redraw = True
 
-        if hair:
-            if isinstance(hair, list):
-                target_color = hair
-            else:
-                target_color = tonks_haircolor_table.get(hair, tonks_haircolor)
-
-            if target_color != tonks.get_equipped("hair").color:
-                tonks.get_equipped("hair").set_color(target_color)
-                redraw = True
-
         if animation != False:
             tonks.animation = animation
             redraw = True
@@ -104,5 +103,8 @@ init python:
         if temp_face:
             tonks.set_face(**last_face)
 
+        if temp_hair:
+            tonks.get_equipped("hair").set_color(last_hair)
+
         if head_only:
             tonks.hide()

game/scripts/characters/tonks/events/hangout.rpy

@@ -676,7 +676,7 @@ label nt_he_story_centaur: # Not in use.
     ton "It's by far the simplest way to calm down a group of wild centaurs..." ("open", "base", "worried", "R")
     ton "As far as I could tell, they didn't have any females within their group..." ("open", "base", "base", "mid")
     ton "You can imagine the amount of tension that gets built up as a result of that..." ("mad", "base", "base", "mid")
-    ton "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao", hair="horny") # ahegao
+    ton @ hair horny "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao") # ahegao
     gen "So your idea was to jerk them off?" ("base", xpos="far_left", ypos="head")
 
     ton "Well, yes.{w} They can't easily reach around to do it themselves now, can they?" ("horny", "base", "base", "mid")
@@ -684,12 +684,12 @@ label nt_he_story_centaur: # Not in use.
 
     gen "Must have been a real...{w}*argh*!- relief for them!" ("angry", xpos="far_left", ypos="head")
     ton "I believe so too, Sir." ("base", "base", "base", "mid")
-    ton "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid", hair="horny")
+    ton @ hair horny "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid")
     gen "*Agh!* Fuck! I'm getting close..." ("angry", xpos="far_left", ypos="head")
     ton "Most of the Ministry view Centaurs as \"lesser\" beings... As animals." ("open", "base", "base", "R")
     ton "But not me. To me they're all powerful, and magnificent creatures." ("base", "base", "angry", "mid")
     ton "And it's known that above all they embody strength, dominance, and lust..." ("open", "base", "base", "mid")
-    ton "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao", hair="horny") # Ahegao
+    ton @ hair horny "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao") # Ahegao
 
     #Genie cums
     stop music fadeout 1.0
@@ -700,7 +700,7 @@ label nt_he_story_centaur: # Not in use.
     with d3
     pause 1
 
-    ton "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R", hair="horny")
+    ton @ hair horny "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R")
 
     call cum_block
     gen "*Argh* You horse-cock-loving whore!" ("base", xpos="far_left", ypos="head")
@@ -709,8 +709,8 @@ label nt_he_story_centaur: # Not in use.
     call cum_block
     gen "You dirty slut!" ("angry", xpos="far_left", ypos="head")
 
-    ton "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L", hair="horny")
+    ton @ hair horny "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L")
-    ton "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao", hair="horny")
+    ton @ hair horny "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao")
 
     call hide_characters
     hide screen bld1
@@ -724,7 +724,7 @@ label nt_he_story_centaur: # Not in use.
     gen "(Fuck me, that felt great!)" ("angry", xpos="far_left", ypos="head")
 
     ton "A remarkable wizard such as yourself would never even consider solutions of such..." ("open", "base", "base", "mid")
-    ton "Depravity..." ("horny", "base", "base", "R", hair="horny")
+    ton @ hair horny "Depravity..." ("horny", "base", "base", "R")
     gen "Are you asking me whether or not I'd jerk of a Centaur?..." ("base", xpos="far_left", ypos="head")
     gen "Because that would be a clear \"no\" from me..." ("base", xpos="far_left", ypos="head")
 

game/scripts/characters/tonks/events/requests/detention_with_tonks.rpy

@@ -53,7 +53,7 @@ label nt_pr_teach_start:
             $ gryffindor += 10
             gen "So as far as I'm concerned, hand out as many as you want." ("base", xpos="far_left", ypos="head")
             ton "All right... Well, I better get to class." ("base", "base", "base", "R")
-            ton "I've got some boys to \"teach\"..." ("horny", "narrow", "raised", "mid", hair="neutral")
+            ton @ hair neutral "I've got some boys to \"teach\"..." ("horny", "narrow", "raised", "mid")
             gen "Don't forget to come back here after classes to fill me in." ("base", xpos="far_left", ypos="head")
             ton "Will do..." ("base", "happyCl", "base", "mid")
 
@@ -559,7 +559,7 @@ label nt_pr_teach_T2_E2: # Tier 2 - Event 2 - Ravenclaw boy
     ton "So I told him I didn't {b}just{/b} want to look at it..." ("soft", "narrow", "shocked", "mid")
     ton "But watch him play with it..." ("horny", "narrow", "annoyed", "mid")
     gen "Make him an offer he can't refuse..." ("base", xpos="far_left", ypos="head")
-    ton "His eyes truly lit up after that..." ("base", "happyCl", "base", "mid", hair="horny")
+    ton @ hair horny "His eyes truly lit up after that..." ("base", "happyCl", "base", "mid")
     ton "He just kept on staring at me, while he started stroking it..." ("horny", "narrow", "base", "mid")
     ton "Getting it hard for his teacher..." ("horny", "base", "base", "ahegao")
     ton "*Mmmm*... The way he was staring at my tits... with such hunger..." ("soft", "closed", "shocked", "mid")
@@ -716,7 +716,7 @@ label nt_pr_teach_T2_E4: # Tier 2 - Event 4 - Slytherin girl
     ton "I was expecting her to at least argue at least a bit about the amount of points she would receive for it..." ("open", "base", "base", "R")
     ton "But she dropped them in an instant, without even hearing my offer." ("horny", "base", "annoyed", "mid")
     ton "Next, she just looked at me as if to ask, \"what next\"?" ("open", "base", "base", "mid")
-    ton "*Ugh*... It was so fucking hot..." ("soft", "base", "base", "stare", hair="horny")
+    ton @ hair horny "*Ugh*... It was so fucking hot..." ("soft", "base", "base", "stare")
     gen "And?... What did happen \"next\"?" ("grin", xpos="far_left", ypos="head")
     ton "I had her play with herself..." ("grin", "closed", "shocked", "mid")
     ton @ cheeks blush "But... that cute face of hers... and all the teasing..." ("open", "closed", "shocked", "R")

game/scripts/characters/tonks/events/requests/hands-on_lessons.rpy

@@ -109,9 +109,9 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
     ton "He didn't want to say it at first..." ("soft", "narrow", "base", "mid")
     ton "So I leaned in closer...{w} Let him feel my breath on his neck..." ("base", "closed", "annoyed", "mid")
     ton "And then I whispered the truth into his ear..." ("soft", "narrow", "annoyed", "stare")
-    ton "That he's a dirty little \"tit addict\"!" ("crooked_smile", "base", "angry", "up", hair="neutral")
+    ton @ hair neutral "That he's a dirty little \"tit addict\"!" ("crooked_smile", "base", "angry", "up")
     gen "You naughty girl!" ("grin", xpos="far_left", ypos="head")
-    ton "*Ugh*... He went redder than a tomato when I said that." ("horny", "closed", "base", "mid", hair="horny")
+    ton @ hair horny "*Ugh*... He went redder than a tomato when I said that." ("horny", "closed", "base", "mid")
     ton "And as both you and I know there's only one cure for that..." ("open", "closed", "base", "mid")
     ton "So I grabbed his wrist and forced it up to my chest!" ("open", "closed", "annoyed", "mid")
     gen "Just like that?" ("base", xpos="far_left", ypos="head")
@@ -123,7 +123,7 @@ label nt_pr_grope_T1_E1: # Tier 1 - Event 1 - Slytherin boy
     ton "All I know is that he wasn't afraid to give it a go." ("grin", "happyCl", "base", "mid")
     gen "I gather that he enjoyed himself?" ("base", xpos="far_left", ypos="head")
     ton "He just sat there, silently groping my tits for several minutes..." ("soft", "narrow", "shocked", "down")
-    ton "*Ugh*... It took everything I had not to hold him down and jump his bone..." ("horny", "base", "base", "up", hair="horny")
+    ton @ hair horny "*Ugh*... It took everything I had not to hold him down and jump his bone..." ("horny", "base", "base", "up")
     gen "[name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
     ton "Right, well after letting him play with them for a little while, I sent him back to class." ("mad", "narrow", "base", "down")
     gen "Think you'll gain any reputation from this encounter?" ("base", xpos="far_left", ypos="head")

game/scripts/characters/tonks/events/requests/oral_practice.rpy

@@ -39,7 +39,7 @@ label nt_pr_kiss_start:
         else:
 
             gen "Fancy another student-snog-session?" ("base", xpos="far_left", ypos="head")
-            ton "*Mmmm*... You bet... Teaching is my job..." ("horny", "base", "base", "R", hair="horny")
+            ton @ hair horny "*Mmmm*... You bet... Teaching is my job..." ("horny", "base", "base", "R")
             ton "Even if that lesson is \"French Kissing\"..." ("soft", "wink", "shocked", "mid")
             gen "Well, don't let me stop you." ("base", xpos="far_left", ypos="head")
             ton "Thank you, sir..." ("grin", "base", "base", "mid")
@@ -56,7 +56,7 @@ label nt_pr_kiss_start:
         else: # Repeat
 
             gen "How would you feel about French kissing your students again?" ("base", xpos="far_left", ypos="head")
-            ton "*Mmmm*... Pretty good if the last few times are anything to go by..." ("horny", "base", "base", "R", hair="horny")
+            ton @ hair horny "*Mmmm*... Pretty good if the last few times are anything to go by..." ("horny", "base", "base", "R")
             ton "I'll see you after class..." ("base", "base", "angry", "mid")
 
     # Tonks leaves
@@ -195,15 +195,15 @@ label nt_pr_kiss_T1_E2: # Tier 1 - Event 2 - Ravenclaw boy
     ton "Great! That kiss must have awoken something in him..." ("crooked_smile", "base", "shocked", "mid")
     ton "He really got into it after a while..." ("base", "happyCl", "base", "mid")
     ton "*Ugh*!... I've never had someone attack me with their tongue like that..." ("horny", "base", "base", "up")
-    ton "It was intense! And neither of us wanted it to end..." ("soft", "base", "shocked", "ahegao", hair="horny")
+    ton @ hair horny "It was intense! And neither of us wanted it to end..." ("soft", "base", "shocked", "ahegao")
     gen "Is that why you were late today?" ("grin", xpos="far_left", ypos="head")
     ton "*Hmm*... Can you blame me?" ("crooked_smile", "base", "base", "up")
     gen "So you spent all afternoon French kissing one of your students?" ("grin", xpos="far_left", ypos="head")
     ton "Yes, [name_genie_tonks]..." ("soft", "closed", "base", "mid")
-    ton "I guess I fucking did!" ("crooked_smile", "base", "shocked", "mid", hair="neutral")
+    ton @ hair neutral "I guess I fucking did!" ("crooked_smile", "base", "shocked", "mid")
     gen "I'm very proud!" ("grin", xpos="far_left", ypos="head")
     gen "Great work, [name_tonks_genie]." ("base", xpos="far_left", ypos="head")
-    ton "..." ("crooked_smile", "base", "base", "up", hair="horny")
+    ton @ hair horny "..." ("crooked_smile", "base", "base", "up")
     ton "Thank you, [name_genie_tonks]. Have a good night." ("base", "wink", "base", "mid")
 
     # Tonks leaves.
@@ -264,9 +264,9 @@ label nt_pr_kiss_T1_E3: # Tier 1 - Event 3 - Slytherin girls
     ton "Maybe not even each other..." ("base", "narrow", "annoyed", "mid")
     gen "Ought to be young again..." ("base", xpos="far_left", ypos="head")
     ton "I couldn't help myself, [name_genie_tonks]!" ("crooked_smile", "base", "base", "stare")
-    ton "I simply {b}had{/b} to play around while they did it..." ("horny", "happyCl", "shocked", "mid", hair="horny")
+    ton @ hair horny "I simply {b}had{/b} to play around while they did it..." ("horny", "happyCl", "shocked", "mid")
     gen "Did they care?" ("base", xpos="far_left", ypos="head")
-    ton "Not one bit!" ("horny", "base", "base", "down", hair="horny")
+    ton @ hair horny "Not one bit!" ("horny", "base", "base", "down")
     ton "They'd just take it in waves..." ("soft", "base", "base", "L")
     ton @ cheeks blush "Making out... Calling me a pervert..." ("horny", "base", "base", "up")
     ton @ cheeks blush "Locking their mouths together, only to break apart again to tease me  more..." ("base", "base", "base", "ahegao")
@@ -347,7 +347,7 @@ label nt_pr_kiss_T1_E4: #Level 1 Event 4
     ton "I just softly cradled her head - and spent the next five minutes teaching her how to \"french\"..." ("soft", "base", "shocked", "up")
     ton "They can't offer you an experience like that at the Ministry!" ("grin", "wink", "base", "mid")
     gen "Consider yourself lucky then." ("grin", xpos="far_left", ypos="head")
-    ton "Oh, I do!{w} Believe me!" ("crooked_smile", "closed", "shocked", "mid", hair="horny")
+    ton @ hair horny "Oh, I do!{w} Believe me!" ("crooked_smile", "closed", "shocked", "mid")
     gen "That shall be all for now..." ("base", xpos="far_left", ypos="head")
     ton "Thank you, [name_genie_tonks]." ("soft", "narrow", "base", "mid")
 

game/scripts/characters/tonks/talk.rpy

@@ -90,7 +90,7 @@ label tonks_talk:
                     ton "Of course." ("base", "base", "base", "mid")
                     gen "Sweet." ("grin", xpos="far_left", ypos="head")
                     ton "Will I get my three wishes too?" ("open", "base", "base", "mid")
-                    ton "Or would I have to rub your \"thing\" first?" ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Or would I have to rub your \"thing\" first?" ("horny", "base", "base", "mid")
                     gen "My lamp?" ("base", xpos="far_left", ypos="head")
                     ton "I was talking about your--" ("base", "base", "base", "R")
                     with hpunch
@@ -125,7 +125,7 @@ label tonks_talk:
                     gen "Of course not." ("base", xpos="far_left", ypos="head")
                     gen "Once you're immortal, the last thing you need is some annoying brat on your mind..." ("base", xpos="far_left", ypos="head")
                     gen "All we really want to do is waste a majority of our existence with mindless sex!" ("grin", xpos="far_left", ypos="head")
-                    ton "Oh my..." ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Oh my..." ("horny", "base", "base", "mid")
                     gen "And sometimes a bit of kinky role-play..." ("base", xpos="far_left", ypos="head")
                     gen "Are you going to call me \"Lord Voldemort\" now or what?" ("base", xpos="far_left", ypos="head")
                     ton "Fine... I will call you, [name_genie_tonks], if it makes you happy..." ("base", "base", "base", "mid")
@@ -287,10 +287,10 @@ label tonks_talk:
                 "-Whore-": #Todo put under public checks
                     label .whore:
                     $ name_tonks_genie = "Whore"
-                    ton "Hmm... I'm a \"whore\" now, am I?" ("horny", "base", "raised", "mid", hair="horny")
+                    ton @ hair horny "Hmm... I'm a \"whore\" now, am I?" ("horny", "base", "raised", "mid")
                     gen "That's what I pay you for."
-                    ton "You pay me to--" ("soft", "narrow", "base", "mid", hair="horny")
+                    ton @ hair horny "You pay me to--" ("soft", "narrow", "base", "mid")
-                    ton "Well, I suppose I do spend a lot of my time on the clock... Enticing my pupils..." ("horny", "narrow", "base", "R", hair="horny")
+                    ton @ hair horny "Well, I suppose I do spend a lot of my time on the clock... Enticing my pupils..." ("horny", "narrow", "base", "R")
                     ton "But I can assure you it's to encourage them to do better during class." ("base", "narrow", "base", "R")
                     gen "Sure... Doesn't make you less of a whore though."
                     ton "*Mmm*... Alright, fine, If calling me a whore is the punishment for being a good teacher then you can call me a whore any day..." ("horny", "narrow", "base", "mid")
@@ -311,7 +311,7 @@ label tonks_talk:
                     ton "*Uuuh*, [name_genie_tonks]..." ("base", "base", "raised", "mid")
                     ton "You better not call me that in front of a student..." ("open", "base", "base", "mid")
                     gen "What if I do?" ("grin", xpos="far_left", ypos="head")
-                    ton "Do it, I dare you!" ("horny", "base", "base", "mid", hair="horny")
+                    ton @ hair horny "Do it, I dare you!" ("horny", "base", "base", "mid")
 
                 "-Slave-"(style="disabled") if states.ton.level < 60:
                     label .slave_fail:

game/scripts/doll/chibi.rpy

@@ -374,9 +374,9 @@ default hooch_chibi = DollChibi(name="hooch", doll=hooch)
 #     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True)
 #     "doll synchronisation"
 #     chibi tonks move (path=[(500, 421), (650, 521), (800, 421)], loop=True, pause=False)
-#     ton "Default" ("base", "base", "base", "mid", hair="default")
+#     ton @ hair default "Default" ("base", "base", "base", "mid")
-#     ton "Angry" ("angry", "narrow", "angry", "mid", hair="angry")
+#     ton @ hair angry "Angry" ("angry", "narrow", "angry", "mid")
-#     ton "Scared" ("scream", "wide", "worried", "mid", hair="scared")
+#     ton @ hair scared "Scared" ("scream", "wide", "worried", "mid")
 #     "End"
 #     hide tonks_chibi
 #     hide tonks_main