Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Flags and bug fixes

Browse Source 
* Added creampie, anal_creampie, gokkun, statuses
* Fixed double defined memory flag
* Fixed non-existent screen call in some events
* Fixed a non-existent hermione expression call
* Fixed non-existent hide image tag call
* Fixed menu text styling, and grammar
* Fixed status flags not adhering to the naming convention
* Replaced caught_genie_masturbating status flag with an event flag
* Added additional event flags where it made sense
This commit is contained in:
LoafyLemon 2023-04-24 20:50:50 +01:00
parent 735bc3f736
commit 57965bd8f5
19 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/scripts/characters/cho/events/favors/suck_it.rpy
View File

@ -614,7 +614,7 @@ label cc_pf_blowjob_1:
cho "Is this what you do to Hermione as well?" ("upset", "narrow", "base", "down", cheeks="blush")
if states.her.status.kissing:
if states.her.status.gokkun:
gen "Maybe." ("base", xpos="far_left", ypos="head")
cho "I knew it..." ("smile", "wide", "base", "mid", cheeks="blush")
gen "Miss Granger knows how to properly dispose--" ("base", xpos="far_left", ypos="head")

2
game/scripts/characters/hermione/events/favors/dance_for_me.rpy
View File

@ -955,7 +955,7 @@ label hg_pf_strip_T3_masturbate:
stop music fadeout 1.0
her "No, [name_genie_hermione]!" ("annoyed", "narrow", "angry", "R", flip=False)
if states.her.status.cum_body:
if states.her.status.cumshot:
her "You've done this to me before, without telling me beforehand..." ("angry", "happyCl", "worried", "mid")
gen "*Huh*?" ("base", xpos="far_left", ypos="head")
show screen blkfade

13
game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy
View File

@ -426,14 +426,17 @@ label hg_pf_handjob_1:
call her_chibi_scene("hj_kiss", trans=kissiris)
pause 1
if states.her.status.kissing == False:
if not states.her.ev.suck_it.cock_kiss:
$ states.her.ev.suck_it.cock_kiss = True
$ achievements.unlock("herkiss")
$ hg_pf_handjob.change_icon(a="heart_half", b="heart_red")
if hg_pr_kiss.counter == 0:
if not states.her.status.kissing:
her "(My first kiss ever, and I gave it away...{w=0.4} To a cock...)" ("soft", "closed", "worried", "down")
else:
her "(Our first kiss ever, and I gave it away...{w=0.4} To his cock...)" ("soft", "closed", "worried", "down")
$ states.her.status.kissing = True
$ states.her.status.kissing = True
pause 2
call her_chibi_scene("hj", trans=d5)
@ -518,7 +521,7 @@ label hg_pf_handjob_1:
menu:
gen "..." ("base", xpos="far_left", ypos="head")
"-Give her a warning-":
$ states.her.status.cum_body = True
$ states.her.status.cumshot = True
gen "Here it comes, [name_hermione_genie]! You better be ready!" ("angry", xpos="far_left", ypos="head")
her "What? So soon?!" ("shock", "wide", "base", "stare")
gen "{size=+5}Yeah, you did a great job!!!{/size}" ("angry", xpos="far_left", ypos="head")
@ -604,7 +607,7 @@ label hg_pf_handjob_1:
her "I really need to go now, so may I have my payment?" ("open", "squint", "worried", "R")
"-Just start cumming-":
$ states.her.status.cum_body = True
$ states.her.status.cumshot = True
with hpunch
gen "{size=+3}*Argh*!{/size}" ("angry", xpos="far_left", ypos="head")
her "{size=+3}What?!{/size}" ("shock", "wide", "base", "stare")

3
game/scripts/characters/hermione/events/favors/lets_have_sex.rpy
View File

@ -789,6 +789,7 @@ label hg_sex_1:
return
"-Cum inside her-":
$ states.her.status.creampie = True
show her_sex_personal cum_inside as cg
@ -1172,6 +1173,8 @@ label hg_sex_2:
menu:
"-Cum inside of her-":
$ states.her.status.creampie = True
show her_sex_personal cum_inside as cg
gen "{size=+7}*Argh*, TAKE THIS!!!{/size}"

