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

Narrator

Browse Source 
* Reworked narrator calls and unified them across the entire game
* Added narrator screen inheriting from say screen
* Removed obsolete narrator code
This commit is contained in:
LoafyLemon 2023-03-11 19:43:02 +00:00
parent 669bf3bd06
commit b2e7c44b2e
95 changed files with 1770 additions and 1780 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
game/scripts/characters.rpy
View File

@ -1,18 +1,3 @@
# Narrator (not the same as 'nar' character)
label nar(text="", action=""):
if action != "end": #Narration ended, blktone was already active.
show screen blktone
with d3
if text != "":
"[text]"
if action != "start": #Narration just started, blktone won't get hidden.
hide screen blktone
with d3
return
init -1401 python:
# Remove style overrides
@ -70,7 +55,7 @@ define sly2 = Character("Another Slytherin student")
define qcr = Character("Quidditch Crowd")
# Special
define nar = Character("Narrator", show_side_image=Image("characters/misc/narrator.webp"))
define nar = Character("Narrator", show_side_image=Image("characters/misc/narrator.webp"), what_prefix=">", screen="say_narrator")
define anon = Character("???")
# Dumbledore

50
game/scripts/characters/astoria/events/imperio_practice.rpy
View File

File diff suppressed because it is too large Load Diff

20
game/scripts/characters/astoria/events/imperio_training.rpy
View File

@ -1107,7 +1107,7 @@ label ag_st_imperio_E4:
# screenshake
with hpunch
call nar(">Tonks gives her breasts a quick shake for you.")
nar "Tonks gives her breasts a quick shake for you."
gen "Sweet!" ("grin", xpos="far_left", ypos="head")
ton "..............." ("horny", "wink", "base", "L")
@ -1131,7 +1131,7 @@ label ag_st_imperio_E4:
# Screenshake
with hpunch
ton "" ("horny", "narrow", "shocked", "mid")
call nar(">Tonks gives her breasts another quick shake for you.")
nar "Tonks gives her breasts another quick shake for you."
call ctc
@ -1325,7 +1325,7 @@ label ag_st_imperio_E5:
#screenshake
with hpunch
call nar(">Tonks gives her tits a little sway...")
nar "Tonks gives her tits a little sway..."
gen "*Argh*! (I can't take it anymore!)" ("angry", xpos="far_left", ypos="head")
@ -1343,7 +1343,7 @@ label ag_st_imperio_E5:
pause.8
show screen bld1
call nar(">You take out your cock and start jacking off.")
nar "You take out your cock and start jacking off."
ton "" ("horny", "narrow", "raised", "L", cheeks="blush")
ast "What shall I have her do now?" ("open", "base", "base", "L")
@ -1367,7 +1367,7 @@ label ag_st_imperio_E5:
call play_sound("climb_desk")
pause 2
call nar(">After giving you a playful wink, Tonks suggestively climbs on top of your desk, getting a good glimpse of your rock-hard cock...")
nar "After giving you a playful wink, Tonks suggestively climbs on top of your desk, getting a good glimpse of your rock-hard cock..."
pause 1
call ast_chibi("wand","desk","base") # Still in wand pose.
@ -1400,7 +1400,7 @@ label ag_st_imperio_E5:
ast "She's really doing everything I tell her!" ("smile", "base", "angry", "mid")
ast "Look how easy it is, Professor!" ("smile", "closed", "base", "mid", emote="hearts",trans=hpunch)
call nar(">Astoria joyfully jumps up and down on the spot, making a happy squeal...")
nar "Astoria joyfully jumps up and down on the spot, making a happy squeal..."
call hide_characters
hide screen bld1
with d3
@ -1413,7 +1413,7 @@ label ag_st_imperio_E5:
pause.5
show screen bld1
call nar(">Unknowingly dropping her wand...")
nar "Unknowingly dropping her wand..."
ton "" ("upset", "base", "base", "R")
gen "*Uhm*..." ("base", xpos="far_left", ypos="head")
@ -1501,7 +1501,7 @@ label ag_st_imperio_E5:
pause.5
call bld
call nar(">You quickly put away your priorly liberated cock.")
nar "You quickly put away your priorly liberated cock."
gen "What's going on?" ("angry", xpos="far_left", ypos="head")
sna "Yes! I'd like to know that as well!" ("snape_43")
gen "Snape?!" ("angry", xpos="far_left", ypos="head")
@ -1662,7 +1662,7 @@ label ag_st_imperio_E5:
ton "And I can't help that I'm just so god...{w=0.4} damn...{w=0.3} horny!" ("open_wide", "closed", "angry", "mid", hair="angry")
ton "All the bloody time!" ("open_wide_tongue", "base", "base", "ahegao", hair="horny")
ton "See!" ("annoyed", "base", "annoyed", "up", hair="horny")
call nar(">You notice the bright pink colour of her hair - once again...")
nar "You notice the bright pink colour of her hair - once again..."
gen "You should stop lying to yourself, it's not healthy..." ("base", xpos="far_left", ypos="head")
gen "I'm immortal - and even I know that!" ("base", xpos="far_left", ypos="head")
gen "Embrace why you chose to be a part of this, you've got a pretty good gig here." ("base", xpos="far_left", ypos="head")
@ -1774,7 +1774,7 @@ label ag_st_imperio_E5:
gen "That guy deprived me of a blowjob..." ("base", xpos="far_left", ypos="head")
gen "He owes me one!" ("angry", xpos="far_left", ypos="head")
call nar(">Astoria has \"mastered\" the imperio curse!")
nar "Astoria has \"mastered\" the imperio curse!"
$ snape_busy = True
$ tonks_busy = True

