diff --git a/game/scripts/characters/tonks/events/hangout.rpy b/game/scripts/characters/tonks/events/hangout.rpy index 08c20e62..bf18e31c 100644 --- a/game/scripts/characters/tonks/events/hangout.rpy +++ b/game/scripts/characters/tonks/events/hangout.rpy @@ -11,7 +11,7 @@ label tonks_hangout: if firewhisky_ITEM.owned >= 1: $ firewhisky_ITEM.owned -= 1 - $ nt_he_drink.start() + $ ton_eventqueue_hangouts_drinking.start() label tonks_hangout_continue: hide screen bld1 @@ -47,8 +47,7 @@ label tonks_hangout: ### Snape Stories ### - if not nt_he_story.is_complete(): - $ nt_he_story.start() + $ ton_eventqueue_hangouts_story.start() label end_tonks_hangout: @@ -110,6 +109,7 @@ label nt_he_wine_intro: # Make firewhisky available in the cupboard and store $ firewhisky_ITEM.unlocked = True + $ states.ton.ev.hangouts.wine_intro = True jump tonks_hangout_continue @@ -289,7 +289,7 @@ label nt_he_story_intro_E1: else: ton "Anyway, I think I'm gonna go hit the sack." ("open", "base", "base", "R") - if nt_he_drink.is_event_complete(1, 2): # We're past the wine intro + if _events_completed_any: # We're past the wine intro gen "There's more firewhisky where this came from, so feel free to stop by any time to talk about your progress." ("base", xpos="far_left", ypos="head") ton "I'll never say no to a free drink." ("base", "base", "base", "down") else: @@ -638,115 +638,3 @@ label nt_he_story_E12: gen "(...)" ("base", xpos="far_left", ypos="head") jump end_tonks_hangout - - - -### Centaur Story ### - -# Will be something other than a hangout event as you can't have a jerk-off interaction during them. -# Substitute Teacher for Care for Magical Creatures maybe? - -label nt_he_story_centaur: # Not in use. - ton "..." ("upset", "base", "worried", "mid") - ton "Very well, Professor.{w} I think I can make an exception for you." ("open", "base", "base", "R") - gen "And spare no details." ("grin", xpos="far_left", ypos="head") - ton "I have your word that you will not tell a soul about any of this?" ("open", "base", "base", "mid") - gen "Yes... now tell me!" ("angry", xpos="far_left", ypos="head") - - ton "Very well..." ("upset", "base", "worried", "down") - ton "First you should know, there aren't many witches that could take on and calm a large group of wild centaurs..." ("open", "base", "worried", "mid") - ton "Most would foolishly try to intimidate or threaten them, and rely on their wands and spells to keep them at bay, which would only make matters worse..." ("open", "base", "worried", "R") - ton "But that's not how I handle \"conflict\" with those beastly creatures..." ("base", "base", "base", "mid") - gen "Yes?!" ("grin", xpos="far_left", ypos="head") - gen "(I like where this is going!)" ("base", xpos="far_left", ypos="head") - - nar "*Fap!* *Fap!* *Fap!*" - ton "Centaurs don't do well with Ministry personnel{w} Even less so with female witches, such as myself..." ("open", "base", "raised", "mid") - ton "Making them a compelling offer, so they'd peacefully return to their assigned territory was quite...{w} challenging {heart}" ("horny", "base", "base", "R") - gen "Go on..." ("angry", xpos="far_left", ypos="head") - ton "All I did was giving them a small favour.{w} A little service the Ministry would never even think of providing them with." ("mad", "base", "worried", "down") - ton "But I did it anyway..." ("base", "base", "angry", "mid") - gen "*Argh!* What did you do?" ("angry", xpos="far_left", ypos="head") - ton "Well, I simply helped them release some of their stored up tension..." ("open", "base", "base", "R") - ton "And stroked their manhoods with my hands..." ("horny", "base", "base", "mid") - - gen "Yes! How filthy!" ("grin", xpos="far_left", ypos="head") - ton "*Hmph?!* You believe what I did was filthy, Professor?!" ("base", "wide", "shocked", "stare") - ton "*Ehm*... I mean, it depends on how you look at it..." ("upset", "base", "worried", "down") - ton "It's by far the simplest way to calm down a group of wild centaurs..." ("open", "base", "worried", "R") - ton "As far as I could tell, they didn't have any females within their group..." ("open", "base", "base", "mid") - ton "You can imagine the amount of tension that gets built up as a result of that..." ("mad", "base", "base", "mid") - ton @ hair horny "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao") # ahegao - gen "So your idea was to jerk them off?" ("base", xpos="far_left", ypos="head") - - ton "Well, yes.{w} They can't easily reach around to do it themselves now, can they?" ("horny", "base", "base", "mid") - gen "(Those poor bastards!)" ("base", xpos="far_left", ypos="head") - - gen "Must have been a real...{w}*argh*!- relief for them!" ("angry", xpos="far_left", ypos="head") - ton "I believe so too, Sir." ("base", "base", "base", "mid") - ton @ hair horny "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid") - gen "*Agh!* Fuck! I'm getting close..." ("angry", xpos="far_left", ypos="head") - ton "Most of the Ministry view Centaurs as \"lesser\" beings... As animals." ("open", "base", "base", "R") - ton "But not me. To me, they're all powerful, and magnificent creatures." ("base", "base", "angry", "mid") - ton "And it's known that above all they embody strength, dominance, and lust..." ("open", "base", "base", "mid") - ton @ hair horny "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao") # Ahegao - - #Genie cums - stop music fadeout 1.0 - gen "Yes! Here it comes!" ("angry", xpos="far_left", ypos="head") - - call cum_block - call gen_chibi("cum_behind_desk") - with d3 - pause 1 - - ton @ hair horny "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R") - - call cum_block - gen "*Argh* You horse-cock-loving whore!" ("base", xpos="far_left", ypos="head") - ton "I have to say, Professor, now that I've told you.{w} I feel quite embarrassed about it!" ("mad", "closed", "worried", "mid") - - call cum_block - gen "You dirty slut!" ("angry", xpos="far_left", ypos="head") - - ton @ hair horny "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L") - ton @ hair horny "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao") - - call hide_characters - hide screen bld1 - with d3 - - call gen_chibi("cum_behind_desk_done") - with d3 - pause.5 - - call bld - gen "(Fuck me, that felt great!)" ("angry", xpos="far_left", ypos="head") - - ton "A remarkable wizard such as yourself would never even consider solutions of such..." ("open", "base", "base", "mid") - ton @ hair horny "Depravity..." ("horny", "base", "base", "R") - gen "Are you asking me whether or not I'd jerk off a Centaur?..." ("base", xpos="far_left", ypos="head") - gen "Because that would be a clear \"no\" from me..." ("base", xpos="far_left", ypos="head") - - ton "Professor, I've never told anybody about my experiences as an Auror..." ("mad", "base", "worried", "down") - gen "Are there more \"experiences\" you could tell me about?" ("base", xpos="far_left", ypos="head") - ton "Well... I have been an Auror for quite a while now, so... I do have a couple." ("open", "base", "worried", "R") - gen "Great! I'd love to hear them!" ("grin", xpos="far_left", ypos="head") - - jump end_tonks_hangout - - - #(Not in use. Can be written into a Hangout event.) - #ton "In fact I caught one of your teachers engaged in rather...{w=0.3} adulterous activities with a couple of students." - #gen "A couple...{w} Like, at the same time?" ("base", xpos="far_left", ypos="head") - #ton "Panty pictures!" - #gen "What!" ("base", xpos="far_left", ypos="head") - #ton "Well, I'm fine with any photographs really, ankles, butts, underwear..." - #gen "I see...{nw}" ("base", xpos="far_left", ypos="head") - #ton "Feet!" - #gen "Feet?" ("angry", xpos="far_left", ypos="head") - #ton "Well, anything I can get really." - #gen "(This lady's a pervert...)" ("base", xpos="far_left", ypos="head") - #ton "There seems to be a great opportunity here..." - #gen "I'd rather keep my shoes on thank you!" ("base", xpos="far_left", ypos="head") - #ton "Not that, silly." diff --git a/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt b/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt new file mode 100644 index 00000000..a4866f36 --- /dev/null +++ b/game/scripts/characters/tonks/events/hangout_stories_NOT_IN_USE.txt @@ -0,0 +1,111 @@ + + +### Centaur Story ### + +# Will be something other than a hangout event as you can't have a jerk-off interaction during them. +# Substitute Teacher for Care for Magical Creatures maybe? + +# label nt_he_story_centaur: # Not in use. +# ton "..." ("upset", "base", "worried", "mid") +# ton "Very well, Professor.{w} I think I can make an exception for you." ("open", "base", "base", "R") +# gen "And spare no details." ("grin", xpos="far_left", ypos="head") +# ton "I have your word that you will not tell a soul about any of this?" ("open", "base", "base", "mid") +# gen "Yes... now tell me!" ("angry", xpos="far_left", ypos="head") + +# ton "Very well..." ("upset", "base", "worried", "down") +# ton "First you should know, there aren't many witches that could take on and calm a large group of wild centaurs..." ("open", "base", "worried", "mid") +# ton "Most would foolishly try to intimidate or threaten them, and rely on their wands and spells to keep them at bay, which would only make matters worse..." ("open", "base", "worried", "R") +# ton "But that's not how I handle \"conflict\" with those beastly creatures..." ("base", "base", "base", "mid") +# gen "Yes?!" ("grin", xpos="far_left", ypos="head") +# gen "(I like where this is going!)" ("base", xpos="far_left", ypos="head") + +# nar "*Fap!* *Fap!* *Fap!*" +# ton "Centaurs don't do well with Ministry personnel{w} Even less so with female witches, such as myself..." ("open", "base", "raised", "mid") +# ton "Making them a compelling offer, so they'd peacefully return to their assigned territory was quite...{w} challenging {heart}" ("horny", "base", "base", "R") +# gen "Go on..." ("angry", xpos="far_left", ypos="head") +# ton "All I did was giving them a small favour.{w} A little service the Ministry would never even think of providing them with." ("mad", "base", "worried", "down") +# ton "But I did it anyway..." ("base", "base", "angry", "mid") +# gen "*Argh!* What did you do?" ("angry", xpos="far_left", ypos="head") +# ton "Well, I simply helped them release some of their stored up tension..." ("open", "base", "base", "R") +# ton "And stroked their manhoods with my hands..." ("horny", "base", "base", "mid") + +# gen "Yes! How filthy!" ("grin", xpos="far_left", ypos="head") +# ton "*Hmph?!* You believe what I did was filthy, Professor?!" ("base", "wide", "shocked", "stare") +# ton "*Ehm*... I mean, it depends on how you look at it..." ("upset", "base", "worried", "down") +# ton "It's by far the simplest way to calm down a group of wild centaurs..." ("open", "base", "worried", "R") +# ton "As far as I could tell, they didn't have any females within their group..." ("open", "base", "base", "mid") +# ton "You can imagine the amount of tension that gets built up as a result of that..." ("mad", "base", "base", "mid") +# ton @ hair horny "(Inside those heavy, cum-filled balls!)" ("horny", "base", "base", "ahegao") # ahegao +# gen "So your idea was to jerk them off?" ("base", xpos="far_left", ypos="head") + +# ton "Well, yes.{w} They can't easily reach around to do it themselves now, can they?" ("horny", "base", "base", "mid") +# gen "(Those poor bastards!)" ("base", xpos="far_left", ypos="head") + +# gen "Must have been a real...{w}*argh*!- relief for them!" ("angry", xpos="far_left", ypos="head") +# ton "I believe so too, Sir." ("base", "base", "base", "mid") +# ton @ hair horny "You should know, I never shy away from getting my hands dirty!" ("horny", "base", "raised", "mid") +# gen "*Agh!* Fuck! I'm getting close..." ("angry", xpos="far_left", ypos="head") +# ton "Most of the Ministry view Centaurs as \"lesser\" beings... As animals." ("open", "base", "base", "R") +# ton "But not me. To me, they're all powerful, and magnificent creatures." ("base", "base", "angry", "mid") +# ton "And it's known that above all they embody strength, dominance, and lust..." ("open", "base", "base", "mid") +# ton @ hair horny "(And they are so{w} fucking{w} hung!!!)" ("horny", "base", "base", "ahegao") # Ahegao + +# #Genie cums +# stop music fadeout 1.0 +# gen "Yes! Here it comes!" ("angry", xpos="far_left", ypos="head") + +# call cum_block +# call gen_chibi("cum_behind_desk") +# with d3 +# pause 1 + +# ton @ hair horny "For a Ministry person to submit the way I did was quite the shock to them..." ("open", "base", "raised", "R") + +# call cum_block +# gen "*Argh* You horse-cock-loving whore!" ("base", xpos="far_left", ypos="head") +# ton "I have to say, Professor, now that I've told you.{w} I feel quite embarrassed about it!" ("mad", "closed", "worried", "mid") + +# call cum_block +# gen "You dirty slut!" ("angry", xpos="far_left", ypos="head") + +# ton @ hair horny "(I'd better not tell him what I had to do for their chieftain...)" ("mad", "base", "worried", "L") +# ton @ hair horny "(I can still taste him) {heart} {heart} {heart}" ("horny", "base", "base", "ahegao") + +# call hide_characters +# hide screen bld1 +# with d3 + +# call gen_chibi("cum_behind_desk_done") +# with d3 +# pause.5 + +# call bld +# gen "(Fuck me, that felt great!)" ("angry", xpos="far_left", ypos="head") + +# ton "A remarkable wizard such as yourself would never even consider solutions of such..." ("open", "base", "base", "mid") +# ton @ hair horny "Depravity..." ("horny", "base", "base", "R") +# gen "Are you asking me whether or not I'd jerk off a Centaur?..." ("base", xpos="far_left", ypos="head") +# gen "Because that would be a clear \"no\" from me..." ("base", xpos="far_left", ypos="head") + +# ton "Professor, I've never told anybody about my experiences as an Auror..." ("mad", "base", "worried", "down") +# gen "Are there more \"experiences\" you could tell me about?" ("base", xpos="far_left", ypos="head") +# ton "Well... I have been an Auror for quite a while now, so... I do have a couple." ("open", "base", "worried", "R") +# gen "Great! I'd love to hear them!" ("grin", xpos="far_left", ypos="head") + +# jump end_tonks_hangout + + +# #(Not in use. Can be written into a Hangout event.) +# #ton "In fact I caught one of your teachers engaged in rather...{w=0.3} adulterous activities with a couple of students." +# #gen "A couple...{w} Like, at the same time?" ("base", xpos="far_left", ypos="head") +# #ton "Panty pictures!" +# #gen "What!" ("base", xpos="far_left", ypos="head") +# #ton "Well, I'm fine with any photographs really, ankles, butts, underwear..." +# #gen "I see...{nw}" ("base", xpos="far_left", ypos="head") +# #ton "Feet!" +# #gen "Feet?" ("angry", xpos="far_left", ypos="head") +# #ton "Well, anything I can get really." +# #gen "(This lady's a pervert...)" ("base", xpos="far_left", ypos="head") +# #ton "There seems to be a great opportunity here..." +# #gen "I'd rather keep my shoes on thank you!" ("base", xpos="far_left", ypos="head") +# #ton "Not that, silly." diff --git a/game/scripts/characters/tonks/hangouts.rpy b/game/scripts/characters/tonks/hangouts.rpy index 2484ab02..2c732a93 100644 --- a/game/scripts/characters/tonks/hangouts.rpy +++ b/game/scripts/characters/tonks/hangouts.rpy @@ -1,36 +1,20 @@ -default nt_he_drink = event_class( - title = "Tonks Firewhisky", start_label = "tonks_hangout", - events = [ - [ - ["nt_he_wine_intro"], - ["nt_he_firewhisky_intro"], - ["nt_he_firewhisky_E1"], - ["nt_he_firewhisky_E2"], - ["nt_he_firewhisky_E3"], - ["nt_he_firewhisky_E4"] - ] - ], - iconset = [["star_empty", "star_pink"]] # You have to add icons at least for first tier, the rest will be copied over automatically. -) +default ton_ev_hangouts_wine_intro = Event(id="ton_ev_hangouts_wine_intro", label="nt_he_wine_intro", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") +default ton_ev_hangouts_firewhisky_intro = Event(id="ton_ev_hangouts_firewhisky_intro", label="nt_he_firewhisky_intro", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") +default ton_ev_hangouts_firewhisky_e1 = Event(id="ton_ev_hangouts_firewhisky_e1", label="nt_he_firewhisky_E1", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") +default ton_ev_hangouts_firewhisky_e2 = Event(id="ton_ev_hangouts_firewhisky_e2", label="nt_he_firewhisky_E2", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") +default ton_ev_hangouts_firewhisky_e3 = Event(id="ton_ev_hangouts_firewhisky_e3", label="nt_he_firewhisky_E3", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") +default ton_ev_hangouts_firewhisky_e4 = Event(id="ton_ev_hangouts_firewhisky_e4", label="nt_he_firewhisky_E4", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_drinking") -default nt_he_story = event_class( - title = "Tonks Stories", start_label = "tonks_hangout", - events = [ - [ - ["nt_he_story_intro_E1"], # Intro - ["nt_he_story_intro_E2"], # Moody - ["nt_he_story_intro_E3"], # Brooms and flying carpets - ["nt_he_story_intro_E4"], # Turning water into wine - ["nt_he_story_intro_E5"], # Lots of paperwork - ["nt_he_story_E6"], # Vampire story - ["nt_he_story_intro_E7"], # Moody's teaching methods - ["nt_he_story_E8"], # Werewold story - ["nt_he_story_intro_E9"], # Illegal love potion - ["nt_he_story_intro_E10"], # Dumb game mechanics - ["nt_he_story_E11"], # Metamorphmagi - ["nt_he_story_E12"] # Invisible clothing charm - ] - ], - iconset = [["star_empty", "star_pink"]] # You have to add icons at least for first tier, the rest will be copied over automatically. -) +default ton_ev_hangouts_story_e1 = Event(id="ton_ev_hangouts_story_e1", label="nt_he_story_intro_E1", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e2 = Event(id="ton_ev_hangouts_story_e2", label="nt_he_story_intro_E2", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e3 = Event(id="ton_ev_hangouts_story_e3", label="nt_he_story_intro_E3", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e4 = Event(id="ton_ev_hangouts_story_e4", label="nt_he_story_intro_E4", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e5 = Event(id="ton_ev_hangouts_story_e5", label="nt_he_story_intro_E5", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e6 = Event(id="ton_ev_hangouts_story_e6", label="nt_he_story_E6", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e7 = Event(id="ton_ev_hangouts_story_e7", label="nt_he_story_intro_E7", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e8 = Event(id="ton_ev_hangouts_story_e8", label="nt_he_story_E8", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e9 = Event(id="ton_ev_hangouts_story_e9", label="nt_he_story_intro_E9", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e10 = Event(id="ton_ev_hangouts_story_e10", label="nt_he_story_intro_E10", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e11 = Event(id="ton_ev_hangouts_story_e11", label="nt_he_story_E11", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") +default ton_ev_hangouts_story_e12 = Event(id="ton_ev_hangouts_story_e12", label="nt_he_story_E12", autoenqueue=True, autodequeue=False, repeat=False, queue="ton_eventqueue_hangouts_story") diff --git a/game/scripts/characters/tonks/summon.rpy b/game/scripts/characters/tonks/summon.rpy index 6dfe9571..d3953977 100644 --- a/game/scripts/characters/tonks/summon.rpy +++ b/game/scripts/characters/tonks/summon.rpy @@ -39,14 +39,14 @@ label summon_tonks: jump tonks_favor_menu # Fireplace Chats - "-Let's hang-" (icon="interface/icons/small/toast.webp") if (wine_ITEM.owned > 0 and nt_he_drink.counter == 0) or (firewhisky_ITEM.owned > 0 and nt_he_drink.counter > 0): + "-Let's hang-" (icon="interface/icons/small/toast.webp") if (wine_ITEM.owned > 0 and not states.ton.ev.hangouts.wine_intro) or firewhisky_ITEM.owned > 0: jump tonks_hangout - "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if (firewhisky_ITEM.owned < 1 and nt_he_drink.counter > 0): + "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if (firewhisky_ITEM.owned < 1 and states.ton.ev.hangouts.wine_intro): gen "(I don't have any firewhisky...)" ("base", xpos="far_left", ypos="head") jump tonks_requests - "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if (wine_ITEM.owned < 1 and nt_he_drink.counter == 0): + "-Let's hang-" (icon="interface/icons/small/toast.webp", style="disabled") if (wine_ITEM.owned < 1 and not states.ton.ev.hangouts.wine_intro): gen "(I don't have any wine...)" ("base", xpos="far_left", ypos="head") jump tonks_requests diff --git a/game/scripts/characters/tonks/vars.rpy b/game/scripts/characters/tonks/vars.rpy index f4ab6e26..cfe6ad35 100644 --- a/game/scripts/characters/tonks/vars.rpy +++ b/game/scripts/characters/tonks/vars.rpy @@ -29,6 +29,7 @@ default states.ton.ev.hangouts.favors_e2 = False default states.ton.ev.random_strip.complete = False default states.ton.ev.oral_practice.completed_once = False default states.ton.ev.hands_on_lessons.completed_once = False +default states.ton.ev.hangouts.wine_intro = False default ton_level_up = None