6
game/scripts/characters/hermione/events/favors/show_me_your_tits_branches.rpy
View File

@ -185,10 +185,10 @@ label hg_pf_admire_breasts_T2_masturbate: # Not a Call label
hide screen blktone
call her_chibi_scene("grope_tits_jerk_off", trans=fade)
if states.her.status.caught_genie_masturbating == False:
if states.her.status.voyer == False:
$ achievements.unlock("busted")
$ hg_pf_talk.change_icon(a="heart_half", b="heart_red")
$ states.her.status.caught_genie_masturbating = True
$ states.her.status.voyer = True
call ctc
@ -419,7 +419,7 @@ label hg_pf_admire_breasts_T3_masturbate:
return
"-Just start cumming-":
$ states.her.status.cum_body = True
$ states.her.status.cumshot = True
$ _cumming = True
gen "*Argh*! You whore!" ("angry", xpos="far_left", ypos="head")
her "Proff--?" ("scream", "wide", "base", "stare", cheeks="blush")

12
game/scripts/characters/hermione/events/favors/suck_it.rpy
View File

@ -105,7 +105,7 @@ label hg_pf_blowjob_T4_fail_intro:
her "Suck you...{w=0.3} off?" ("disgust", "wide", "base", "mid")
her "With my mouth?!" ("disgust", "wide", "base", "stare")
if states.her.status.kissing:
if states.her.ev.suck_it.cock_kiss:
gen "Wouldn't even be the first time you've done it!" ("grin", xpos="far_left", ypos="head")
her "Yes, but..." ("disgust", "narrow", "worried", "down")
her "That was something different entirely..." ("disgust", "happyCl", "worried", "mid")
@ -143,7 +143,7 @@ label hg_pf_blowjob_T4_fail_repeat:
her "I refuse..." ("open", "closed", "base", "mid")
gen "It's only a blowjob, girl..." ("base", xpos="far_left", ypos="head")
if states.her.status.kissing:
if states.her.ev.suck_it.cock_kiss:
gen "It's not like you haven't done it before..." ("base", xpos="far_left", ypos="head")
her "Are you talking about the kiss I gave it?" ("open", "base", "angry", "mid")
her "That was something different entirely..." ("open", "closed", "base", "mid")
@ -151,7 +151,7 @@ label hg_pf_blowjob_T4_fail_repeat:
her "I wanted to get done with that favour early, so I helped a bit." ("open", "narrow", "angry", "R")
gen "By sucking on my cock! Indeed you did!" ("grin", xpos="far_left", ypos="head")
her "It was nothing more than a short kiss..." ("annoyed", "base", "angry", "mid")
gen "Still counts as a blowjob..." ("base", xpos="far_left", ypos="head")
gen "Still counts as a blowjob..." ("base", xpos="far_left", ypos="head") # See, no flag is set. It doesn't count! :)
her "[name_genie_hermione], I've told you this last time..." ("open", "closed", "base", "mid")
her "I refuse to do this sort of thing..." ("normal", "base", "angry", "mid")
@ -534,6 +534,8 @@ label hg_pf_blowjob_1:
menu:
gen "..." ("base", xpos="far_left", ypos="head")
"-Warn her-":
$ states.her.status.gokkun = True
her "Yes, I love to suck and--" ("soft", "narrow", "annoyed", "up")
gen "Heads up, [name_hermione_genie]! Here it comes!" ("angry", xpos="far_left", ypos="head")
her "!!!" ("angry", "wide", "base", "stare")
@ -1381,6 +1383,7 @@ label hg_hidden_blowjob_cumming:
menu:
gen "!!!" ("angry", xpos="far_left", ypos="head")
"-Cum in her mouth-":
$ states.her.status.gokkun = True
gen "Here it comes, [name_hermione_genie]! get ready to swallow, and fast!" ("angry", xpos="far_left", ypos="head")
her "!!!" ("open_wide_tongue", "narrow", "base", "up")
@ -1614,6 +1617,7 @@ label hg_pf_blowjob_2:
menu:
gen "!!!" ("angry", xpos="far_left", ypos="head")
"-Cum in her mouth-":
$ states.her.status.gokkun = True
gen "Here it comes, [name_hermione_genie]! Here comes daddy!" ("angry", xpos="far_left", ypos="head")
her "!!!" ("open_wide_tongue", "narrow", "base", "up")
@ -1708,6 +1712,8 @@ label hg_pf_blowjob_2:
gen "Yes I did, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
"\"Worship my cock.\"":
$ states.her.status.gokkun = True
her "Worship it?" ("angry", "wink", "base", "mid")
gen "Did I stutter?" ("base", xpos="far_left", ypos="head")
her "Well..." ("base", "narrow", "worried", "down")

