Compare commits

...

9 Commits

46 changed files with 441 additions and 464 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/banners/banners_gryffindor.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/banners/banners_hufflepuff.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/banners/banners_leading.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/banners/banners_ravenclaw.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
game/gui/creamy_pumpkin_pie/banners/banners_slytherin.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

View File

@ -40,7 +40,7 @@ init python:
def show(): def show():
astoria.show(force=True) astoria.show(force=True)
renpy.with_statement({"dolls": trans or d2}) renpy.with_statement({"dolls": trans or d1})
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes
@ -79,8 +79,10 @@ init python:
astoria.xzoom = -1 if flip else 1 astoria.xzoom = -1 if flip else 1
redraw = True redraw = True
if redraw: if redraw and not head_only:
show() show()
elif head_only:
astoria.hide()
# Figure out nickname # Figure out nickname
if name_astoria_genie != "Astoria": if name_astoria_genie != "Astoria":
@ -91,10 +93,9 @@ init python:
name_suffix = "" name_suffix = ""
if what: if what:
character.astoria_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs) side_doll = At(astoria.image, doll_transform(astoria.pos, astoria.zoom, astoria.xzoom)) if head_only else None
character.astoria_say(what, who_prefix=name_prefix, who_suffix=name_suffix, show_side_doll=side_doll, **kwargs)
if temp_face: if temp_face:
astoria.set_face(**last_face) astoria.set_face(**last_face)
if head_only:
astoria.hide()

View File

@ -510,7 +510,8 @@ label ag_se_imperio_sb_E2:
call cum_block call cum_block
gen "{size=+10}AHHH... YESS!!!!{/size}" ("angry", xpos="far_left", ypos="head") gen "{size=+10}AHHH... YESS!!!!{/size}" ("angry", xpos="far_left", ypos="head")
call gen_chibi("cum_behind_desk_done") call gen_chibi("cum_behind_desk_done")
pause.5 with d3
pause.2
ast "Woah... I didn't think you'd have that much in you, sir..." ("clench", "base", "base", "mid") ast "Woah... I didn't think you'd have that much in you, sir..." ("clench", "base", "base", "mid")
sus @ cheeks blush "{size=+10}*Hmph*! I hope you Enjoy Azkaban, perverts!{/size}" ("angry", "base", "angry", "mid") sus @ cheeks blush "{size=+10}*Hmph*! I hope you Enjoy Azkaban, perverts!{/size}" ("angry", "base", "angry", "mid")
@ -916,7 +917,8 @@ label ag_se_imperio_sb_E3:
nar "You give your cock a few final pumps, working out the last of your load onto Susan's waiting face..." nar "You give your cock a few final pumps, working out the last of your load onto Susan's waiting face..."
call gen_chibi("cum_behind_desk_done") call gen_chibi("cum_behind_desk_done")
pause.5 with d3
pause.2
gen "There we go..." ("angry", xpos="far_left", ypos="head") gen "There we go..." ("angry", xpos="far_left", ypos="head")
ast "Nice work, [name_genie_astoria]..." ("open", "closed", "base", "mid") ast "Nice work, [name_genie_astoria]..." ("open", "closed", "base", "mid")
ast "You can come out now, Suzy..." ("smile", "narrow", "base", "down") ast "You can come out now, Suzy..." ("smile", "narrow", "base", "down")

View File

@ -38,7 +38,7 @@ init python in character:
def show(): def show():
renpy.store.cho.show(force=True) renpy.store.cho.show(force=True)
renpy.with_statement({"dolls": trans or renpy.store.d2}) renpy.with_statement({"dolls": trans or renpy.store.d1})
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes
@ -77,8 +77,10 @@ init python in character:
renpy.store.cho.xzoom = -1 if flip else 1 renpy.store.cho.xzoom = -1 if flip else 1
redraw = True redraw = True
if redraw: if redraw and not head_only:
show() show()
elif head_only:
renpy.store.cho.hide()
# Figure out nickname # Figure out nickname
if renpy.store.name_cho_genie != "Cho": if renpy.store.name_cho_genie != "Cho":
@ -89,10 +91,8 @@ init python in character:
name_suffix = "" name_suffix = ""
if what: if what:
cho_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs) side_doll = renpy.store.At(renpy.store.cho.image, renpy.store.doll_transform(renpy.store.cho.pos, renpy.store.cho.zoom, renpy.store.cho.xzoom)) if head_only else None
cho_say(what, who_prefix=name_prefix, who_suffix=name_suffix, show_side_doll=side_doll, **kwargs)
if temp_face: if temp_face:
renpy.store.cho.set_face(**last_face) renpy.store.cho.set_face(**last_face)
if head_only:
renpy.store.cho.hide()

View File

@ -1027,6 +1027,7 @@ label cc_pf_talk_T2_intro_E2:
pause .2 pause .2
call gen_chibi("cum_behind_desk_done") call gen_chibi("cum_behind_desk_done")
with d3
pause .8 pause .8
cho @ cheeks blush "" ("clench", "wide", "base", "mid") cho @ cheeks blush "" ("clench", "wide", "base", "mid")
@ -1250,6 +1251,7 @@ label cc_pf_talk_T2_E3:
pause .2 pause .2
call gen_chibi("cum_behind_desk_done") call gen_chibi("cum_behind_desk_done")
with d3
pause .8 pause .8
cho "And put a large bucket under her, so when they--" ("soft", "closed", "base", "mid") cho "And put a large bucket under her, so when they--" ("soft", "closed", "base", "mid")

View File

