Refactoring
* Refactored old house points references * Updates set_points method to use a dict to work with multiple changes at once.
This commit is contained in:
parent
7a4b31bf63
commit
7069cc1294
@ -567,13 +567,13 @@ label astoria_intro_E3:
|
||||
her "..." ("annoyed", "narrow", "angry", "R")
|
||||
her "Very well..." ("open", "closed", "base", "mid")
|
||||
$ states.her.mood += 6
|
||||
$ gryffindor += 10
|
||||
$ states.env.gryffindor += 10
|
||||
|
||||
"\"You'll get twenty.\"":
|
||||
her "..." ("annoyed", "base", "base", "R")
|
||||
her "I suppose that's fair." ("open", "closed", "base", "mid")
|
||||
$ states.her.mood = 0
|
||||
$ gryffindor += 20
|
||||
$ states.env.gryffindor += 20
|
||||
|
||||
her "In a few days, everyone at Hogwarts will know what happened to her..." ("grin", "base", "angry", "mid")
|
||||
her "When she's sent to Azkaban!" ("soft", "squint", "angry", "mid")
|
||||
@ -765,7 +765,7 @@ label astoria_intro_E3:
|
||||
ton "But you'll still have to visit me for detention." ("open", "base", "annoyed", "L")
|
||||
ast "I guess I can do that..." ("smile", "base", "base", "R")
|
||||
ton "Wonderful." ("base", "happyCl", "base", "mid")
|
||||
$ slytherin += 50
|
||||
$ states.env.slytherin += 50
|
||||
|
||||
ton "That should be all for now, Miss Greengrass." ("open", "base", "base", "L")
|
||||
ast "..." ("annoyed", "base", "base", "down")
|
||||
|
||||
@ -906,7 +906,7 @@ label hermione_breaks_astoria:
|
||||
gen "How many?" ("base", xpos="far_left", ypos="head")
|
||||
her "At least a hundred."
|
||||
gen "One hundred points to Gryffindor then!" ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 100
|
||||
$ states.env.gryffindor += 100
|
||||
her "Thank you, [genie_name]."
|
||||
">With that, Hermione unparalyses the dazed Slytherin before leading her out of your office and back to her dorm."
|
||||
jump main_room
|
||||
|
||||
@ -196,13 +196,13 @@ label cc_pf_strip_T2_E3_hermione_choices:
|
||||
|
||||
menu:
|
||||
"\"Ten points to Gryffindor!\"":
|
||||
$ gryffindor += 10
|
||||
$ states.env.gryffindor += 10
|
||||
cho "(...)" ("annoyed", "narrow", "angry", "mid")
|
||||
her "Thank you." ("soft", "narrow", "base", "mid_soft")
|
||||
|
||||
"\"Fifty points to Gryffindor!\"":
|
||||
$ states.cho.mood += 10
|
||||
$ gryffindor += 50
|
||||
$ states.env.gryffindor += 50
|
||||
cho "(Fifty?!)" ("soft", "wide", "base", "mid") # Shocked
|
||||
her "Thank you." ("soft", "narrow", "base", "mid_soft")
|
||||
cho @ cheeks heavy_blush "" ("clench", "closed", "angry", "mid")
|
||||
|
||||
@ -835,7 +835,7 @@ label cc_pf_strip_T3_intro_E2:
|
||||
sna "*Tzzzs*... by sheer luck you did." ("snape_32")
|
||||
cho @ cheeks blush "Says the one who literally gave his team liquid luck!" ("disgust", "narrow", "angry", "L")
|
||||
sna "Ten points from Ravenclaw!" ("snape_31")
|
||||
$ ravenclaw -= 10
|
||||
$ states.env.ravenclaw -= 10
|
||||
cho @ cheeks blush "{size=-4}Like I care...{/size}" ("annoyed", "narrow", "angry", "down")
|
||||
ton "Let the girl speak her mind, Severus!" ("open", "closed", "shocked", "mid")
|
||||
ton "Or shall I remind you that you were the one who barged in here uninvited..." ("open", "narrow", "base", "L")
|
||||
|
||||
@ -457,7 +457,7 @@ label .spank_cho:
|
||||
ton @ hair horny "*Hmm*..." ("annoyed", "narrow", "shocked", "down")
|
||||
ton @ hair horny "A well-behaved girl like you should be rewarded. {heart}" ("crooked_smile", "narrow", "raised", "L")
|
||||
ton @ hair horny "Ten points for Ravenclaw, Miss Chang." ("soft", "narrow", "base", "L")
|
||||
$ ravenclaw += 10
|
||||
$ states.env.ravenclaw += 10
|
||||
cho @ cheeks heavy_blush "Thank you I guess--" ("crooked_smile", "narrow", "worried", "R")
|
||||
ton @ hair horny "" ("horny", "narrow", "angry", "down")
|
||||
call slap_her
|
||||
@ -730,7 +730,7 @@ label .spank_tonks:
|
||||
pause .8
|
||||
|
||||
ton @ cheeks heavy_blush hair horny "Ten points for Ravenclaw." ("soft", "narrow", "base", "L")
|
||||
$ ravenclaw += 10
|
||||
$ states.env.ravenclaw += 10
|
||||
ton @ cheeks heavy_blush hair horny "For this thorough ass spanking!" ("horny", "narrow", "base", "mid")
|
||||
cho "Thank you, Professor Tonks." ("crooked_smile", "narrow", "base", "down")
|
||||
|
||||
@ -924,7 +924,7 @@ label cc_pf_strip_T3_tonks.succubus_E1:
|
||||
cho "They're demons in female form, that can visit you in your dreams and murder you!" ("soft", "narrow", "angry", "mid")
|
||||
ton "Very good, Miss Chang..." ("crooked_smile", "base", "base", "L")
|
||||
ton "Ten points for Ravenclaw!" ("soft", "narrow", "base", "L")
|
||||
$ ravenclaw += 10
|
||||
$ states.env.ravenclaw += 10
|
||||
cho @ cheeks blush "Thank you." ("smile", "narrow", "base", "downR") # happy
|
||||
|
||||
$ states.cho.ev.inspect_her_body.tonks_succubus_encounter = True
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
# ton "So be it then..."
|
||||
# ton "I'll do anything for my precious Gryffindor house!"
|
||||
# gen "Five points for Gryffindor, Miss Granger!" ("grin", xpos="far_left", ypos="head")
|
||||
# $ gryffindor += 5
|
||||
# $ states.env.gryffindor += 5
|
||||
# gen "Now strip for us, you little slut." ("angry", xpos="far_left", ypos="head")
|
||||
|
||||
# "You shall receive one hundred points!":
|
||||
|
||||
@ -761,7 +761,7 @@ label cho_intro_E3:
|
||||
if states.sna.level <= 30:
|
||||
gen "(I'm going to need to get real friendly with Snape to get those Slytherins in a steady lead...)" ("base", xpos="far_left", ypos="head")
|
||||
gen "One hundred points to Gryffindor...{w=0.6} Happy?" ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 100
|
||||
$ states.env.gryffindor += 100
|
||||
|
||||
her "If I'm truly honest with you Sir,{w=0.6} My plans weren't that popular with the Quidditch teams in any case." ("soft", "narrow", "base", "mid_soft")
|
||||
gen "I can't imagine why..." ("base", xpos="far_left", ypos="head")
|
||||
@ -777,7 +777,7 @@ label cho_intro_E3:
|
||||
her "*Tzzzz*- Fine.. Fifty points then, but I'm not happy about it..." ("angry", "base", "angry", "mid")
|
||||
gen "Fine by me..." ("base", xpos="far_left", ypos="head")
|
||||
gen "Fifty points to Gryffindor." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 50
|
||||
$ states.env.gryffindor += 50
|
||||
$ states.her.mood += 6
|
||||
her "Thanks I guess..." ("open", "closed", "angry", "mid")
|
||||
gen "You may leave now..." ("base", xpos="far_left", ypos="head")
|
||||
@ -814,7 +814,7 @@ label cho_intro_E3:
|
||||
her "(...)" ("annoyed", "narrow", "angry", "R")
|
||||
her "Very well then." ("soft", "closed", "base", "mid")
|
||||
gen "Fifty points, to the Gryffindor house..." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 50
|
||||
$ states.env.gryffindor += 50
|
||||
her "Thank you, [name_genie_hermione]." ("base", "base", "base", "mid")
|
||||
|
||||
else:
|
||||
|
||||
@ -1369,7 +1369,7 @@ label cho_quid_E12:
|
||||
cho "She was a legendary seeker, the speed and precision of her flying was unmatched." ("angry", "closed", "base", "mid")
|
||||
cho "Nobody ever managed to figure out her identity or how she managed to fly so well." ("soft", "narrow", "base", "L")
|
||||
hoo "You sure know your Quidditch history Miss Chang, ten points to Ravenclaw." ("grin", "base", "base", "L")
|
||||
$ ravenclaw += 10
|
||||
$ states.env.ravenclaw += 10
|
||||
cho "And then...{w=0.4} And then...{w=0.4} You disappeared, and became a teacher?" ("soft", "base", "raised", "L")
|
||||
hoo "Yes indeed." ("base", "shocked", "base", "L")
|
||||
cho "Wow...{w=0.4} I can't believe it." ("soft", "base", "base", "mid")
|
||||
|
||||
@ -719,8 +719,8 @@ label slytherin_match:
|
||||
gen "What? I'm just joking, I'm sure she'll be fine..." ("base", xpos="far_left", ypos="head")
|
||||
sna "{size=-4}10 points to Slytherin.{/size}" ("snape_38")
|
||||
gen "Did you say something--" ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 10
|
||||
$ slytherin += 10
|
||||
$ states.env.gryffindor += 10
|
||||
$ states.env.slytherin += 10
|
||||
|
||||
|
||||
ton @ hair angry "Quiet!" ("mad", "base", "angry", "L")
|
||||
|
||||
@ -10,7 +10,7 @@ label hg_wager_bj:
|
||||
her "No! what kind of girl do you take me for, [name_genie_hermione]!" ("scream", "base", "angry", "mid")
|
||||
gen "Fine... Twenty points, deducted from Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
her "*Hmph*!" ("angry", "base", "angry", "mid")
|
||||
$ gryffindor -= 20
|
||||
$ states.env.gryffindor -= 20
|
||||
pause.5
|
||||
call her_chibi("leave","door","base")
|
||||
else:
|
||||
@ -72,7 +72,7 @@ label hg_wager_bj:
|
||||
sna "How sweet..." (face="snape_03")
|
||||
her "May I leave now?" ("annoyed", "narrow", "worried", "down", flip=True)
|
||||
gen "You are excused, Miss Granger... But I will be taking twenty points from Gryffindor." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor -= 20
|
||||
$ states.env.gryffindor -= 20
|
||||
|
||||
call her_walk(action="leave")
|
||||
|
||||
@ -99,7 +99,7 @@ label hg_wager_bj:
|
||||
with d1
|
||||
gen "I'll only deduct ten points from Gryffindor, as we agreed." ("base", xpos="far_left", ypos="head")
|
||||
gen "Ten points deducted from Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor -= 10
|
||||
$ states.env.gryffindor -= 10
|
||||
call blkfade
|
||||
call her_chibi("stand","mid","base")
|
||||
call gen_chibi("sit_behind_desk")
|
||||
@ -543,7 +543,7 @@ label hg_wager_bj:
|
||||
"-Only deduct the twenty points-":
|
||||
gen "You should be happy that I'm not deducting more!" ("angry", xpos="far_left", ypos="head")
|
||||
gen "Twenty points deduced from Gryffindor!" ("angry", xpos="far_left", ypos="head")
|
||||
$ gryffindor -= 20
|
||||
$ states.env.gryffindor -= 20
|
||||
her "..." ("disgust", "base", "angry", "mid")
|
||||
her "Whatever..." ("open", "closed", "angry", "mid")
|
||||
$ states.her.mood += 15
|
||||
@ -551,7 +551,7 @@ label hg_wager_bj:
|
||||
gen "Oh, don't you worry..." ("base", xpos="far_left", ypos="head")
|
||||
her "..."
|
||||
gen "Forty points deducted from Gryffindor!" ("angry", xpos="far_left", ypos="head")
|
||||
$ gryffindor -= 40
|
||||
$ states.env.gryffindor -= 40
|
||||
her "What?! You can't do that!" ("shock", "wide", "worried", "stare")
|
||||
gen "Of course I can, I'm the headmaster!" ("angry", xpos="far_left", ypos="head")
|
||||
her "I can't believe you've done this..." ("mad", "base", "angry", "mid")
|
||||
@ -609,7 +609,7 @@ label hg_wager_bj:
|
||||
gen "Points?" ("angry", xpos="far_left", ypos="head")
|
||||
gen "Oh yes, the points!" ("grin", xpos="far_left", ypos="head")
|
||||
gen "Twenty points to Gryffindor!" ("grin", xpos="far_left", ypos="head")
|
||||
$ gryffindor += 20
|
||||
$ states.env.gryffindor += 20
|
||||
her "That's not--" ("normal", "narrow", "base", "down")
|
||||
her "Thank you, [name_genie_hermione]..." ("open", "closed", "base", "mid")
|
||||
if states.env.daytime:
|
||||
@ -654,7 +654,7 @@ label hg_wager_bj:
|
||||
her "..." ("upset", "narrow", "worried", "down")
|
||||
her "Fine..." ("clench", "narrow", "annoyed", "mid")
|
||||
gen "Twenty points deducted from Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor -= 20
|
||||
$ states.env.gryffindor -= 20
|
||||
$ states.her.mood += 10
|
||||
|
||||
$ states.her.status.blowjob = True
|
||||
|
||||
@ -44,7 +44,7 @@ label end_hg_pf_handjob:
|
||||
if states.her.tier <= 5:
|
||||
gen "Here you go, [name_hermione_genie]... {number=current_payout} points to Gryffindor." ("base", xpos="far_left", ypos="head")
|
||||
gen "You may leave now." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
else:
|
||||
gen "You may leave now, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ label end_hg_pf_titjob:
|
||||
# Points
|
||||
if states.her.tier <= 5:
|
||||
gen "{number=current_payout} points to Gryffindor." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
else:
|
||||
gen "You may leave now, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ label end_hg_pf_grope:
|
||||
|
||||
# Points
|
||||
if states.her.tier <= 5:
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
gen "The Gryffindor house gets {number=current_payout} points!" ("base", xpos="far_left", ypos="head")
|
||||
else:
|
||||
gen "You may leave now, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
@ -197,7 +197,7 @@ label hg_pf_grope_ass_T2_back:
|
||||
gen "(Acting all wounded now...)" ("base", xpos="far_left", ypos="head")
|
||||
gen "(I bet she actually enjoyed the slapping and just won't admit it...)" ("grin", xpos="far_left", ypos="head")
|
||||
|
||||
$ gryffindor -=10
|
||||
$ states.env.gryffindor -=10
|
||||
$ states.her.mood += 30
|
||||
|
||||
jump end_hermione_event
|
||||
@ -502,7 +502,7 @@ label hg_pf_grope_ass_T3_mad:
|
||||
menu:
|
||||
gen "(...)" ("base", xpos="far_left", ypos="head")
|
||||
"\"Alright, alright... One hundred points it is...\"":
|
||||
$ gryffindor += 100
|
||||
$ states.env.gryffindor += 100
|
||||
$ states.her.mood += 9
|
||||
|
||||
gen "One hundred points to Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
|
||||
@ -982,7 +982,7 @@ label end_hg_show_ass:
|
||||
if current_payout < 100:
|
||||
$ her_mood +=7
|
||||
|
||||
$ gryffindor +=current_payout
|
||||
$ states.env.gryffindor +=current_payout
|
||||
gen "The Gryffindor house gets {number=current_payout} points!" ("base", xpos="far_left", ypos="head")
|
||||
stop music fadeout 10.0
|
||||
|
||||
|
||||
@ -49,7 +49,7 @@ label end_hg_pf_sex:
|
||||
|
||||
# Points
|
||||
gen "Alright then, [name_hermione_genie]. {number=current_payout} points to the Gryffindor house." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
her @ cheeks blush "Thank you, [name_genie_hermione]..." ("open", "base", "base", "R")
|
||||
|
||||
# Hermione leaves
|
||||
@ -224,7 +224,7 @@ label hg_pf_sex_T6_intro_E1:
|
||||
her "I am not a prostitute!"
|
||||
gen "But you'll do it anyway??" ("base", xpos="far_left", ypos="head")
|
||||
|
||||
if not is_in_lead(gryffindor):
|
||||
if not is_in_lead(states.env.gryffindor):
|
||||
her "Gryffindor is falling behind again..." ("open", "closed", "base", "mid")
|
||||
else:
|
||||
her "I have to make sure Gryffindor stays in the lead..." ("open", "closed", "base", "mid")
|
||||
|
||||
@ -45,7 +45,7 @@ label end_hg_pf_admire_panties:
|
||||
|
||||
# If Hermione is at tier 4+, she does not care about points.
|
||||
if states.her.tier < 4 and current_payout > 0:
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
gen "{number=current_payout} points to Gryffindor, [name_hermione_genie]. Well done." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
if not _events_completed_any: # First time
|
||||
@ -585,7 +585,7 @@ label hg_pf_admire_panties_T4_intro_E1:
|
||||
gen "Ten additional points to Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
her "Thank you, [name_genie_hermione]!" ("base", "happyCl", "worried", "mid")
|
||||
|
||||
$ gryffindor+= 10
|
||||
$ states.env.gryffindor+= 10
|
||||
|
||||
call ctc
|
||||
|
||||
@ -680,7 +680,7 @@ label hg_pf_admire_panties_T4_E1:
|
||||
gen "Ten additional points to Gryffindor!" ("base", xpos="far_left", ypos="head")
|
||||
her "Thank you, [name_genie_hermione]!" ("base", "happyCl", "worried", "mid")
|
||||
|
||||
$ gryffindor+= 10
|
||||
$ states.env.gryffindor+= 10
|
||||
|
||||
call ctc
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ label end_hg_pf_admire_breasts:
|
||||
her "" ("base", "narrow", "annoyed", "up", xpos="mid", ypos="base", trans=fade)
|
||||
|
||||
# Points
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
gen "The Gryffindor house gets {number=current_payout} points!" ("base", xpos="far_left", ypos="head")
|
||||
stop music fadeout 10.0
|
||||
|
||||
|
||||
@ -50,7 +50,7 @@ label end_hg_pf_blowjob:
|
||||
|
||||
if states.her.tier < 6:
|
||||
gen "{number=current_payout} points to Gryffindor." ("base", xpos="far_left", ypos="head")
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
else:
|
||||
gen "You may go now, [name_hermione_genie]." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
@ -1397,7 +1397,7 @@ label hg_hidden_blowjob_tonks:
|
||||
|
||||
call her_chibi_scene("bj_pause", trans=d5)
|
||||
ton "Sixty-nine points!" ("grin", "wide", "base", "mid")
|
||||
$ gryffindor += 69
|
||||
$ states.env.gryffindor += 69
|
||||
|
||||
her "(Sixty-nine! That's even more than she offered before!)" ("shock", "wide", "base", "up")
|
||||
gen "Didn't you say fifty, earlier?" ("angry", xpos="far_left", ypos="head")
|
||||
|
||||
@ -32,7 +32,7 @@ label end_hg_pf_talk:
|
||||
|
||||
# Points
|
||||
if states.her.tier <= 3:
|
||||
$ gryffindor += current_payout
|
||||
$ states.env.gryffindor += current_payout
|
||||
gen "{number=current_payout} points to Gryffindor, [name_hermione_genie]. Well done." ("base", xpos="far_left", ypos="head")
|
||||
elif states.her.tier == 4 and not _events_filtered_completed_any:
|
||||
gen "{number=current_payout} points to Gryff--" ("base", xpos="far_left", ypos="head")
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user