12
game/scripts/characters/hermione/events/favors/talk_to_me.rpy
View File

@ -184,7 +184,7 @@ label hg_pf_talk_T1: # Call label
### Tier 2 ###
# Hermione realises you've been jerking off this whole time!
# 'states.her.status.caught_genie_masturbating' is required to advance into the next tier.
# 'states.her.status.voyer' is required to advance into the next tier.
# Event 1 (i) - Hermione can spot you jerking off.
# Event 2 (r) - Slight dialogue variation if you've been busted jerking off before.
@ -199,7 +199,7 @@ label hg_pf_talk_T2_intro_E1:
label hg_pf_talk_T2_E1:
if states.her.status.caught_genie_masturbating:
if states.her.status.voyer:
her "Another talk, [name_genie_hermione]?" ("soft", "base", "base", "mid")
her "(I hope he doesn't do \"that\" again...)" ("disgust", "narrow", "base", "down")
else:
@ -283,7 +283,7 @@ label hg_pf_talk_T2:
call cum_block
gen "*Argh*! YES!" ("angry", xpos="far_left", ypos="head")
if states.her.status.caught_genie_masturbating:
if states.her.status.voyer:
her "I can't believe it, [name_genie_hermione]!" ("soft", "base", "angry", "mid")
her "You were touching yourself!{w} Again!" ("angry", "base", "angry", "mid")
else:
@ -304,11 +304,13 @@ label hg_pf_talk_T2:
her "*Eww*... I feel so dirty now..." ("angry", "base", "angry", "mid")
$ states.her.mood = +7
$ states.her.status.voyer = True
if not states.her.ev.talk_to_me.caught_masturbating:
$ states.her.ev.talk_to_me.caught_masturbating = True
if states.her.status.caught_genie_masturbating == False:
$ achievements.unlock("busted")
$ hg_pf_talk.change_icon(a="heart_half", b="heart_red")
$ states.her.status.caught_genie_masturbating = True
else:
her "We need to put an end to this behaviour, [name_genie_hermione]!" ("open", "closed", "base", "mid")

2
game/scripts/characters/hermione/events/forest.rpy
View File

@ -485,7 +485,7 @@ label forest_BJ_3: #Complete BJ with Myrtle appearing after the cumshot
her "*Glck* Sto--{w=0.3}! *glck*{heart}*glck*"
show her_forest bj h37 as cg
nar "Hermione's throat momentarily lessens its grip around your cock."
nar "Her face now even even redder than before, she starts to pull back, either due to embarrassment or lack of air..."
nar "Her face now even redder than before, she starts to pull back, either due to embarrassment or lack of air..."
show her_forest bj h36 as cg
nar "Unfortunately for the petite witch, her shame only serves to intensify your pleasure."
show her_forest bj h37 as cg

2
game/scripts/characters/hermione/events/potions/breast_expand.rpy
View File

@ -1337,7 +1337,7 @@ label her_potion_breasts_return:
her "I must admit... That Slytherin boy was more clever than I'd give any of them credit for." ("annoyed", "narrow", "worried", "R", cheeks="blush")
her "I got completely covered in that horribly sticky mess..." ("disgust", "closed", "worried", "mid", cheeks="blush")
if not states.her.status.cum_body:
if not states.her.status.cumshot:
gen "I'm sure you'll get used to it..."
else:
gen "You'd think you'd be used to that sort of thing."

2
game/scripts/characters/hermione/events/requests/flash_your_tits.rpy
View File