6
game/scripts/characters/astoria/events/intro.rpy
View File

@ -161,7 +161,7 @@ label astoria_intro_E1:
# Genie and Tonks stand behind the desk.
# Genie has his dick in hand, jerking off.
# call nar(">To your surprise, Tonks \"blows\" a gust of wind over \"your cock\"...")
# nar "To your surprise, Tonks \"blows\" a gust of wind over \"your cock\"..."
# ton "There, all done." ("base", "base", "base", "mid")
# gen ".............." ("base", xpos="far_left", ypos="head")
# ton "What? I did what you asked for... I blew your cock..." ("base", "base", "base", "mid")
@ -964,8 +964,8 @@ label nt_he_astoria_E1:
ton "I'll speak to Miss Greengrass." ("open", "base", "base", "mid")
ton "I doubt she'll have many objections..." ("base", "happyCl", "base", "mid")
">You ask Tonks to explain asexuality to you some more..."
">You still can't wrap your mind around the fact that such a horrible thing exists..."
nar "You ask Tonks to explain asexuality to you some more..."
nar "You still can't wrap your mind around the fact that such a horrible thing exists..."
$ nt_he.astoria_E1 = True

2
game/scripts/characters/astoria/gifts.rpy
View File

@ -375,7 +375,7 @@ label give_ast_gift(gift_item):
ast "anal plugs?" (face="neutral")
call give_gift(">You give the anal plugs to Astoria...", gift_item)
ast "You do know these hurts a bit if you're not used to them?" (face="annoyed")
call nar(">Astoria absent-mindedly pockets the anal plug.")
nar "Astoria absent-mindedly pockets the anal plug."
ast "Don't see why you'd give these out as if they were sweets..." (mouth="annoyed", face="neutral")
call ast_mood(-1)

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

@ -50,7 +50,7 @@ label summon_astoria:
jump astoria_requests
"-Hidden-" (style="disabled") if not astoria_wardrobe_unlocked:
call nar(">You haven't unlocked this feature yet.")
nar "You haven't unlocked this feature yet."
jump astoria_requests
"-Give Item-" (icon="interface/icons/small/gift.webp"):
@ -123,7 +123,7 @@ label person_is_busy:
return
label spell_not_known:
call nar(">You haven't unlocked this spell yet.")
nar "You haven't unlocked this spell yet."
return
label astoria_talk:

