Cho's Public Requests
* Converted Cho's public requests into the new system, and cleaned up relevant code.
This commit is contained in:
parent
a380696421
commit
a54b056ab7
@ -80,7 +80,7 @@ label cc_pf_blowjob_T3_intro_E1:
|
||||
gen "So, as your coach, it's my responsibility to prepare you!" ("base", xpos="far_left", ypos="head")
|
||||
cho "And a blowjob is necessary for this?" ("angry", "narrow", "raised", "mid")
|
||||
|
||||
if cc_pr_spy_girls.is_event_complete(3, 1):
|
||||
if states.cho.ev.spy_on_girls.t3_e1_complete:
|
||||
gen "You've seen the girls on the Gryffindor team... You think they would hesitate with something as simple as a blowjob?" ("base", xpos="far_left", ypos="head")
|
||||
cho @ cheeks blush "..." ("disgust", "closed", "base", "down") #Pout
|
||||
gen "I see how it is..." ("base", xpos="far_left", ypos="head")
|
||||
|
||||
@ -1240,7 +1240,7 @@ label slytherin_match:
|
||||
|
||||
cra "She's showing us her ass! That luck potion Snape gave us really is working!"
|
||||
|
||||
if cc_pr_manipulate_boys.is_event_complete(2, 4):
|
||||
if states.cho.ev.manipulate_boys.t2_e4_complete:
|
||||
goy "Looks like this little Ravenclaw slut has come back for more, Crabbe."
|
||||
cra "Of course she has Goyle, they've got nothing but wimps in that house of hers."
|
||||
cho "Oh yes, let me see those muscly arms of yours..."
|
||||
|
||||
@ -290,7 +290,7 @@ label cho_training:
|
||||
|
||||
cho @ cheeks blush "What is this plan of yours based on?" ("soft", "narrow", "base", "down")
|
||||
|
||||
if cc_pr_manipulate_girls.is_complete(): # has completed "Manipulate the girls!" public request?
|
||||
if states.cho.ev.manipulate_girls.t3_e4_complete: # has completed "Manipulate the girls!" public request?
|
||||
gen "The girls on the Gryffindor team sure seem fond of you. If you could get close to them, then I'm sure they'll lose focus on the game." ("base", xpos="far_left", ypos="head")
|
||||
cho @ cheeks blush "Maybe so, but that doesn't solve one important issue..." ("open", "base", "raised", "mid")
|
||||
else:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -7,10 +7,10 @@ label cc_pr_spy_boys_start:
|
||||
|
||||
cho "" (xpos="right", ypos="base", trans=fade)
|
||||
|
||||
if not cc_pr_spy_boys.is_event_complete(3, 1): # Completed spying on the Weasley Twins?
|
||||
if not states.cho.ev.spy_on_boys.t3_e1_complete: # Completed spying on the Weasley Twins?
|
||||
# Weasley Twins - handing over candies that turn people into blueberries
|
||||
|
||||
if not cc_pr_spy_girls.is_event_complete(3, 1):
|
||||
if not states.cho.ev.spy_on_girls.t3_e1_complete:
|
||||
# Player has not spied on girls just yet.
|
||||
|
||||
gen "Time to target the boys for a classic espionage mission C." ("base", xpos="far_left", ypos="head")
|
||||
@ -67,7 +67,7 @@ label cc_pr_spy_boys_start:
|
||||
gen "Report back to me this evening as usual B!" ("grin", xpos="far_left", ypos="head")
|
||||
cho "Fine..." ("angry", "narrow", "base", "mid")
|
||||
|
||||
elif not cc_pr_spy_boys.is_event_complete(3, 2): # Completed Ron Weasley?
|
||||
elif not states.cho.ev.spy_on_boys.t3_e2_complete: # Completed Ron Weasley?
|
||||
# Spy on Ron Weasley
|
||||
|
||||
gen "Ready for some more espionage B?" ("base", xpos="far_left", ypos="head")
|
||||
@ -84,7 +84,7 @@ label cc_pr_spy_boys_start:
|
||||
gen "Quietly, make haste... quietly..." ("base", xpos="far_left", ypos="head")
|
||||
cho "As you wish..." ("base", "narrow", "base", "downR")
|
||||
|
||||
elif not cc_pr_spy_boys.is_event_complete(3, 3): # Completed Harry Potter?
|
||||
elif not states.cho.ev.spy_on_boys.t3_e3_complete: # Completed Harry Potter?
|
||||
# Spy on Harry Potter
|
||||
|
||||
gen "Ready for some more espionage B?" ("base", xpos="far_left", ypos="head")
|
||||
@ -122,20 +122,15 @@ label cc_pr_spy_boys_start:
|
||||
# Cho leaves.
|
||||
call cho_walk(action="leave")
|
||||
|
||||
$ cc_pr_spy_boys.inProgress = True
|
||||
|
||||
jump end_cho_event
|
||||
|
||||
|
||||
|
||||
### Return Events ###
|
||||
|
||||
|
||||
### Tier 3 (pre Gryffindor) ###
|
||||
|
||||
label cc_pr_spy_boys_T3_twins:
|
||||
## Weasley Twins - Blueberry candies ##
|
||||
|
||||
$ states.cho.ev.spy_on_boys.t3_e1_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
@ -187,6 +182,8 @@ label cc_pr_spy_boys_T3_twins:
|
||||
label cc_pr_spy_boys_T3_ron:
|
||||
## Ron Weasley ##
|
||||
|
||||
$ states.cho.ev.spy_on_boys.t3_e2_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
@ -225,6 +222,8 @@ label cc_pr_spy_boys_T3_ron:
|
||||
## Harry Potter ##
|
||||
label cc_pr_spy_boys_T3_harry:
|
||||
|
||||
$ states.cho.ev.spy_on_boys.t3_e3_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
|
||||
@ -7,10 +7,10 @@ label cc_pr_spy_girls_start:
|
||||
|
||||
cho "" (xpos="right", ypos="base", trans=fade)
|
||||
|
||||
if not cc_pr_spy_girls.is_event_complete(3, 1): # Completed shower event?
|
||||
if not states.cho.ev.spy_on_girls.t3_e1_complete: # Completed shower event?
|
||||
# Shower event - looking through the glory hole
|
||||
|
||||
if not cc_pr_spy_boys.is_event_complete(3, 1):
|
||||
if not states.cho.ev.spy_on_boys.t3_e1_complete:
|
||||
# Player has not spied on boys just yet.
|
||||
|
||||
gen "Time for some good old espionage!" ("base", xpos="far_left", ypos="head")
|
||||
@ -76,7 +76,7 @@ label cc_pr_spy_girls_start:
|
||||
gen "Good luck!" ("base", xpos="far_left", ypos="head")
|
||||
cho "Thanks..." ("open", "narrow", "angry", "R")
|
||||
|
||||
elif not cc_pr_spy_girls.is_event_complete(3, 2): # Completed Alicia Spinnet?
|
||||
elif not states.cho.ev.spy_on_girls.t3_e2_complete: # Completed Alicia Spinnet?
|
||||
# Spy on Alicia Spinnet
|
||||
|
||||
gen "Ready for some more espionage, B?" ("base", xpos="far_left", ypos="head")
|
||||
@ -93,7 +93,7 @@ label cc_pr_spy_girls_start:
|
||||
gen "Off you go, and good luck!" ("base", xpos="far_left", ypos="head")
|
||||
cho "Thanks, [name_genie_cho]." ("base", "base", "base", "mid")
|
||||
|
||||
elif not cc_pr_spy_girls.is_event_complete(3, 3): # Completed Katie Bell?
|
||||
elif not states.cho.ev.spy_on_girls.t3_e3_complete: # Completed Katie Bell?
|
||||
# Spy on Katie Bell
|
||||
|
||||
gen "Ready for some more espionage, B?" ("base", xpos="far_left", ypos="head")
|
||||
@ -118,11 +118,10 @@ label cc_pr_spy_girls_start:
|
||||
gen "(Damn, she must've not heard me...)" ("base", xpos="far_left", ypos="head")
|
||||
|
||||
# End early, cho already left!
|
||||
$ cc_pr_spy_girls.inProgress = True
|
||||
|
||||
jump end_cho_event
|
||||
|
||||
elif not cc_pr_spy_girls.is_event_complete(3, 4): # Completed Angelina Johnson?
|
||||
elif not states.cho.ev.spy_on_girls.t3_e4_complete: # Completed Angelina Johnson?
|
||||
# Spy on Angelina Johnson
|
||||
|
||||
gen "Ready for some more espionage, B?" ("base", xpos="far_left", ypos="head")
|
||||
@ -159,20 +158,15 @@ label cc_pr_spy_girls_start:
|
||||
# Cho leaves.
|
||||
call cho_walk(action="leave")
|
||||
|
||||
$ cc_pr_spy_girls.inProgress = True
|
||||
|
||||
jump end_cho_event
|
||||
|
||||
|
||||
|
||||
### Return Events ###
|
||||
|
||||
|
||||
### Tier 3 (pre Gryffindor) ###
|
||||
|
||||
label cc_pr_spy_girls_T3_showers:
|
||||
# Showers - looking through the glory hole
|
||||
|
||||
$ states.cho.ev.spy_on_girls.t3_e1_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
@ -221,10 +215,11 @@ label cc_pr_spy_girls_T3_showers:
|
||||
|
||||
jump end_cho_event
|
||||
|
||||
|
||||
## Alicia Spinnet ##
|
||||
label cc_pr_spy_girls_T3_alicia:
|
||||
|
||||
$ states.cho.ev.spy_on_girls.t3_e2_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
@ -318,6 +313,8 @@ label cc_pr_spy_girls_T3_alicia:
|
||||
## Katie Bell ##
|
||||
label cc_pr_spy_girls_T3_katie:
|
||||
|
||||
$ states.cho.ev.spy_on_girls.t3_e3_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
@ -389,10 +386,11 @@ label cc_pr_spy_girls_T3_katie:
|
||||
|
||||
jump end_cho_event
|
||||
|
||||
|
||||
## Angelina Johnson ##
|
||||
label cc_pr_spy_girls_T3_angelina:
|
||||
|
||||
$ states.cho.ev.spy_on_girls.t3_e4_complete = True
|
||||
|
||||
# Cho enters.
|
||||
call cho_walk(action="enter", xpos="desk", ypos="base")
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -177,17 +177,17 @@ label cho_favor_menu:
|
||||
"-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime and states.cho.requests_unlocked:
|
||||
label .requests:
|
||||
|
||||
# call tutorial("hearts")
|
||||
call tutorial("hearts")
|
||||
|
||||
# $ result = show_events_menu(cho_requests)
|
||||
$ result = show_events_menu(cho_requests)
|
||||
|
||||
# if result in ("disabled", "noncompliant"):
|
||||
# "You haven't unlocked this favor opportunity yet."
|
||||
# jump .favors
|
||||
# elif result == "exit":
|
||||
# jump cho_favor_menu
|
||||
# else:
|
||||
# $ result.start()
|
||||
if result in ("disabled", "noncompliant"):
|
||||
"You haven't unlocked this request opportunity yet."
|
||||
jump .requests
|
||||
elif result == "exit":
|
||||
jump cho_favor_menu
|
||||
else:
|
||||
$ result.start()
|
||||
|
||||
"-Never mind-":
|
||||
jump cho_requests
|
||||
|
||||
@ -45,6 +45,9 @@ default states.cho.ev.panty_thief.soaked = False
|
||||
default states.cho.ev.suck_it.variant = None # Dynamic string. Valid choices: failed, swallow, throat, points, taste.
|
||||
default states.cho.ev.inspect_her_body.tonks_doppler_encounter = False
|
||||
default states.cho.ev.inspect_her_body.tonks_succubus_encounter = False
|
||||
default states.cho.ev.inspect_her_body.T2_E3_failed = False
|
||||
default states.cho.ev.inspect_her_body.T2_E3_complete = False
|
||||
default states.cho.ev.inspect_her_body.T3_E3_complete = False
|
||||
default states.cho.ev.quidditch.e1_complete = False
|
||||
default states.cho.ev.quidditch.e2_complete = False
|
||||
default states.cho.ev.quidditch.e3_complete = False
|
||||
@ -87,10 +90,22 @@ default states.cho.ev.quiz.hint = "" # Set after reading Quidditch Book
|
||||
default states.cho.ev.talk_to_me.t1_e3_complete = False
|
||||
default states.cho.ev.talk_to_me.t2_e3_complete = False
|
||||
default states.cho.ev.talk_to_me.t3_e3_complete = False
|
||||
default states.cho.ev.inspect_her_body.T2_E3_failed = False
|
||||
default states.cho.ev.inspect_her_body.T2_E3_complete = False
|
||||
default states.cho.ev.inspect_her_body.T3_E3_complete = False
|
||||
default states.cho.ev.suck_it.T3_E3_complete = False
|
||||
default states.cho.ev.spy_on_boys.t3_e1_complete = False
|
||||
default states.cho.ev.spy_on_boys.t3_e2_complete = False
|
||||
default states.cho.ev.spy_on_boys.t3_e3_complete = False
|
||||
default states.cho.ev.spy_on_girls.t3_e1_complete = False
|
||||
default states.cho.ev.spy_on_girls.t3_e2_complete = False
|
||||
default states.cho.ev.spy_on_girls.t3_e3_complete = False
|
||||
default states.cho.ev.spy_on_girls.t3_e4_complete = False
|
||||
default states.cho.ev.manipulate_boys.t2_e4_complete = False
|
||||
default states.cho.ev.manipulate_boys.t3_e1_complete = False
|
||||
default states.cho.ev.manipulate_boys.t3_e2_complete = False
|
||||
default states.cho.ev.manipulate_boys.t3_e3_complete = False
|
||||
default states.cho.ev.manipulate_girls.t3_e1_complete = False
|
||||
default states.cho.ev.manipulate_girls.t3_e2_complete = False
|
||||
default states.cho.ev.manipulate_girls.t3_e3_complete = False
|
||||
default states.cho.ev.manipulate_girls.t3_e4_complete = False
|
||||
|
||||
# Names
|
||||
|
||||
|
||||
@ -196,12 +196,6 @@ label quests:
|
||||
|
||||
# Note: The return events now get jumped to right after the main match events.
|
||||
|
||||
python:
|
||||
for i in cc_requests_list:
|
||||
if i.inProgress:
|
||||
i.inProgress = False
|
||||
i.start()
|
||||
|
||||
$ play_potion_return("cho")
|
||||
|
||||
#
|
||||
|
||||
Loading…
Reference in New Issue
Block a user