@ -207,7 +207,7 @@ label hg_pr_flash_T3_E2:
gen "Right." ("base", xpos="far_left", ypos="head")
show her_flash_public eyes_open_left mouth_frown zorder 15 as cg
hide hermione
hide hermione_main
with fade
her "So, today I've been standing in one of the corridors near the entrance to the Hufflepuff Common Room, anticipating the moment he usually leaves for class..."

2
game/scripts/characters/hermione/events/shaming/panty_thief.rpy
View File

@ -254,7 +254,7 @@ label hg_cum_on_panties_response:
gen "You can go now." ("base", xpos="far_left", ypos="head")
her "What about my points?" ("angry", "base", "base", "mid")
gen "You still want points after I just gave you a gift?" ("base", xpos="far_left", ypos="head")
her "What gift?" ("angry", "base", "narrow", "mid")
her "What gift?" ("angry", "base", "annoyed", "mid")
gen "You're wearing it." ("base", xpos="far_left", ypos="head")
her "What, soaked panties?"
gen "If you preferred receiving points, then you shouldn't have put them on." ("base", xpos="far_left", ypos="head")

5
game/scripts/characters/hermione/events/shaming/wear_my_cum.rpy
View File

@ -23,9 +23,10 @@ label hg_ps_cumslut:
her "Of course..." ("base", "base", "base", "mid")
gen "After I cum on you." ("base", xpos="far_left", ypos="head")
if not states.her.status.cum_body: #Occurs at the latest during HJ favour.
if not states.her.status.cumshot: #Occurs at the latest during HJ favour.
jump too_much
elif states.her.level < 19:
if states.her.level < 19:
jump hg_ps_cumslut_Scene_1
elif states.her.level < 21:
jump hg_ps_cumslut_Scene_2

2
game/scripts/characters/hermione/events/tutoring.rpy
View File

@ -419,7 +419,7 @@ label hg_tutor_E5:
call gen_chibi("cum_behind_desk_done")
with d3
if states.her.status.caught_genie_masturbating:
if states.her.status.voyer:
her "Professor!" ("angry", "base", "angry", "mid", cheeks="blush")
gen "You enjoyed it too, so don't act all innocent." ("base", xpos="far_left", ypos="head")
gen "Anyway, I hope it was revealing." ("base", xpos="far_left", ypos="head")

4
game/scripts/characters/hermione/summon.rpy
View File

@ -360,13 +360,13 @@ label update_her_tier:
if states.her.tier == 1 and states.her.level >= 3:
# Trigger: None
her_level_up = 1
elif states.her.tier == 2 and states.her.level >= 9 and states.her.status.caught_genie_masturbating == True:
elif states.her.tier == 2 and states.her.level >= 9 and states.her.status.voyer == True:
# Trigger: Caught/saw Genie masturbate for the first time.
her_level_up = 2
elif states.her.tier == 3 and states.her.level >= 12 and states.her.status.stripping == True:
# Trigger: After she has stripped completely for Genie.
her_level_up = 3
elif states.her.tier == 4 and states.her.level >= 18 and states.her.status.kissing == True:
elif states.her.tier == 4 and states.her.level >= 18 and states.her.ev.suck_it.cock_kiss == True:
# Trigger: Kissed Genie's dick during HJ favour.
her_level_up = 4
elif states.her.tier == 5 and states.her.level >= 21 and states.her.status.blowjob == True:

17
game/scripts/characters/hermione/vars.rpy
View File