8
game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
View File

@ -568,7 +568,7 @@ label cc_pf_strip_T2_intro_E2:
call play_sound("kick")
cho "" ("annoyed", "narrow", "angry", "mid", trans=vpunch)
gen "*Aaaaah*!" ("angry", xpos="far_left", ypos="head")
call nar(">Cho does a daunting stomp on your desk...")
nar "Cho does a daunting stomp on your desk..."
cho "Don't think for a second I wouldn't do it! After all of this!" ("scream", "narrow", "angry", "mid")
cho "" ("angry", "narrow", "angry", "mid")
call play_sound("gulp")
@ -846,7 +846,7 @@ label cc_pf_strip_T2_intro_E3:
call play_sound("desk")
pause 3
">You watch as Cho slowly climbs onto your desk..."
nar "You watch as Cho slowly climbs onto your desk..."
call cho_chibi("stand", "on_desk", "on_desk")
hide screen bld1
@ -919,7 +919,7 @@ label cc_pf_strip_T2_intro_E3:
gen "I've got to say, once again I'm very impressed by you!" ("angry", xpos="far_left", ypos="head")
cho "Glad to hear it, [name_genie_cho]." ("smile", "narrow", "base", "mid")
cho "Catch!" ("base", "base", "base", "L")
call nar(">Cho throws her panties onto your desk.")
nar "Cho throws her panties onto your desk."
cho "You can keep them, for now..." ("soft", "narrow", "base", "R")
gen "I appreciate the notion!" ("grin", xpos="far_left", ypos="head")
cho "" ("base", "narrow", "base", "mid")
@ -1046,7 +1046,7 @@ label cc_pf_strip_T2_E3_repeat:
call ctc
cho "Catch, [name_genie_cho]!" ("soft", "base", "base", "mid")
call nar(">Cho throws her panties at you.")
nar "Cho throws her panties at you."
# Panties Acquired
$ has_cho_panties = True

2
game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy
View File

@ -278,7 +278,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
pause .5
gen "Give me just a moment..." ("base", xpos="far_left", ypos="head")
$ renpy.sound.play("sounds/sniff.ogg")
call nar(">You give Cho's panties one last sniff before handing them back to the girl.")
nar "You give Cho's panties one last sniff before handing them back to the girl."
gen "There." ("angry", xpos="far_left", ypos="head")
cho "(Pervert...)" ("annoyed", "narrow", "angry", "R", cheeks="blush")
cho "I think it's time for me to go now." ("soft", "closed", "angry", "mid")

54
game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
View File

File diff suppressed because it is too large Load Diff

18
game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
View File

