Face parameter removal (Cho)

* Removed face parameter for Cho and reposed events that relied on it.
* Minor fix.

game/scripts/characters/cho/events/favors/talk_to_me.rpy

@@ -49,7 +49,7 @@ label cc_pf_talk_T1_intro_E1:
 
     call cho_walk("desk", "base")
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
-    cho "" (face="happy", xpos="mid", ypos="base", trans=d3)
+    cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=d3)
     call ctc
 
     cho "What would you like to talk about?" ("soft", "base", "base", "mid")
@@ -1049,7 +1049,7 @@ label cc_pf_talk_T2_intro_E2:
 label cc_pf_talk_T2_E3:
 
     play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
-    cho "" ("annoyed", face="neutral", xpos="mid", ypos="base", trans=fade)
+    cho "" ("soft", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
     pause .5
 
     gen "[name_cho_genie], how is school life?" ("grin", xpos="far_left", ypos="head")

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

@@ -150,7 +150,7 @@ label cc_ht_talk:
         call reset_menu_position
 
         hide screen blkfade
-        cho "" (face="happy", xpos="base", ypos="base", trans=fade)
+        cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
 
         jump cho_requests
     elif not cc_pf_talk.is_tier_complete(): # Has NOT completed "Talk to me" favour yet.

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

@@ -387,7 +387,7 @@ label cho_training:
             call reset_menu_position
 
             hide screen blkfade
-            cho "" (face="happy", xpos="base", ypos="base", trans=fade)
+            cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
             jump cho_requests
 
 ### Quidditch Tactics ###

game/scripts/characters/cho/events/requests/manipulate_boys.rpy

@@ -62,7 +62,7 @@ label cc_pr_manipulate_boys_start:
         # Repeated
         else:
             gen "Ready to mess with Hufflepuff again?" ("base", xpos="far_left", ypos="head")
-            cho "I guess so..." (mouth="soft", face="happy")
+            cho "I guess so..." ("soft", "base", "base", "mid")
             gen "Great! I'll see you later today for your report, [name_cho_genie]!" ("grin", xpos="far_left", ypos="head")
             cho "Yes, [name_genie_cho]!" ("base", "base", "base", "mid")
 
@@ -132,7 +132,7 @@ label cc_pr_manipulate_boys_start:
         else:
             gen "Time to brighten up some Slytherin's day again..." ("base", xpos="far_left", ypos="head")
             gen "Go and get their players on {i}your{/i} side!" ("grin", xpos="far_left", ypos="head")
-            cho "I will try my best, [name_genie_cho]!" (mouth="smile", face="happy")
+            cho "I will try my best, [name_genie_cho]!" ("smile", "narrow", "base", "mid")
             gen "Report to me later as usual, [name_cho_genie]!" ("grin", xpos="far_left", ypos="head")
             cho "Yes, Sir!" ("base", "base", "base", "mid")
 
@@ -262,7 +262,7 @@ label cc_pr_manipulate_boys_T1_intro_E1:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="happy", xpos="mid", ypos="base", trans=fade)
+    cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
     gen "How did it go?" ("base", xpos="far_left", ypos="head")
     cho "It went...{w=0.3} well?" ("soft", "base", "raised", "R")
     cho "Maybe a little too well... He tried to kiss me!" ("annoyed", "base", "raised", "mid")
@@ -299,7 +299,7 @@ label cc_pr_manipulate_boys_T1_E1:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="happy", xpos="mid", ypos="base", trans=fade)
+    cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
     gen "What's my favourite Quidditch player been up to today?" ("base", xpos="far_left", ypos="head")
     cho "I think you'll be happy, [name_genie_cho]!" ("base", "narrow", "base", "mid")
     gen "I like the sound of that! Tell me what happened." ("grin", xpos="far_left", ypos="head")