@ -18,15 +18,18 @@ default states.her.map_location = "library"
# Sexual activity states
default states.her.status.caught_genie_masturbating = False #Required for Tier up, caught/saw genie masturbate for the first time.
default states.her.status.stripping = False #Required for Tier up, unlocks hangout with Snape, which in turn allows you to invite him to watch her strip.
default states.her.status.cum_body = False #Genie came on her body/clothes. (Will always happen during HJ T4)
default states.her.status.handjob = False #Given Genie a Handjob.
default states.her.status.kissing = False #Required for Tier up, kissed Genie's Dick during HJ.
default states.her.status.voyer = False
default states.her.status.stripping = False
default states.her.status.cumshot = False
default states.her.status.handjob = False
default states.her.status.kissing = False
default states.her.status.blowjob = False
default states.her.status.masturbating = False # Hermione has touched herself in front of Genie.
default states.her.status.gokkun = False
default states.her.status.masturbating = False
default states.her.status.sex = False
default states.her.status.creampie = False
default states.her.status.anal = False
default states.her.status.anal_creampie = False
# Event flags
@ -59,6 +62,7 @@ default states.her.ev.dance_for_me.snape_invited = False # Invited Snape to watc
default states.her.ev.suck_it.snape_encounter = False
default states.her.ev.suck_it.tonks_encounter = False
default states.her.ev.suck_it.luna_encounter = False
default states.her.ev.suck_it.cock_kiss = False
default states.her.ev.yule_ball.variant = "personal"
default states.her.ev.yule_ball.e1_complete = False
default states.her.ev.yule_ball.e2_complete = False
@ -89,6 +93,7 @@ default states.her.ev.potions.polyjuice_cat_furry = False
default states.her.ev.potions.polyjuice_luna_drank = False
default states.her.ev.potions.polyjuice_luna_nude = False
default states.her.ev.maid.intro_complete = False
default states.her.ev.talk_to_me.caught_masturbating = False
default her_level_up = None # TODO: This var is used in an overly complicated manner, it should be removed once the issues are resolved.
default current_job = None # TODO: Jobs should be using event class with enqueue feature instead.

2
game/scripts/events/ending.rpy
View File

@ -2478,6 +2478,7 @@ label ball_ending_E2:
menu:
"-Cum inside Hermione's pussy-":
$ states.her.status.creampie = True
$ d_flag_01 = True # Came into pussy
gen "You think your pussy is ready for this, whore?" ("angry", xpos="far_left", ypos="head")
@ -2515,6 +2516,7 @@ label ball_ending_E2:
gen "*Ah*......." ("angry", xpos="far_left", ypos="head")
"-Cum inside Hermione's butt-":
$ states.her.status.anal_creampie = True
$ d_flag_01 = False # Came into asshole
gen "Your butthole better be ready for this, whore!" ("angry", xpos="far_left", ypos="head")

6
game/scripts/interface/cheats.rpy
View File

@ -305,13 +305,13 @@ label cheats:
"-Genie Outfits-":
label .genie:
menu:
"-Use Default Outfit":
"-Use Default Outfit-":
show genie robes
hide genie
with None
gen robes "Swag." ("grin", xpos="far_left", ypos="head")
"-Use Santa Outfit":
"-Use Santa Outfit-":
show genie santa
hide genie
with None
@ -497,7 +497,7 @@ label .hermione_skip_intro:
# label .hermione_skip_T2:
# $ states.her.tier = 3
# $ states.her.level = 9
# $ states.her.status.caught_genie_masturbating = True
# $ states.her.status.voyer = True
# return
# label .hermione_skip_T3:

2
game/scripts/minigames/mirror/events/suck_and_run.rpy
View File

@ -183,7 +183,6 @@ label suck_and_run:
call gen_chibi("sit_behind_desk")
play music "sounds/night.ogg" fadein 1 if_changed # Intentional, because background channel is already preoccupied
show screen add_overlay
hide screen blkfade
with d5
@ -361,7 +360,6 @@ label suck_and_run:
show screen blkfade with d3
stop music fadeout 1.0
hide screen add_overlay
centered "{size=+7}{color=#cbcbcb}End of part three{/color}{/size}"

3
game/scripts/options.rpy
View File

@ -72,7 +72,7 @@ define config.atl_start_on_show = False # Enables compatibility for ATL behaviou
# define config.drawable_resolution_text = True
define config.cache_surfaces = False
define config.image_cache_size = None
define config.image_cache_size_mb = 350
define config.image_cache_size_mb = settings.get("image_cache_size")
define config.load_before_transition = True
define config.imagemap_cache = True
define config.optimize_texture_bounds = True
@ -122,7 +122,6 @@ define config.say_attribute_transition = d3
# Python
define config.open_file_encoding = "utf-8"
define config.image_cache_size_mb = settings.get("image_cache_size")
# Debug
# define config.profile = True