@ -258,7 +258,7 @@ label .strip_cho:
pause .5
cho "" ("horny", "narrow", "raised", "mid", cheeks="blush")
pause .8
call nar(">Tonks swiftly pulls the girl's top over her chiselled frame.")
nar "Tonks swiftly pulls the girl's top over her chiselled frame."
pause .2
if cho.is_worn("bottom"):
$ renpy.sound.play("sounds/cloth_sound3.ogg")
@ -267,7 +267,7 @@ label .strip_cho:
pause .5
cho "" ("horny", "narrow", "base", "down", cheeks="blush")
pause .8
call nar(">A quick tug by her teacher, and Cho's bottoms slips down her muscular thighs.")
nar "A quick tug by her teacher, and Cho's bottoms slips down her muscular thighs."
call ctc
# Remove Bra and Panties.
@ -285,7 +285,7 @@ label .strip_cho:
pause .5
cho "" ("base", "narrow", "raised", "L", cheeks="blush")
pause .8
call nar(">Tonks effortlessly removes the bra of her student.")
nar "Tonks effortlessly removes the bra of her student."
pause .2
if cho.is_worn("panties"):
cho "..." ("mad", "narrow", "base", "down", cheeks="blush")
@ -297,7 +297,7 @@ label .strip_cho:
pause .5
cho "" ("horny", "narrow", "base", "down", cheeks="heavy_blush")
pause .8
call nar(">Eyes fixated onto Cho's lovely Snitch, Tonks slowly pulls the girl's panties down her thighs.")
nar "Eyes fixated onto Cho's lovely Snitch, Tonks slowly pulls the girl's panties down her thighs."
pause .2
@ -551,19 +551,19 @@ label .strip_tonks:
pause .5
ton "" ("horny", "narrow", "raised", "mid", hair="horny")
pause .8
call nar(">Cho eagerly helps her teacher take off her top.")
nar "Cho eagerly helps her teacher take off her top."
pause .2
if tonks.is_worn("bottom"):
ton "Remember... Always take your time when undressing in front of somebody." ("soft", "narrow", "base", "L", hair="horny")
ton "" ("base", "narrow", "base", "mid", hair="horny")
call nar(">Slowly, and with gracile movements, Tonks takes off her bottom piece of clothing.")
nar "Slowly, and with gracile movements, Tonks takes off her bottom piece of clothing."
$ renpy.sound.play("sounds/cloth_sound3.ogg")
$ tonks.strip("bottom")
with hpunch
pause .5
ton "" ("horny", "narrow", "raised", "mid", hair="horny", cheeks="blush")
pause .8
call nar(">And then flicks it out of sigh with one swift motion.")
nar "And then flicks it out of sigh with one swift motion."
call ctc
# Remove Bra and Panties.
@ -582,7 +582,7 @@ label .strip_tonks:
pause .5
ton "" ("base", "narrow", "base", "mid", hair="horny")
pause .8
call nar(">Tonks bares her impressive bosom for you both.")
nar "Tonks bares her impressive bosom for you both."
pause .2
if tonks.is_worn("panties"):
ton "Oh my... what happened to my panties..." ("soft", "narrow", "base", "down", hair="horny")
@ -594,7 +594,7 @@ label .strip_tonks:
pause .5
ton "" ("horny", "narrow", "angry", "mid", hair="horny")
pause .8
call nar(">Without much hesitation, Tonks panties are swiftly flung out of sight and out of mind.")
nar "Without much hesitation, Tonks panties are swiftly flung out of sight and out of mind."
pause .2
# Remove all Cho clothes.

26
game/scripts/characters/cho/events/favors/talk_to_me.rpy
View File

File diff suppressed because it is too large Load Diff

4
game/scripts/characters/cho/events/intro.rpy
View File

@ -244,7 +244,7 @@ label cho_intro_E1:
# Masturbating
if genie_masturbating:
call nar(">You pull your cock out and begin masturbating... focusing on the now heated argument between the two girls in front of you.")
nar "You pull your cock out and begin masturbating... focusing on the now heated argument between the two girls in front of you."
cho "" (trans=d3)
her "Oh yeah, well... I bet it can't be anything good seeing how you usually act around men..." ("mad", "narrow", "angry", "L")
@ -680,7 +680,7 @@ label ss_he_cho_E1:
show screen with_snape(ani=True)
show screen bld1
call notes
">You spend the rest of the evening in Snape's company, talking about Cho's impressive thighs."
nar "You spend the rest of the evening in Snape's company, talking about Cho's impressive thighs."
hide screen bld1
with d3

4
game/scripts/characters/cho/events/panties.rpy
View File

@ -73,7 +73,7 @@ label cho_panties_response_T2:
gen "Your panties, that's right!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
$ renpy.sound.play("sounds/sniff.ogg")
call nar(">You bring the panties to your nose and give them one last sniff.")
nar "You bring the panties to your nose and give them one last sniff."
gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
cho "(...)" ("annoyed", "narrow", "base", "mid")
@ -137,7 +137,7 @@ label cho_panties_response_T3:
else:
$ renpy.sound.play("sounds/sniff.ogg")
call nar(">You bring the panties to your nose and give them one last sniff.")
nar "You bring the panties to your nose and give them one last sniff."
gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
cho "(...)" ("base", "narrow", "base", "down")