@@ -336,7 +336,7 @@ label cc_pr_manipulate_boys_T1_E2:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="annoyed", xpos="mid", ypos="base", trans=fade)
+    cho "" ("annoyed", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
     gen "[name_cho_genie]! Do you have some good news for me?" ("angry", xpos="far_left", ypos="head")
     cho "I'm afraid not this time, Sir." ("soft", "narrow", "worried", "mid")
     gen "Why not? Tell me what happened..." ("base", xpos="far_left", ypos="head")
@@ -389,9 +389,9 @@ label cc_pr_manipulate_boys_T1_E3:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="happy", xpos="mid", ypos="base", trans=fade)
+    cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
     gen "So? How did it go?" ("base", xpos="far_left", ypos="head")
-    cho "Very well, Sir!" (mouth="smile", face="happy")
+    cho "Very well, Sir!" ("smile", "base", "base", "mid")
     gen "Yeah? Tell me about it!" ("grin", xpos="far_left", ypos="head")
     cho "I ran into Cedric on my way to the library...{w} Literally!" ("soft", "wide", "base", "mid")
     cho "I bumped into him and hit my head pretty hard..." ("soft", "narrow", "worried", "mid")
@@ -406,13 +406,13 @@ label cc_pr_manipulate_boys_T1_E3:
     cho @ cheeks blush "It just... happened..." ("clench", "narrow", "worried", "downR")
     gen "Well done, girl!" ("base", xpos="far_left", ypos="head")
     cho "It was really nice, though." ("soft", "narrow", "base", "mid")
-    cho "He still is a really good kisser!" ( face="horny")
+    cho "He still is a really good kisser!" ("horny", "narrow", "base", "R")
     cho "Compared to most of the others I had..." ("base", "narrow", "base", "mid")
     gen "!!!" ("angry", xpos="far_left", ypos="head")
     cho "Anyhow, I should get going." ("open", "base", "base", "R")
     cho "It's getting late..." ("soft", "base", "worried", "mid")
     gen "Of course. You are dismissed." ("base", xpos="far_left", ypos="head")
-    cho "Good night, [name_genie_cho]." ( face="happy")
+    cho "Good night, [name_genie_cho]." ("smile", "narrow", "base", "mid")
 
     # Cho leaves.
     call cho_walk(action="leave")
@@ -732,7 +732,7 @@ label cc_pr_manipulate_boys_T3_twins:
     stop music fadeout 1.0
     gen "Back so soon--" ("base", xpos="far_left", ypos="head")
 
-    cho "" (face="angry", xpos="mid", ypos="base", trans=fade)
+    cho "" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=fade)
 
     menu:
         "\"*Ha-ha-ha-ha*\"":
@@ -819,7 +819,7 @@ label cc_pr_manipulate_boys_T3_ron:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="happy", xpos="mid", ypos="base", trans=fade)
+    cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
     gen "Mission success?" ("base", xpos="far_left", ypos="head")
     gen "Did you manage to sneak up on Rob?" ("base", xpos="far_left", ypos="head")
@@ -879,7 +879,7 @@ label cc_pr_manipulate_boys_T3_harry:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="happy", xpos="mid", ypos="base", trans=fade)
+    cho "" ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
     gen "Welcome back...{w=0.3} Mission success?" ("base", xpos="far_left", ypos="head")
     cho "Yes!" ("crooked_smile", "base", "base", "mid")

game/scripts/characters/cho/events/requests/manipulate_girls.rpy

@@ -318,7 +318,7 @@ label cc_pr_manipulate_girls_T3_katie_part2:
     # Cho enters.
     call cho_walk(action="enter", xpos="desk", ypos="base")
 
-    cho "" (face="angry", xpos="mid", ypos="base", trans=fade)
+    cho "" ("annoyed", "narrow", "base", "mid", xpos="mid", ypos="base", trans=fade)
 
     gen "Welcome back, any progress?" ("base", xpos="far_left", ypos="head")
     cho @ cheeks blush "If your goal was to get my ass red raw again then sure, plenty of progress..." ("angry", "narrow", "base", "R")

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

@@ -71,9 +71,9 @@ label cho_summon_setup:
                     stop music fadeout 3.0
 
                     if states.cho.mood == 0:
-                        cho "Goodbye, [name_genie_cho]." (face="happy")
+                        cho "Goodbye, [name_genie_cho]." ("base", "narrow", "base", "mid")
                     else:
