Mirrors/SnootGame
1
0
Fork 0
mirror of https://git.cavemanon.xyz/Cavemanon/SnootGame.git synced 2025-01-22 09:16:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ch8_guitar_improvement'

Browse source
This commit is contained in:
Map 2024-12-03 17:11:04 -06:00
commit 41a894b846
2 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
game/script/8.anon-and-fang-study-together.rpy
View file

@ -718,7 +718,7 @@ label chapter_8:
pause .5 pause .5
"{cps=*0.5}AAAAAAAAAAAAAAAA{/cps}" "{cps=*0.5}AAAAAAAAAAAAAAAA{/cps}"
play music 'audio/OST/Dragging on and on....ogg' fadein 1.0 play music 'audio/OST/Dragging on and on....ogg' fadein 1.0 volume 0.5
pause .5 pause .5
F "Anon, are you paying attention?" F "Anon, are you paying attention?"
@ -732,15 +732,31 @@ label chapter_8:
pause .5 pause .5
F "Alright, try these chords." F "Alright, try these chords."
play sound 'audio/effects/goodA.ogg' fadein 0.5
# Renpy's audio is rarted, do this workaround instead
$ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/goodA.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"Her fingers press mine down, holding down the strings in an awkward position." "Her fingers press mine down, holding down the strings in an awkward position."
F "Then this." F "Then this."
play sound 'audio/effects/goodB.ogg' fadein 0.5
$ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/goodB.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"My hands are slid down closer to the base of the neck and too close to my crotch." "My hands are slid down closer to the base of the neck and too close to my crotch."
F "And then finally this." F "And then finally this."
play sound 'audio/effects/goodC.ogg' fadein 0.5
$ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/goodC.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"My fingers are shifted back up to the middle of the fretboard." "My fingers are shifted back up to the middle of the fretboard."
F "Try that out, Anon." F "Try that out, Anon."
@ -749,14 +765,25 @@ label chapter_8:
"Fang let’s go of my sweaty hands. She doesn’t move from behind me though." "Fang let’s go of my sweaty hands. She doesn’t move from behind me though."
"I try and replicate the movements." "I try and replicate the movements."
pause .5
play sound 'audio/effects/goodA.ogg' fadein 0.5 $ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/goodA.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"The first strum sounds… not bad…" "The first strum sounds… not bad…"
play sound 'audio/effects/badA.ogg' fadein 0.5
$ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/badA.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"The second note is horrendous. I blame my pants." "The second note is horrendous. I blame my pants."
play sound 'audio/effects/goodC.ogg' fadein 0.5
$ renpy.music.set_volume(1.0, 0.0, 'sound')
play sound 'audio/effects/goodC.ogg'
$ renpy.music.set_volume(0.0, 1.5, 'sound')
pause 0.25
"And the last chord comes out alrightish." "And the last chord comes out alrightish."
pause .5 pause .5
@ -792,6 +819,8 @@ label chapter_8:
"My pinky slides off the fretboard and when I strum again a strange look appears in Fang’s eyes." "My pinky slides off the fretboard and when I strum again a strange look appears in Fang’s eyes."
window hide window hide
window auto window auto
$ renpy.music.set_volume(1.0, 0.5, 'sound')
pause .5 pause .5
label musicalchoices: label musicalchoices:

9
game/src/chapter_select.rpy
View file

@ -77,6 +77,15 @@ label chapter_select_go_back:
ending_chapters_determined = False ending_chapters_determined = False
current_chapter = chapter_list[chapter_list_index] current_chapter = chapter_list[chapter_list_index]
renpy.music.set_volume(1.0, 0.0, 'sound')
renpy.music.set_volume(1.0, 0.0, 'music')
renpy.music.set_volume(1.0, 0.0, 'music1')
renpy.music.set_volume(1.0, 0.0, 'music2')
renpy.music.set_volume(1.0, 0.0, 'ambient')
renpy.music.set_volume(1.0, 0.0, 'ambient1')
renpy.music.set_volume(1.0, 0.0, 'ambient2')
renpy.music.set_volume(1.0, 0.0, 'ambient3')
menu: menu:
"What ending do you want to lock to?" "What ending do you want to lock to?"