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

Snape's Hangout Events

Browse Source 
* Converted Snape's hangout events into the new system, and cleaned up relevant code.
* Fixed unreachable cho_quid_E9 event due to an unintentional jump
* Temporarily disabled Snape's hangout stats
This commit is contained in:
LoafyLemon 2023-07-02 01:25:59 +01:00
parent acf7f49819
commit a5187e378c
4 changed files with 29 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
game/scripts/characters/snape/events/hangouts.rpy
View File

@ -8,7 +8,7 @@ label snape_hangout:
$ states.gen.stats.hangouts_with_snape += 1
$ ss_he_drink.start()
$ sna_eventqueue_hangouts_drinking.start()
label snape_hangout_continue:
hide screen bld1
@ -17,7 +17,6 @@ label snape_hangout:
with fade
call bld
### Intro Events ###
# Events are located in the character's intro file.
@ -60,8 +59,7 @@ label snape_hangout:
### Snape Stories ###
# Events are located here.
if not ss_he_story.is_complete():
$ ss_he_story.start()
$ sna_eventqueue_hangouts_stories.start()
label end_snape_hangout:
show screen with_snape(ani=True)
@ -630,7 +628,6 @@ label ss_he_story_intro_E15:
nar "The Slytherin house point payout has increased greatly and reached its maximum level."
nar "Any future hangouts will result in a small bump in house points for Slytherin."
jump end_snape_hangout_points
label sly_plus:

49
game/scripts/characters/snape/hangouts.rpy
View File

@ -1,33 +1,20 @@
default ss_he_drink = event_class(title = "Snape Wine", start_label = "snape_hangout", events = [
[
["ss_he_wine_intro"],
["ss_he_wine_repeat"],
["ss_he_wine_intro_E2"]
]
],
iconset = [["star_empty", "star_yellow"]] # You have to add icons at least for first tier, the rest will be copied over automatically.
)
default sna_ev_hangouts_wine_e1 = Event(id="sna_ev_hangouts_wine_e1", label="ss_he_wine_intro", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_drinking")
default sna_ev_hangouts_wine_e2 = Event(id="sna_ev_hangouts_wine_e2", label="ss_he_wine_repeat", autoenqueue=True, autodequeue=False, queue="sna_eventqueue_hangouts_drinking")
default sna_ev_hangouts_wine_e3 = Event(id="sna_ev_hangouts_wine_e3", label="ss_he_wine_intro_E2", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_drinking")
default ss_he_story = event_class(title = "Snape Stories", start_label = "snape_hangout", events = [
[
["ss_he_story_E1"], # Teach me wand magic
["ss_he_story_intro_E2"], # More points for Slytherin
["ss_he_story_intro_E3"], # M.R.M. nonsense
["ss_he_story_intro_E4"], # Parallel worlds
["ss_he_story_intro_E5"], # Progress with Hermione?
["ss_he_story_E6"], # Those nasty Slytherin Sluts!
["ss_he_story_intro_E7"], # Jasmine is a muggle
["ss_he_story_intro_E8"], # Flogging
["ss_he_story_intro_E9"], # Russian dream (replace this one)
["ss_he_story_intro_E10"],# The meaning of life
["ss_he_story_intro_E11"],# The great catastrophe
["ss_he_story_intro_E12"],# Albus might be dead?
["ss_he_story_intro_E13"],# Snape is happy
["ss_he_story_E14"], # Choking Slytherin girls...
["ss_he_story_intro_E15"] # Busy days
]
],
iconset = [["star_empty", "star_yellow"]] # You have to add icons at least for first tier, the rest will be copied over automatically.
)
default sna_ev_hangouts_stories_e1 = Event(id="sna_ev_hangouts_stories_e1", label="ss_he_story_E1", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e2 = Event(id="sna_ev_hangouts_stories_e2", label="ss_he_story_intro_E2", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e3 = Event(id="sna_ev_hangouts_stories_e3", label="ss_he_story_intro_E3", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e4 = Event(id="sna_ev_hangouts_stories_e4", label="ss_he_story_intro_E4", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e5 = Event(id="sna_ev_hangouts_stories_e5", label="ss_he_story_intro_E5", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e6 = Event(id="sna_ev_hangouts_stories_e6", label="ss_he_story_E6", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e7 = Event(id="sna_ev_hangouts_stories_e7", label="ss_he_story_intro_E7", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e8 = Event(id="sna_ev_hangouts_stories_e8", label="ss_he_story_intro_E8", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e9 = Event(id="sna_ev_hangouts_stories_e9", label="ss_he_story_intro_E9", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e10 = Event(id="sna_ev_hangouts_stories_e10", label="ss_he_story_intro_E10", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e11 = Event(id="sna_ev_hangouts_stories_e11", label="ss_he_story_intro_E11", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e12 = Event(id="sna_ev_hangouts_stories_e12", label="ss_he_story_intro_E12", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e13 = Event(id="sna_ev_hangouts_stories_e13", label="ss_he_story_intro_E13", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e14 = Event(id="sna_ev_hangouts_stories_e14", label="ss_he_story_E14", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")
default sna_ev_hangouts_stories_e15 = Event(id="sna_ev_hangouts_stories_e15", label="ss_he_story_intro_E15", autoenqueue=True, autodequeue=False, repeat=False, queue="sna_eventqueue_hangouts_stories")

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

@ -49,7 +49,9 @@ label summon_snape:
if wine_ITEM.owned >= 1:
sna "Whatever it is, it can wait, let's sit down first, shall we." ("snape_01")
call setup_fireplace_hangout(char="snape")
$ ss_he_drink.start()
call ss_he_wine_repeat
$ states.gen.stats.hangouts_with_snape += 1
$ wine_ITEM.owned -= 1

12
game/scripts/interface/stats.rpy
View File

@ -392,13 +392,13 @@ screen stats_menuitem(xx, yy):
use text_stat("If you were a Quidditch player, you'd be a:")
use text_stat("- \"", "\" -", states.gen.stats.quidditch_position)
elif current_category == "Snape":
use text_stat("Hung out with Snape:")
use text_stat("- ", " times -", ss_he_drink.counter)
# elif current_category == "Snape":
# use text_stat("Hung out with Snape:")
# use text_stat("- ", " times -", ss_he_drink.counter)
elif current_category == "Tonks":
use text_stat("Hung out with Tonks:")
use text_stat("- ", " times -", nt_he_drink.counter)
# elif current_category == "Tonks":
# use text_stat("Hung out with Tonks:")
# use text_stat("- ", " times -", nt_he_drink.counter)
# elif current_category == "Hermione":
# # Tier 1