Bug fix

* Removed broke transition vpunch_repeat

game/mods/ExampleMod/manifest.json

@@ -1,7 +1,7 @@
 {
-    "Name": "MyMod",
+    "Name": "ExampleMod",
     "Author": "LoafyLemon",
     "Version": "1.0.0",
     "Description": "Adds ponytail hairstyle for Hermione",
-    "GameVer": "1.45"
+    "GameVer": "1.45.2"
 }

game/mods/ExampleMod/script.rpym

@@ -1,7 +1,7 @@
 # Add new hairstyle for character as an instance of DollCloth,
 # make sure the variable name is unique, preferably starting with mod name.
-default MyMod_ponytail = DollCloth(
-    modpath="MyMod",                                   # File path; Usually a mod folder name. (case insensitive)
+default ExampleMod_ponytail = DollCloth(
+    modpath="ExampleMod",                              # File path; Usually a mod folder name. (case insensitive)
     name="hermione",                                   # Character name (case sensitive)
     categories=("head","hair"),                        # Main category and subcategory of the item (case sensitive)
     type="hair",                                       # Item type (case sensitive)

game/scripts/animations/transforms.rpy

@@ -1,8 +1,5 @@
-transform sepia(strength=1.0, tint='#ffeec2', desat=(0.2126, 0.7152, 0.0722)):
-    matrixcolor TintMatrix(tint) * SaturationMatrix(1.0-strength, desat)
-
-transform uvlight():
-    matrixcolor SepiaMatrix("#590098", desat=(1.0, 1.5, 1.0))
+transform sepia(strength=1.0, tint='#ffeec2', desat=(0.2126, 0.7152, 0.0722), brightness=0.0):
+    matrixcolor TintMatrix(tint) * SaturationMatrix(1.0-strength, desat) * BrightnessMatrix(brightness)
 
 transform move_in(x, t):
     xpos x
@@ -104,12 +101,14 @@ transform main_sprite_position(x, y, flip, scale):
 transform random_rotation(a=-45, b=45):
     rotate random.randint(a, b)
 
-transform pulse_hover(t=1.0, strength=0.2, pause=0.0):
-    animation
-    linear t matrixcolor BrightnessMatrix(value=strength)
-    linear t matrixcolor BrightnessMatrix(value=0.0)
-    pause pause
-    repeat
+transform pulse_hover(t=2.0, strength=0.2, pause=0.0):
+    matrixcolor BrightnessMatrix(value=0.0)
+
+    on start:
+        linear t/2 matrixcolor BrightnessMatrix(value=strength)
+        linear t/2 matrixcolor BrightnessMatrix(value=0.0)
+        pause pause
+        repeat
 
 transform gui_animation:
     nearest True

game/scripts/characters/astoria/common.rpy

@@ -26,6 +26,7 @@ label end_astoria_event:
     $ states.ast.busy = True
     $ astoria.wear("all")
     $ astoria.set_cum(None)
+    $ astoria.set_face(tears=False, cheeks=False)
 
     call music_block
     jump main_room_menu

game/scripts/characters/astoria/events/spells/imperio_tonks.rpy

@@ -105,6 +105,8 @@ label end_ag_st_imperio:
     jump end_astoria_event
 
 label ag_st_imperio_E1:
+    $ tonks.equip(ton_outfit_default)
+    $ astoria.equip(ast_outfit_default)
     stop music fadeout 1.0
     play sound "sounds/door.ogg"
     call ton_chibi("stand","desk","base")
@@ -306,6 +308,8 @@ label ag_st_imperio_E1:
     jump end_ag_st_imperio
 
 label ag_st_imperio_E2:
+    $ tonks.equip(ton_outfit_default)
+    $ astoria.equip(ast_outfit_default)
     stop music fadeout 1.0
     play sound "sounds/door.ogg"
     call ton_chibi("stand","desk","base")
@@ -666,6 +670,8 @@ label ag_st_imperio_E2:
     jump end_ag_st_imperio
 
 label ag_st_imperio_E3:
+    $ tonks.equip(ton_outfit_default)
+    $ astoria.equip(ast_outfit_default)
     stop music fadeout 1.0
     play sound "sounds/door.ogg"
     call ton_chibi("stand","desk","base")
@@ -835,6 +841,8 @@ label ag_st_imperio_E3:
     jump end_ag_st_imperio
 
 label ag_st_imperio_E4:
+    $ tonks.equip(ton_outfit_default)
+    $ astoria.equip(ast_outfit_default)
     stop music fadeout 1.0
 
     call ton_walk(action="enter",xpos="desk",ypos="base")
@@ -1156,6 +1164,8 @@ label ag_st_imperio_E4:
     jump end_ag_st_imperio
 
 label ag_st_imperio_E5:
+    $ tonks.equip(ton_outfit_default)
+    $ astoria.equip(ast_outfit_default)
     stop music fadeout 1.0
     play sound "sounds/door.ogg"
     call ton_chibi("stand","desk","base")

game/scripts/characters/cho/common.rpy

@@ -22,6 +22,7 @@ label end_cho_event:
     $ states.cho.busy = True
     $ cho.wear("all")
     $ cho.set_cum(None)
+    $ cho.set_face(tears=False, cheeks=False)
 
     call music_block
     jump main_room_menu

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

@@ -328,7 +328,7 @@ label cho_intro_E1:
         cho "*Hmph*... There's no argument here..." ("open", "narrow", "angry", "L")
         cho "I'm sure that Hermione's reasons for interrupting are totally valid..." ("upset", "narrow", "angry", "R")
         her "And I'm sure Cho wasn't just coming here to flaunt her body..." ("soft", "narrow", "base", "L")
-        cho "What's that supposed to mean?!?" ("clench", "narrow", "angry", "R", trans=vpunch_repeat)
+        cho "What's that supposed to mean?!?" ("clench", "narrow", "angry", "R", trans=vpunch)
         gen "(I guess I'll just have to wait this one out...)" ("base", xpos="far_left", ypos="head")
 
         # Black screen
@@ -344,7 +344,7 @@ label cho_intro_E1:
         play sound "sounds/snore1.ogg"
         gen "*Snore*{w=2.0}{nw}"
         her "" ("annoyed", "narrow", "annoyed", "R")
-        cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R", trans=vpunch_repeat)
+        cho "As if I'm going to believe that nonsense, Granger!" ("angry", "narrow", "angry", "R", trans=vpunch)
         play sound "sounds/snore2.ogg"
         gen "......{w=0.5}*Snore*{w=1.0}{nw}"
         her "I had completely legitimate reasons for coming here..." ("soft", "closed", "base", "mid")

game/scripts/characters/hermione/common.rpy

@@ -19,6 +19,7 @@ label end_hermione_event:
     $ states.her.busy = True
     $ hermione.wear("all")
     $ hermione.set_cum(None)
+    $ hermione.set_face(tears=False, cheeks=False)
 
     call music_block
     jump main_room_menu

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

@@ -75,6 +75,8 @@ label hg_pf_strip_T1_E1: #Fails
     her "[name_genie_hermione]! That is going too far!" ("angry", "base", "angry", "mid")
     her "I think I better leave..." ("angry", "base", "base", "R")
 
+    call her_walk(action="leave")
+
     $ states.her.mood += 5
 
     jump hg_pf_strip_fail

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

@@ -17,6 +17,9 @@ label start_hg_pf_handjob:
     $ current_payout = 45
     return
 
+label hg_pf_handjob_fail:
+    jump end_hermione_event
+
 label end_hg_pf_handjob:
 
     # Setup
@@ -62,15 +65,80 @@ label end_hg_pf_handjob:
 
 ### Fail Events ###
 
-label hg_pf_handjob_fail:
+label hg_pf_handjob_T1_E1:
+
     call start_hg_pf_handjob
 
     her "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
     gen "[name_hermione_genie]." ("base", xpos="far_left", ypos="head")
     her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid")
-    gen "Do you know what a \"handjob\" is?" ("base", xpos="far_left", ypos="head")
+    gen "How about you put your dainty little hands on my cock..." ("base", xpos="far_left", ypos="head")
+    gen "And give it a rub." ("base", xpos="far_left", ypos="head")
+    her "!!!" ("shock", "wide", "base", "stare")
+    gen "[name_genie_hermione]?" ("base", xpos="far_left", ypos="head")
+    gen "Hello?"
+    her "*Gulp*" ("angry", "closed", "base", "mid")
+    her "I'm sorry, [name_genie_hermione]... But I believe I must've misheard you." ("open", "closed", "base", "mid")
+    her "I'm sure you didn't just request what I think you did." ("base", "base", "base", "mid")
+    her "If you could please repeat your request, I'm sure we can work something out." ("base", "base", "base", "mid")
+    gen "Oh, of course..." ("base", xpos="far_left", ypos="head")
+    gen "One handjob please." ("base", xpos="far_left", ypos="head")
+    her "!!!" ("shock", "wide", "base", "stare")
+    her "I think I better leave." ("angry", "happyCl", "worried", "mid")
 
-    jump too_much
+    call her_walk(action="leave")
+
+    gen "(*Hmm*... Perhaps she's worried that her hand isn't big enough...)" ("base", xpos="far_left", ypos="head")
+
+    $ states.her.mood += 10
+
+    jump hg_pf_handjob_fail
+
+label hg_pf_handjob_T2_E1:
+
+    call start_hg_pf_handjob
+
+    her "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
+    gen "[name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+    her "[name_genie_hermione]?" ("base", "base", "base", "mid")
+    gen "Today, I require you to give me a hand--" ("base", xpos="far_left", ypos="head")
+    her "Of course, [name_genie_hermione]! Gryffindor could really do with some points right now!" ("base", "base", "base", "mid")
+    gen "I appreciate the enthusiasm, but I wasn't done speaking..." ("base", xpos="far_left", ypos="head")
+    her "Sorry, [name_genie_hermione]... What would you like me to give you a hand with?" ("angry", "base", "base", "mid")
+    gen "I'd like you to use your hands... To rub my cock." ("base", xpos="far_left", ypos="head")
+    her "Rub your--" ("shock", "wide", "base", "stare")
+    gen "That's right..." ("base", xpos="far_left", ypos="head")
+    gen "I'll be sure to award Gryffindor--" ("base", xpos="far_left", ypos="head")
+    her "I think I better leave." ("angry", "happyCl", "worried", "mid")
+
+    call her_walk(action="leave")
+
+    gen "(Did she not just say that she needed the points?)" ("base", xpos="far_left", ypos="head")
+
+    $ states.her.mood += 8
+
+    jump hg_pf_handjob_fail
+
+label hg_pf_handjob_T3_E1:
+
+    call start_hg_pf_handjob
+
+    her "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
+    gen "[name_hermione_genie]." ("base", xpos="far_left", ypos="head")
+    gen "For today's favour... I need you to rub my cock." ("base", xpos="far_left", ypos="head")
+    her "Your...{w=0.4} Cock!?!" ("angry", "base", "worried", "mid")
+    gen "That's right..." ("base", xpos="far_left", ypos="head")
+    her "You must be referring to your Phoenix, right?" ("angry", "base", "base", "mid")
+    gen "If that's what you want to call my penis, sure!" ("base", xpos="far_left", ypos="head")
+    her "That's not--{w=0.2} I think, I better leave..." ("angry", "happyCl", "worried", "mid")
+
+    call her_walk(action="leave")
+
+    gen "(*Hmm*... She must've gone to fetch some lubricant...)" ("base", xpos="far_left", ypos="head")
+
+    $ states.her.mood += 6
+
+    jump hg_pf_handjob_fail
 
 ### Tier 4 ###
 

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

@@ -108,15 +108,16 @@ label hg_pf_grope_T1_E1:
         her "Play with...?" ("shock", "wide", "base", "stare")
         her "My tits?!" ("angry", "wide", "base", "mid")
         gen "Or your butt! I haven't fully decided yet!" ("grin", xpos="far_left", ypos="head")
-
-        jump too_much
-
-    gen "[name_hermione_genie], I'd like to grope you a little!" ("grin", xpos="far_left", ypos="head")
-    her "This again...?" ("angry", "base", "angry", "mid")
-    her "I've told you before, [name_genie_hermione], absolutely not!!" ("scream", "closed", "angry", "mid")
-    her "By Merlin's beard..." ("angry", "base", "angry", "mid")
-    gen "Please?" ("base", xpos="far_left", ypos="head")
-    her "I'm leaving! Good day, Sir!" ("soft", "closed", "base", "mid")
+        her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare")
+        her "How could you ask for such a thing!?" ("angry", "wide", "base", "stare")
+        her "I think I better leave." ("angry", "happyCl", "worried", "mid")
+    else:
+        gen "[name_hermione_genie], I'd like to grope you a little!" ("grin", xpos="far_left", ypos="head")
+        her "This again...?" ("angry", "base", "angry", "mid")
+        her "I've told you before, [name_genie_hermione], absolutely not!!" ("scream", "closed", "angry", "mid")
+        her "By Merlin's beard..." ("angry", "base", "angry", "mid")
+        gen "Please?" ("base", xpos="far_left", ypos="head")
+        her "I'm leaving! Good day, Sir!" ("soft", "closed", "base", "mid")
 
     call her_walk(action="leave")
 

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

@@ -26,7 +26,8 @@ label hg_pf_admire_breasts_transition:
         $ hermione.strip("top", "bra", "accessory")
         pause 2.0
     else:
-        $ hermione.strip("accessory")
+        $ hermione.strip("accessory", "bra")
+        pause 2.0
 
     her @ cheeks blush "" ("angry", "happyCl", "base", "down", trans=d3)
     call ctc

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

@@ -88,9 +88,9 @@ label hg_pf_blowjob_T1_E1: #Fail
     her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid")
     gen "We're done playing games..." ("base", xpos="far_left", ypos="head")
     gen "Get over here, and suck my cock!" ("base", xpos="far_left", ypos="head")
-    her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade)
+    her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare")
     her "How could you ask for such a thing!?"
-    her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat")
+    her "I think I better leave." ("angry", "happyCl", "worried", "mid")
 
     call her_walk(action="leave")
 
@@ -108,9 +108,11 @@ label hg_pf_blowjob_T2_E1: #Fail
     gen "[name_hermione_genie]?" ("base", xpos="far_left", ypos="head")
     her "Yes, [name_genie_hermione]?" ("base", "base", "base", "mid")
     gen "Why don't you open that pretty little mouth of yours... And then put it around my cock?" ("base", xpos="far_left", ypos="head")
-    her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade)
-    her "How could you ask for such a thing!?"
-    her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat")
+    her "Put my mouth--" ("shock", "wide", "base", "stare")
+    her "[name_genie_hermione]!" ("angry", "base", "worried", "mid")
+    her "Why would you think asking me for something like that is a good idea?" ("angry", "base", "worried", "mid")
+    gen "I figured there'd be less talking if your mouth was busy--" ("base", xpos="far_left", ypos="head")
+    her "I'm leaving!" ("angry", "happyCl", "angry", "mid")
 
     call her_walk(action="leave")
 
@@ -131,9 +133,10 @@ label hg_pf_blowjob_T3_E1: #Fail
     her "Of course!" ("base", "base", "base", "mid")
     gen "Great!" ("grin", xpos="far_left", ypos="head")
     gen "Then get over here, and suck my cock!" ("grin", xpos="far_left", ypos="head")
-    her "[name_genie_hermione]??!" ("shock", "wide", "base", "stare",xpos="mid",trans=fade)
-    her "How could you ask for such a thing!?"
-    her "I think I better leave." ("angry", "happyCl", "worried", "mid",emote="sweat")
+    her "Suck your--" ("angry", "base", "base", "stare")
+    her "What is the reason you believe I would do such a thing?" ("angry", "base", "angry", "mid")
+    gen "So that you can earn points for your house? Or have your character motivation changed already?" ("base", xpos="far_left", ypos="head")
+    her "I think I better leave..." ("angry", "happyCl", "worried", "mid")
 
     call her_walk(action="leave")