@ -1212,7 +1212,7 @@ label cho_reaction_equip_outfit_fail(item):
cho "A what?!" ("angry", "wide", "base", "stare") cho "A what?!" ("angry", "wide", "base", "stare")
gen "A bikini, that's sporty..." ("base", xpos="far_left", ypos="head") gen "A bikini, that's sporty..." ("base", xpos="far_left", ypos="head")
gen "You're into that sort of thing, are you not?" ("base", xpos="far_left", ypos="head") gen "You're into that sort of thing, are you not?" ("base", xpos="far_left", ypos="head")
cho "Bikinis?!" ("angry", "wide", "base", "mid") cho "{shake}Bikinis?!{/shake}" ("angry", "wide", "base", "mid")
cho "Why would you think a bikini is an appropriate gift?" ("angry", "wink", "angry", "mid") cho "Why would you think a bikini is an appropriate gift?" ("angry", "wink", "angry", "mid")
gen "Well, it said \"sporty\" in the name, so I thought you'd like it." ("base", xpos="far_left", ypos="head") gen "Well, it said \"sporty\" in the name, so I thought you'd like it." ("base", xpos="far_left", ypos="head")
cho "*Ugh*..." ("disgust", "narrow", "angry", "mid") cho "*Ugh*..." ("disgust", "narrow", "angry", "mid")
@ -1222,7 +1222,7 @@ label cho_reaction_equip_outfit_fail(item):
cho "Well, that's a bit of a weird gift, but I suppose it could be useful..." ("soft", "narrow", "base", "R") cho "Well, that's a bit of a weird gift, but I suppose it could be useful..." ("soft", "narrow", "base", "R")
gen "That's what I figured." ("base", xpos="far_left", ypos="head") gen "That's what I figured." ("base", xpos="far_left", ypos="head")
gen "Here you are." ("base", xpos="far_left", ypos="head") gen "Here you are." ("base", xpos="far_left", ypos="head")
cho "!!!" ("angry", "wide", "base", "down") cho "{shudder}!!!{/shudder}" ("angry", "wide", "base", "down")
cho "[name_genie_cho], what is up with these bikini bottoms!" ("angry", "narrow", "base", "mid") cho "[name_genie_cho], what is up with these bikini bottoms!" ("angry", "narrow", "base", "mid")
gen "Pretty cool, right?" ("base", xpos="far_left", ypos="head") gen "Pretty cool, right?" ("base", xpos="far_left", ypos="head")
gen "Now, if you could just put them--" ("base", xpos="far_left", ypos="head") gen "Now, if you could just put them--" ("base", xpos="far_left", ypos="head")
@ -1310,7 +1310,7 @@ label cho_reaction_blacklist(item):
gen "Come on Cho, you're my favourite {size=-6}snatch grabber{/size} in training!" ("base", xpos="far_left", ypos="head") gen "Come on Cho, you're my favourite {size=-6}snatch grabber{/size} in training!" ("base", xpos="far_left", ypos="head")
cho "What was that?" cho "What was that?"
gen "I said. You're my favourite snitch catcher in training." ("base", xpos="far_left", ypos="head") gen "I said. You're my favourite snitch catcher in training." ("base", xpos="far_left", ypos="head")
cho "*Sigh* Alright, if it means this much to you [name_genie_cho]..." cho "{bounce}*Sigh*{/bounce} Alright, if it means this much to you [name_genie_cho]..."
gen "Hell yes!" ("grin", xpos="far_left", ypos="head") gen "Hell yes!" ("grin", xpos="far_left", ypos="head")
return return

View File

@ -36,7 +36,7 @@ init python:
if renpy.showing("genie", layer=layer): if renpy.showing("genie", layer=layer):
renpy.show(variant, layer=layer, tag="genie", at_list=at_list) renpy.show(variant, layer=layer, tag="genie", at_list=at_list)
renpy.with_statement({"dolls": trans or d2}) renpy.with_statement({"dolls": trans or d1})
if flip is not None: if flip is not None:
states.gen.image.xzoom = -1 if flip else 1 states.gen.image.xzoom = -1 if flip else 1

View File

@ -33,7 +33,7 @@ init python:
def show(): def show():
hermione.show(force=True) hermione.show(force=True)
renpy.with_statement({"dolls": trans or d2}) renpy.with_statement({"dolls": trans or d1})
face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears} face = {"mouth": mouth, "eyes": eyes, "eyebrows": eyebrows, "pupils": pupils, "cheeks": cheeks, "tears": tears}
temp_face = renpy.game.context().temporary_attributes temp_face = renpy.game.context().temporary_attributes
@ -72,8 +72,10 @@ init python:
hermione.xzoom = -1 if flip else 1 hermione.xzoom = -1 if flip else 1
redraw = True redraw = True
if redraw: if redraw and not head_only:
show() show()
elif head_only:
hermione.hide()
# Figure out nickname # Figure out nickname
if name_hermione_genie != "Hermione": if name_hermione_genie != "Hermione":
@ -84,13 +86,12 @@ init python:
name_suffix = "" name_suffix = ""
if what: if what:
side_doll = At(hermione.image, doll_transform(hermione.pos, hermione.zoom, hermione.xzoom)) if head_only else None
character.hermione_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs) character.hermione_say(what, who_prefix=name_prefix, who_suffix=name_suffix, **kwargs)
if temp_face: if temp_face:
hermione.set_face(**last_face) hermione.set_face(**last_face)
if head_only:
hermione.hide()
label too_much: label too_much:
stop music fadeout 2.0 stop music fadeout 2.0

Some files were not shown because too many files have changed in this diff Show More