128
game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
View File

File diff suppressed because it is too large Load Diff

54
game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
View File

File diff suppressed because it is too large Load Diff

20
game/scripts/characters/cho/events/quidditch/intros.rpy
View File

@ -645,7 +645,7 @@ label cho_quid_E7:
gen "Sure I can." ("grin", xpos="far_left", ypos="head")
call hide_characters
call nar(">You telepathically call Cho into your office.")
nar "You telepathically call Cho into your office."
hide screen bld1
with d3
@ -653,7 +653,7 @@ label cho_quid_E7:
if her_tier < 4: # Hermione changes into her school outfit
# TODO Does this even make sense? She's supposed to be comfortable enough to wear her clothes around the school anyway
call nar(">While Hermione hastily puts on some less revealing clothes.")
nar "While Hermione hastily puts on some less revealing clothes."
$ her_outfit_last.save()
$ hermione.equip(her_outfit_default)
else:
@ -946,9 +946,9 @@ label cho_quid_E8:
ton "Now, I better get going convincing those boys to play again..." ("open", "base", "raised", "R", hair="horny")
if game.daytime:
">You finish your drinks before calling it a day."
nar "You finish your drinks before calling it a day."
else:
">You finish your drinks before calling it a night."
nar "You finish your drinks before calling it a night."
$ tonks_busy = True
$ cho_quid.E8_complete = True
@ -994,9 +994,9 @@ label cho_quid_E9:
gen "..." ("base", xpos="far_left", ypos="head")
sna "*Hrhm*... Good riddance, then..." ("snape_12")
$ renpy.sound.play(["sounds/gulp.ogg"]*3)
call nar(">Snape empties the last drop of wine, before leaving.","start")
">You feel a sense of remorse shortly after he's gone, realizing that you're both just parts of the same coin."
call nar(">Your friendship level with him has not changed...{w=0.5} Probably...","end")
nar "Snape empties the last drop of wine, before leaving."
nar "You feel a sense of remorse shortly after he's gone, realizing that you're both just parts of the same coin."
nar "Your friendship level with him has not changed...{w=0.5} Probably..."
$ snape_busy = True
$ ss_summon_pause = 5 # Snape can't be summoned for a couple of days. Can be set to 0 once you talked to Tonks.
@ -1164,7 +1164,7 @@ label cho_quid_E12:
call play_music("stop")
call play_sound("grass")
call nar(">You make your way down to the pitch, catching a few stares on the way by some of the portraits. Looks like the real Dumbledore wasn't a morning person either.")
nar "You make your way down to the pitch, catching a few stares on the way by some of the portraits. Looks like the real Dumbledore wasn't a morning person either."
#Pitch entrance, Cho is standing there
call room("quidditch_pitch")
@ -1495,7 +1495,7 @@ label cho_quid_E12:
$ hooch.equip(hoo_accessory_broom_dildo)
with d3
">Madam Hooch takes a phallic shaped object out of her pockets and attaches it to the broom."
nar "Madam Hooch takes a phallic shaped object out of her pockets and attaches it to the broom."
cho "Merlin's beard!" ("mad", "wide", "base", "L", cheeks="heavy_blush")
gen "Merlin's cock!" ("grin", xpos="far_left", ypos="head")
@ -1643,7 +1643,7 @@ label cho_quid_E12:
show screen blkfade
with d5
call nar(">You leave Cho to her own devices...{w=0.4} And return to your office.")
nar "You leave Cho to her own devices...{w=0.4} And return to your office."
$ cho_quid.E12_complete = True

2
game/scripts/characters/cho/events/quidditch/quiz.rpy
View File

@ -646,7 +646,7 @@ label ss_he_cho_E2:
show screen bld1
call notes
">You spend the rest of the evening in Snape's company once again talking about Cho's remarkable legs."
nar "You spend the rest of the evening in Snape's company once again talking about Cho's remarkable legs."
hide screen bld1
with d3