-                        cho "Goodbye, [name_genie_cho]." (face="annoyed")
+                        cho "Goodbye, [name_genie_cho]." ("annoyed", "narrow", "base", "mid")
 
                     play sound "sounds/door.ogg"
 

game/scripts/characters/cho/summon.rpy

@@ -83,7 +83,7 @@ label summon_cho:
         # Talk
         "-Talk-" (icon="interface/icons/small/talk.webp"):
             if states.cho.mood > 0:
-                cho "I have nothing to say to you, [name_genie_cho]..." (face="annoyed")
+                cho "I have nothing to say to you, [name_genie_cho]..." ("annoyed", "base", "base", "mid")
                 jump cho_requests
 
             call cho_chitchat
@@ -94,7 +94,7 @@ label summon_cho:
             if states.cho.mood > 0:
                 gen "Ready to get back to training?" ("base", xpos="far_left", ypos="head")
                 if states.cho.mood >= 5:
-                    cho "No.{w=0.5} And I don't want to hear of it right now, Sir." (face="angry")
+                    cho "No.{w=0.5} And I don't want to hear of it right now, Sir." ("open", "narrow", "angry", "mid")
                 else:
                     cho "I'm sorry, [name_genie_cho]. But I don't feel like training today." ("soft", "base", "worried", "down")
                 nar "Cho is still upset with you."

game/scripts/characters/cho/talk.rpy

@@ -93,7 +93,7 @@ label genie_cho_change:
         cho @ cheeks blush "..." ("base", "narrow", "base", "downR")
         cho @ cheeks heavy_blush "Yes daddy..." ("base", "narrow", "base", "down")
     else: #custom/fallback
-        cho "Very well..." (face="neutral")
+        cho "Very well..." ("open", "narrow", "base", "mid")
     jump cho_talk
 
 label name_cho_genie:
@@ -165,6 +165,6 @@ label name_cho_genie:
             cho @ cheeks blush "..." ("angry", "narrow", "base", "downR")
             cho @ cheeks blush "Okay... I suppose you could call me that..." ("angry", "narrow", "base", "down")
     else: #custom/fallback
-        cho "Very well..." (face="neutral")
+        cho "Very well..." ("open", "narrow", "base", "mid")
 
     jump cho_talk

game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy

@@ -873,7 +873,7 @@ label hg_pf_strip_T4_snape_results:
                 her "If I hadn't ended it, he probably would've gone all the way..." ("base", "base", "base", "mid")
                 gen "I suppose we'll never know..." ("base", xpos="far_left", ypos="head")
                 her "..." ("base", "base", "base", "mid") #annoyed
-        else
+        else:
             her "Well... I learned that you two masturbating over me has become a frequent occurrence..." ("base", "base", "base", "mid")
             gen "At least now you know just how far he's willing to go." ("base", xpos="far_left", ypos="head")
             her "(Like I didn't know that already...)" ("base", "base", "base", "mid")

game/scripts/inventory/potions/addictive_potion.txt

@@ -599,7 +599,7 @@ label potion_scene_3_3_1:
     if hermione.is_worn("bottom"):
         her "It really suuuuucks that I have to wear anything at all in this boring nunnery..." ("annoyed", "narrow", "annoyed", "up")
         her "(Why can't I wear something shorter. A skirt, but...)"
-        her "(A reeealy short one!!!{heart}{heart}{heart})",face="horny"
+        her "(A reeealy short one!!!{heart}{heart}{heart})" ("annoyed", "narrow", "annoyed", "up")
 
         call set_her_action("lift_bottom")
         pause.5

game/scripts/minigames/mirror/events/suck_and_run.rpy

@@ -223,7 +223,7 @@ label suck_and_run:
         gen "Tonks?!" ("open", xpos="far_left", ypos="head")
 
         play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
-        ton "*Slurp* *Slurp* *Gulp*!" (face="horny", mouth="open_wide_tongue", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll
+        ton "*Slurp* *Slurp* *Gulp*!" ("open_wide_tongue", "narrow", "shocked", "stare", xpos="far_right", ypos=200, trans=d3) # Explicit positions to avoid hiding the doll
 
         call ton_chibi_scene("bj_desk")
         gen "am I still dreaming?" ("angry", xpos="far_left", ypos="head")