Bug fixes and posing

* Fixed image tags for vibrator event
* Fixed errors reported by lint
* Added NPC reactions
* Added basic posing for Hermione during vibrator events

game/scripts/cg/hermione.rpy

@@ -71,7 +71,15 @@ layeredimage her_vibrators_public:
 
     attribute background default
 
-    # TODO NPC reactions
+    group npc multiple prefix "npc":
+        attribute sus_ron:
+            "her_vibrators_public_npc_sus_ron"
+        attribute shock_ron:
+            Fixed("her_vibrators_public_npc_shock_ron", \
+            "her_vibrators_public_npc_shock_ron_effect")
+        attribute shock_harry:
+            Fixed("her_vibrators_public_npc_shock_harry", \
+            "her_vibrators_public_npc_shock_harry_effect")
 
     attribute body default
     group blush auto prefix "blush":
@@ -110,6 +118,8 @@ layeredimage her_vibrators_public:
         attribute nopanties null
         attribute nude null
 
+    group effects auto multiple prefix "effects"
+
 image her_vibrators_public_proxy = LayeredImageProxy("her_vibrators_public")
 image her_vibrators_public_xray = Xray("her_vibrators_public", "her_vibrators_public_proxy", radius=0.18)
 
@@ -130,9 +140,7 @@ layeredimage her_vibrators_personal hermione1:
         attribute horny default
     attribute fringe default
 
-    group effects auto multiple variant "effects":
-        attribute wetness default
-        attribute puddle
+    group effects auto multiple prefix "effects"
 
     group vibrator multiple variant "vibrator":
         attribute base default
@@ -157,9 +165,7 @@ layeredimage her_vibrators_personal hermione2:
         attribute horny default
     attribute fringe default
 
-    group effects auto multiple variant "effects":
-        attribute wetness default
-        attribute puddle
+    group effects auto multiple prefix "effects"
 
     group vibrator multiple variant "vibrator":
         attribute base default
@@ -184,10 +190,7 @@ layeredimage her_vibrators_personal hermione3:
     group mouth auto prefix "mouth":
         attribute open default
 
-    group effects auto multiple variant "effects":
-        attribute wetness default
-        attribute squirt
-        attribute mascara
+    group effects auto multiple prefix "effects"
 
     group vibrator multiple variant "vibrator":
         attribute base default

game/scripts/characters/hermione/wardrobe.rpy

@@ -562,7 +562,8 @@ default her_bra_base_vibrators = DollCloth("hermione", ("upper undergarment", "b
 default her_nipple_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory0", "nipple_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1)
 default her_clit_vibrators = DollCloth("hermione", ("misc", "accessory"), "accessory1", "clit_vibrators", [[234, 142, 97, 255], [252, 217, 135, 255], [255, 118, 96, 255]], zorder=1)
 
-default her_outfit_vibrators = DollOutfit([her_hair_base, her_panties_base_vibrators, her_bra_base_vibrators, her_nipple_vibrators, her_clit_vibrators])
+default her_outfit_vibrators = DollOutfit([her_hair_base, her_panties_base_vibrators, her_bra_base_vibrators, her_nipple_vibrators, her_clit_vibrators], hidden=True)
+default her_outfit_vibrators_nude = DollOutfit([her_hair_base, her_nipple_vibrators, her_clit_vibrators], hidden=True)
 
 default her_accessory_bb_tie = DollCloth("hermione", ("misc", "accessory"), "accessory4", "bb_tie", [[177, 51, 159, 255], [246, 40, 0, 255], [255, 247, 0, 255]], zorder=10)
 default her_tattoo_bb_tattoo = DollCloth("hermione", ("piercings & tattoos", "tattoos"), "tattoo3", "bb_tattoo", [[0, 0, 0, 255], [255, 247, 0, 255], [246, 40, 0, 255]])

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

@@ -24,8 +24,8 @@ label blueballing_bad:
 
     nar "Sitting at his desk, doing some paperwork peacefully, Genie suddenly heard some voices, talking loudly while getting closer and closer to the office door..."
     her "{size=-6}What now?{/size}"
-    ton "{size=-6}Miss Granger... Enough is enough."
-    ton "{size=-6}Even if he was a bit perverted, surely that wouldn't--{w=1.0}{nw}"
+    ton "{size=-6}Miss Granger... Enough is enough.{/size}"
+    ton "{size=-6}Even if he was a bit perverted, surely that wouldn't--{/size}{w=1.0}{nw}"
     her "{size=-4}A little bit perverted?!{/size}"
     gen "(What's this fuss about?)" ("open", xpos="far_left", ypos="head")
     ton "{size=-4}Miss Granger, wait!{/size}{w=0.75}{nw}"
@@ -42,7 +42,7 @@ label blueballing_bad:
 
     her "{b}I AM NOT CRAZY!{/b}" ("scream", "closed", "angry", "mid", xpos="far_right", ypos="head")
     $ renpy.sound.play("sounds/MaleGasp.ogg")
-    gen "What the-" ("open", xpos="far_left", ypos="head")
+    gen "What the--" ("open", xpos="far_left", ypos="head")
 
     $ renpy.music.play("music/Under-the-Radar by PhobyAk.ogg")
 
@@ -83,7 +83,7 @@ label blueballing_bad:
     her "I shouldn't have been blinded by the house points...{w=0.5} What was I thinking?! Giving him a chance to satisfy his male desires..." ("mad", "squint", "worried", "R_soft")
     her "He's a pervert." ("angry", "base", "worried", "L_soft")
     her "He's a pervert!{w=0.25} Ever since I talked to him about my grades, he just couldn't keep his hands out of his robe!" ("clench", "base", "annoyed", "mid")
-    gen "I swear I wasn't-" ("base", xpos="far_left", ypos="head")
+    gen "I swear I wasn't--" ("base", xpos="far_left", ypos="head")
     her "Everyone kept telling me I was making stuff up..." ("clench", "base", "annoyed", "mid")
     her "\"Not the Headmaster!\"{w=0.25}, \"Our Headmaster is not like that!\"..." ("clench", "base", "angry", "up")
     her "{b}WHAT A {size=+2}SICK{/size} JOKE!{/b}" ("scream", "wide", "angry", "stare")
@@ -130,7 +130,7 @@ label blueballing_bad:
     $ renpy.sound.play("sounds/card_punch2.ogg")
     call gen_chibi("stand")
     call gen_walk("door", "base", speed=2.0)
-    gen "{b}{size=+4}MISS GRANGER, COME BACK. I'LL PAY YOU ONE THOUSAND POINTS IF YOU LET ME MASTURBATE IN FRONT OF YOU!{/b}{/size}" ("open", xpos="far_left", ypos="head")
+    gen "{b}{size=+4}MISS GRANGER, COME BACK. I'LL PAY YOU ONE THOUSAND POINTS IF YOU LET ME MASTURBATE IN FRONT OF YOU!{/size}{/b}" ("open", xpos="far_left", ypos="head")
     call gen_chibi("leave")
     ton "{b}WAIT NO! What are you doing?!{/b}" ("open", "shocked", "shocked", "R", hair="neutral")
     call ton_chibi("leave")