forked from SilverStudioGames/WTS
Tonks' Public Requests
* Converted Tonks' public requests into the new system, and cleaned up relevant code. * Added missing repeat dialogue for one of the events * Added event flags
This commit is contained in:
parent
85e47dacef
commit
84760992a7
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -116,78 +116,31 @@ label tonks_favor_menu:
|
||||
jump tonks_requests
|
||||
|
||||
"-Personal Favours-" (icon="interface/icons/small/heart_red.webp", style="disabled"):
|
||||
label .favors:
|
||||
|
||||
call not_available
|
||||
jump tonks_favor_menu
|
||||
#
|
||||
# Uncomment once favours are ready
|
||||
#
|
||||
|
||||
# label .personal:
|
||||
# python:
|
||||
# menu_choices = []
|
||||
# for i in nt_favor_list:
|
||||
# if i in []: # Not in the game yet.
|
||||
# menu_choices.append(gui.menu_item("-Not available-", "na", style="disabled"))
|
||||
# elif i.start_tier > states.ton.tier:
|
||||
# menu_choices.append(gui.menu_item("-Not ready-", "vague", style="disabled"))
|
||||
# else:
|
||||
# menu_choices.append(i.get_menu_item())
|
||||
|
||||
# menu_choices.append(("-Never mind-", "nvm"))
|
||||
# result = renpy.display_menu(menu_choices)
|
||||
# if result == "nvm":
|
||||
# jump tonks_favor_menu
|
||||
# elif result == "vague":
|
||||
# call favor_not_ready
|
||||
# jump .personal
|
||||
# elif result == "na":
|
||||
# call not_available
|
||||
# jump .personal
|
||||
# else:
|
||||
# $ renpy.jump(result)
|
||||
|
||||
"-Public Requests-" (icon="interface/icons/small/star_yellow.webp") if game.daytime and states.ton.requests_unlocked:
|
||||
jump tonks_requests_menu
|
||||
label .requests:
|
||||
|
||||
$ result = show_events_menu(tonks_requests)
|
||||
|
||||
if result == "disabled":
|
||||
"You haven't unlocked this request opportunity yet."
|
||||
jump .requests
|
||||
elif result == "exit":
|
||||
jump tonks_favor_menu
|
||||
else:
|
||||
$ result.start()
|
||||
|
||||
"-Public Requests-" (icon="interface/icons/small/star_yellow.webp", style="disabled") if not game.daytime or not states.ton.requests_unlocked:
|
||||
if not states.ton.requests_unlocked:
|
||||
nar "You haven't unlocked this feature yet."
|
||||
elif not game.daytime:
|
||||
nar "Public requests are available during the day only."
|
||||
|
||||
jump tonks_favor_menu
|
||||
|
||||
"-Never mind-":
|
||||
jump tonks_requests
|
||||
|
||||
label tonks_requests_menu:
|
||||
call update_ton_requests
|
||||
python:
|
||||
menu_choices = []
|
||||
for i in nt_requests_list:
|
||||
if i in []: # Not in the game yet.
|
||||
menu_choices.append(gui.menu_item("-Not available-", "na", style="disabled"))
|
||||
elif i.start_tier > states.ton.tier:
|
||||
menu_choices.append(gui.menu_item("-Not ready-", "vague", style="disabled"))
|
||||
else:
|
||||
menu_choices.append(i.get_menu_item())
|
||||
menu_choices.append(("-Never mind-", "nvm"))
|
||||
result = renpy.display_menu(menu_choices)
|
||||
|
||||
if result == "nvm":
|
||||
jump tonks_favor_menu
|
||||
elif result == "vague":
|
||||
call favor_not_ready
|
||||
jump tonks_requests_menu
|
||||
elif result == "na":
|
||||
call not_available
|
||||
jump tonks_requests_menu
|
||||
else:
|
||||
$ renpy.jump(result)
|
||||
|
||||
label update_ton_requests:
|
||||
# Set event tier to current Tonks tier if they are different
|
||||
python:
|
||||
for i in nt_requests_list:
|
||||
i.tier = states.ton.tier
|
||||
|
||||
return
|
||||
|
@ -27,6 +27,8 @@ default states.ton.ev.hangouts.astoria_e1 = False
|
||||
default states.ton.ev.hangouts.favors_e1 = False
|
||||
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 ton_level_up = None
|
||||
|
||||
|
@ -248,14 +248,6 @@ label quests:
|
||||
|
||||
# Tonks events not triggered by a date.
|
||||
if nt_event_pause == 0:
|
||||
if game.daytime:
|
||||
pass
|
||||
else:
|
||||
python:
|
||||
for i in nt_requests_list:
|
||||
if i.inProgress:
|
||||
i.inProgress = False
|
||||
i.start()
|
||||
|
||||
$ play_potion_return("tonks")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user