Merge branch 'dev' into Python3

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

@@ -68,7 +68,7 @@ label cc_pf_blowjob_T3_intro_E1:
         if _in_replay:
             show screen blkfade
             with d5
-            $ renpy.end_replay()
+            return
 
         gen "So, as your coach, it's my responsibility to prepare you!" ("base", xpos="far_left", ypos="head")
         cho "And a blowjob is necessary for this?" ("angry", "narrow", "raised", "mid")

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

@@ -1514,7 +1514,7 @@ label cho_quid_E12:
     label .introspection:
 
         if _in_replay:
-            show screek blkfade
+            show screen blkfade
             with d5
 
             $ hooch.equip(hoo_outfit_default)
@@ -1895,7 +1895,7 @@ label cho_quid_E14:
     gen "*Ngh*... You're--{w=0.2} You're able to channel your own magic into your--" ("grin", xpos="far_left", ypos="base")
     cho "Of course, any able-bodied witch should be able to do that."
     gen "I have so many questions, but... Please, continue..." ("grin", xpos="far_left", ypos="base")
-    cho "So, after I start channelling, I keep the flow at a rhythm, or I should say flow, to the point where I start feeling tingly..."
+    cho "And I keep the flow at a steady pace, until I start feeling tingly."
     cho "That's when I increase the speed-- I mean flow..."
 
     #jerking fast (genie)
@@ -1985,12 +1985,14 @@ label cho_quid_E14:
     gen "Of course, and there's no need to worry, I've coached my swimmers to not accidentally get anyone pregnant." ("grin", xpos="far_left", ypos="base")
     cho "That's--{w=0.2} I wasn't even considering that..."
     gen "You weren't?!" ("base", xpos="far_left", ypos="base")
-    cho "No, but I'll keep it in mind for the future."
+    cho "Not really..."
+    cho "(But I'll have to keep it in mind for the future...)"
+    cho "(If he would even give me another chance after this...)"
     gen "(Maybe shouldn't have said anything...)"
     gen "So, what is bothering you then?" ("base", xpos="far_left", ypos="base")
     cho "Well... The potion..."
     gen "Yeah?" ("base", xpos="far_left", ypos="base")
-    cho "I never really drink any it."
+    cho "I never drank any of it."
     gen "I see..." ("base", xpos="far_left", ypos="base")
     gen "{size=+4}Wait what?!{/size}" ("angry", xpos="far_left", ypos="base") #Big text
 
@@ -2023,9 +2025,9 @@ label cho_quid_E14:
     cho "(That must be why he wasn't so concerned about my equipment...)"
     cho "(Unless it's a placebo...)"
 
-    #cork sound
+    $ renpy.sound.play("sounds/bottle.ogg")
     pause .5
-    #sniff sound
+    $ renpy.sound.play("sounds/sniff.ogg")
     cho "(*Sniff*)"
 
     cho "(No, that's liquid luck alright, no doubts about it...)"
@@ -2049,7 +2051,7 @@ label cho_quid_E14:
     show image Placeholder("bg") as cg zorder 15
     with fade
 
-    cho "..."
+    cho "(Liquid luck...)."
     cho "(I never thought I'd hold one of those in my hand...)"
     cho "([cho_genie_name] must really want me to win if he's willing to risk his career by giving this...)"
     cho "(But why did we go through all those lewd favours, if he was just going to give me a luck potion anyway...)"
@@ -2098,14 +2100,17 @@ label cho_quid_E14:
     with d5
 
     #Fade to black
-    #Bottle cork sound
+    $ renpy.sound.play("sounds/bottle.ogg")
+    pause .6
+    $ renpy.sound.play("sounds/spill.ogg")
+
+    pause .6
     #Pouring liquid sound
 
     cho "(It's done... There's no going back now.)"
     cho "(Hold on... Didn't Snape say luck potion is expensive...)"
     cho "(Blimey! I could have sold it got a new broom... )"
     cho "(Too late for that now. I better find the best alternative broom I can!)"
-    cho "(I'm doing this for myself! I want the victory to feel real!)"
 
     $ renpy.call_replay("cho_quid_E12.introspection")
 

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

@@ -626,7 +626,7 @@ label snape_intro_E4:
     sna "Marvellous..." ("snape_35")
     sna "What does this mean? You're staying here for good?" ("snape_01")
     gen "Of course not..." ("base", xpos="far_left", ypos="head")
-    gen "Me being here at all is only possible because the spell is compensating for the unbalance caused by itself..." ("base", xpos="far_left", ypos="head")
+    gen "Me being here at all is only possible because the spell is compensating for the imbalance caused by itself..." ("base", xpos="far_left", ypos="head")
     gen "said spell will wear off eventually and I shall be pulled back into my world." ("base", xpos="far_left", ypos="head")
     gen "Likewise, your Dumb-le-dork friend shall be pulled back here." ("base", xpos="far_left", ypos="head")
     sna "I see..." ("snape_01")

game/scripts/characters/tonks/wardrobe.rpy

@@ -189,7 +189,7 @@ default ton_bra_pasties = DollCloth("tonks", ("upper undergarment", "other"), "b
 default ton_bra_pasties2 = DollCloth("tonks", ("upper undergarment", "other"), "bra", "pasties_2",[[2, 116, 71, 255], [244, 181, 82, 255]])
 default ton_bottom_xmas = DollCloth("tonks", ("lower body", "other"), "bottom", "xmas",[[2, 116, 71, 255], [255, 239, 248, 255]])
 default ton_gloves_xmas = DollCloth("tonks", ("upper body", "gloves"), "gloves", "xmas", [[255, 239, 248, 255]])
-default ton_stockings_xmas = DollCloth("tonks", ("legwear", "stockings"), "stockings", "xmas",[[255, 255, 255, 255], [255, 255, 255, 255]])
+default ton_stockings_xmas = DollCloth("tonks", ("legwear", "stockings"), "stockings", "xmas",[[255, 255, 255, 255], [255, 255, 255, 120]])
 
 default ton_outfit_elf = DollOutfit([ton_hair_base_new, ton_makeup_elf_ears, ton_earring_bells, ton_hat_elf, ton_neckwear_bell1, ton_top_elf, ton_accessory_belt1, ton_accessory_bells, ton_garterbelt_long_basic, ton_stockings_long_striped])
 default ton_outfit_ribbon = DollOutfit([ton_hair_base_new, ton_neckwear_choker1, ton_bra_ribbon, ton_panties_ribbon])