62
game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
View File

File diff suppressed because it is too large Load Diff

4
game/scripts/characters/cho/events/quidditch/training.rpy
View File

@ -365,9 +365,9 @@ label cho_training:
if (cho_tier == 1 and cho_quid.hufflepuff_training) or (cho_tier == 2 and cho_quid.slytherin_training) or (cho_tier == 3 and cho_quid.gryffindor_training):
gen "(She doesn't need any more practice.)" ("base", xpos="far_left", ypos="head")
else:
call nar(">Cho isn't ready for practice yet.")
nar "Cho isn't ready for practice yet."
else:
call nar(">You can only do that during the day.")
nar "You can only do that during the day."
jump cho_training.choices

14
game/scripts/characters/cho/events/requests/manipulate_boys.rpy
View File

@ -92,7 +92,7 @@ label cc_pr_manipulate_boys_start:
cho "Make out with?{w=0.6} Those Slytherins--" ("soft", "wide", "worried", "mid", cheeks="heavy_blush")
cho "*guargh*" ("open_tongue", "happyCl", "angry", "mid", cheeks="blush", trans=hpunch)
cho "*cough*{w=0.6}-*guargh*!{w=0.8}-*cough*" ("open_wide_tongue", "happyCl", "worried", "mid", cheeks="blush", trans=hpunch)
call nar(">You hear Cho make some inadvertent gag noises...")
nar "You hear Cho make some inadvertent gag noises..."
gen "Is everything okay, girl?" ("base", xpos="far_left", ypos="head")
cho "No!{w=0.3} It's not okay!" ("angry", "wide", "worried", "mid", cheeks="blush")
cho "Why would you think I want to snog those repulsive, yuck-ugly Slytherin degenerates?!" ("open", "wide", "worried", "mid", cheeks="blush")
@ -959,8 +959,8 @@ label cc_pr_manipulate_boys_twins_branch:
if not clothing_store_intro_done:
$ clothing_store_intro_done = True
">You enter to see an old woman sewing together two pieces of long dark fabric."
">The woman is dressed almost entirely in pink and has a warm, approachable air to her."
nar "You enter to see an old woman sewing together two pieces of long dark fabric."
nar "The woman is dressed almost entirely in pink and has a warm, approachable air to her."
gen "Hello." ("base", xpos="far_left", ypos="head")
maf "Hello, Professor Dumbledore."
maf "What can I do for you? Would you like a new cloak, or do you require some alterations to an existing item?"
@ -1121,7 +1121,7 @@ label cc_pr_manipulate_boys_twins_branch:
call blktone
call play_sound("cloth")
"> You hand the Slytherin uniform to Cho."
nar " You hand the Slytherin uniform to Cho."
call hide_blktone
cho "Such a charmer..." ("base", "base", "base", "R")
@ -1230,7 +1230,7 @@ label cc_pr_manipulate_boys_twins_branch:
call blktone
call play_sound("cloth")
"> You hand the Gryffindor uniform to Cho."
nar " You hand the Gryffindor uniform to Cho."
call hide_blktone
cho "Next best--" ("annoyed", "base", "base", "mid")
@ -1308,7 +1308,7 @@ label cc_pr_manipulate_boys_twins_branch:
call blktone
call play_sound("cloth")
"> You hand the Hufflepuff uniform to Cho."
nar " You hand the Hufflepuff uniform to Cho."
call hide_blktone
cho "Mellow?" ("annoyed", "base", "base", "mid")
@ -1408,7 +1408,7 @@ label cc_pr_manipulate_boys_twins_branch:
call blktone
call play_sound("cloth")
"> You hand the clothes to Cho."
nar " You hand the clothes to Cho."
call hide_blktone
cho "Thank you, I knew I could count on--" ("base", "base", "base", "mid")

Some files were not shown because too many files have changed in this diff Show More