Merge branch 'Patch7' of https://git.snootgame.xyz/Cavemanon/SnootGame into p7_naomi_choreo

This commit is contained in:
Nutbuster 2021-11-08 10:28:44 +11:00
commit 843ab5a766
6 changed files with 103 additions and 47 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

View File

@ -442,7 +442,20 @@ image bonus_flash:
pause 0.133
repeat 4
screen bonus_chapter_button():
image template_black_m = Composite(
(511, 129),
(6, 5), Crop((0, 0, 511-12, 129-12), Solid("#000000", width=2, height=2)),
(0, 0), "gui/button/menubuttons/template_idle.png",
(0, 0), "gui/button/menubuttons/template_idle.png"
)
image template_black:
"template_black_m"
matrixcolor TintMatrix(Color((0, 0, 0)))
alpha 0.8
screen bonus_chapter_button(f="template_idle"):
#("gui/button/menubuttons/template_idle.png", "Bonus Chapters", ShowMenu("ex_ch_menu"))
button:
xmaximum 500
@ -454,7 +467,7 @@ screen bonus_chapter_button():
add "bonus_flash" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
$ persistent.old_endings = persistent.endings
else:
add "gui/button/menubuttons/template_idle.png" xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
add f xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
text "Bonus Chapters" xalign 0.5 yalign 0.5 xanchor 0.5
# label_functions is [ [ "label", function() ], [ "foobar", foobar() ], .. ]
@ -473,15 +486,18 @@ screen main_menu():
## This ensures that any other menu screen is replaced.
tag menu
style_prefix "main_menu"
add gui.main_menu_background
if renpy.seen_image("big ending"):
style_prefix "main_menu_ex"
add "big ending"
else:
style_prefix "main_menu"
add gui.main_menu_background
## This empty frame darkens the main menu.
frame:
pass
## This empty frame darkens the main menu.
frame:
#text "You have unlocked all bonus chapters!"
pass
if persistent.old_endings != persistent.endings:
fixed:
xalign 0.125
@ -508,15 +524,26 @@ screen main_menu():
spacing 10
xpos 1885
ypos 1130
use main_menu_button("gui/button/menubuttons/template_idle.png", "Start", Start())
use bonus_chapter_button()
use main_menu_buttons("gui/button/menubuttons/template_idle.png",
[
[ "Load", ShowMenu("load") ],
[ "Options", ShowMenu("preferences") ],
[ "Extras", ShowMenu("extras") ], \
[ "Quit", Quit(confirm=not main_menu) ]
] )
if renpy.seen_image('big ending'):
use main_menu_button("template_black", "Start", Start())
use bonus_chapter_button("template_black")
use main_menu_buttons("template_black",
[
[ "Load", ShowMenu("load") ],
[ "Options", ShowMenu("preferences") ],
[ "Extras", ShowMenu("extras") ], \
[ "Quit", Quit(confirm=not main_menu) ]
] )
else:
use main_menu_button("gui/button/menubuttons/template_idle.png", "Start", Start())
use bonus_chapter_button()
use main_menu_buttons("gui/button/menubuttons/template_idle.png",
[
[ "Load", ShowMenu("load") ],
[ "Options", ShowMenu("preferences") ],
[ "Extras", ShowMenu("extras") ], \
[ "Quit", Quit(confirm=not main_menu) ]
] )
on "show" action renpy.start_predict_screen("cg_gallery")
style main_menu_frame is empty
@ -547,9 +574,25 @@ style main_menu_text:
style main_menu_title:
properties gui.text_properties("title")
style main_menu_ex is main_menu
style main_menu_ex_vbox is main_menu_vbox
style main_menu_ex_text is main_menu_text
style main_menu_ex_frame is main_menu_frame
#style main_menu_ex_button:
#color "#222"
#background "gui/button/menubuttons/template_idle.png"
#xalign 0.5 yalign 0.5 zoom 1 xanchor 0 xcenter 0.5 ycenter 0.5
#style main_menu_ex_button:
#color "#222"
#style main_menu_version:
# properties gui.text_properties("version")
# style
## Game Menu screen ############################################################
##

View File

@ -346,7 +346,8 @@ label chapter_9:
"Each one more and more embarrassing than the last."
show projector9_blur at wiggle with dissolve
# scene projector9
#$
# scene projector9
"I…{w=0.3} oh god…"
@ -522,7 +523,7 @@ label chapter_9:
Re "...So I asked Trish to go get the thing from Naomi."
Re "I guess she mustve, like…{w=0.2} changed the slides before giving it to me?"
A "{cps=*1.4}And you didnt think to check?!{/cps}"
@ -682,7 +683,7 @@ label chapter_9:
"Spears voice shocks me from my eavesdropping."
"What am I supposed to say to Trish?"
"Fang tries to give a reassuring smile but its so fragile."
"Like this is all her fault and not that backstabbing bitch."
@ -870,11 +871,11 @@ label chapter_9:
show reed considering flip:
xalign 1.4
with fade
"Reed has taken my place beside her with a comforting arm around her shoulder."
"If this was any other situation I might have felt a bit jealous."
window hide
window auto
@ -1051,7 +1052,7 @@ label chapter_9:
window auto
show reed neutral flip with dissolve:
xalign 1.4
xalign 1.4
hide reed with easeoutright
stop music fadeout 1
@ -1238,8 +1239,8 @@ label chapter_9:
show anon neutral flip at aleft with dissolve
"I turn towards the voice, and the world slows down."
show anon fear flip at aleft
show fang surprised flip behind anon
with dissolve
@ -1268,7 +1269,7 @@ label chapter_9:
window hide Dissolve(0.0001)
window auto
stop ambient fadeout 1
hide dimmer_darker with Dissolve(.25)
@ -1284,7 +1285,7 @@ label chapter_9:
xalign 0.22 yalign 0.22
linear 0.5 align (.05, 1.5) knot (0, 0.25) rotate -270
hide sodacan blurred with dissolve
hide sodacan blurred with dissolve
#show sodacan blurred:
# ease_cubic 0.1 xalign 0.3 yalign 0.22 rotate 90
# ease_cubic 0.5 xalign 0.5 yalign 1.7 rotate 60
@ -1311,7 +1312,7 @@ label chapter_9:
#show anon with easeinleft:
# parallel:
# ease_cubic 1.0 rotate 90
# ease_cubic 1.0 rotate 90
# parallel:
# ease_cubic 0.1 yalign 0.0
# ease_cubic 0.3 yalign -0.1
@ -1324,7 +1325,7 @@ label chapter_9:
#scene outside school with vpunch
#pause 0.5
#scene outside school with hpunch
#play sound 'audio/effects/anonDumbassFall.ogg' fadeout 0.5
#play sound 'audio/effects/anonDumbassFall.ogg' fadeout 0.5
#pause 0.5
#scene outside school with vpunch
#pause 0.5
@ -1537,4 +1538,4 @@ label chapter_9:
"..."
return
return

View File

@ -10,7 +10,7 @@ transform raymbatransform:
xcenter 0.6 ycenter 0.385 zoom 0.5
label chapter_x10:
window hide
stop music fadeout(3)
scene black with Dissolve(2)
@ -18,11 +18,11 @@ label chapter_x10:
play music 'audio/ost/dino destiny reader.ogg'
pause 1
"Statement:{w=.4} My current designation is RAYmba."
"Statement:{w=.4} My current designation is RAYmba."
"I was manufactured in a factory in the year 201M2020."
"I was manufactured in a factory in the year 201M2020."
"It is currently 201M2027, and I am playing with my current owner."
"It is currently 201M2027, and I am playing with my current owner."
pause .5
scene carpet
@ -207,7 +207,7 @@ label chapter_x10:
"Observation conclusion:{w=.4} Current owner has a strange fondness for inanimate objects."
pause .5
"Notation made, continuing memory review."
"3{cps=*.1}...{/cps}{w=.3}{nw}"
@ -325,7 +325,7 @@ label chapter_x10:
"2{cps=*.1}...{/cps}{w=.3}{nw}"
"1{cps=*.1}...{/cps}{w=.5}{nw}"
scene black
scene black
pause 1.5
"Current day:{w=.4} Thursday."
@ -334,7 +334,7 @@ label chapter_x10:
"Current location:{w=.4} Owners domicile."
pause .5
play music 'audio/ost/its_footloose_now.ogg' fadein 4
scene room anon day:
blur 8 zoom 1.5 xoffset -100 yoffset -400
@ -387,7 +387,7 @@ label chapter_x10:
easein_cubic 0.5 xpos 0.9
pause 1
easeout_cubic 0.5 xpos -0.5
show fang:
pause 1
ease_cubic 0.5 xpos 0.3
@ -594,7 +594,7 @@ label chapter_x10:
"Owners guest is an unknown variable, one this unit does not feel secure around."
"Unit cannot pinpoint reason for breach in security with ocular sensors due to the obscurity of the current location."
"Unit cannot pinpoint reason for breach in security with ocular sensors due to the obscurity of the current location."
pause .5
"This is highly unusual.{w=.4} Will log into this units memory bank for later evaluation."
@ -614,7 +614,7 @@ label chapter_x10:
show naomi neutral behind raymbabox:
xcenter -0.5 yalign 0.45 zoom 2
blur 5
blur 5
show naomi:
easein_cubic 1.5 xpos 0.25
pause 1.5
@ -625,7 +625,7 @@ label chapter_x10:
show fang pneutral flip behind raymbabox:
xcenter 1.5 yalign 0.45 zoom 2
blur 5
blur 5
show fang:
easein_cubic 1.5 xpos 0.75
pause .5
@ -726,7 +726,7 @@ label chapter_x10:
show anonpet:
ypos -0.4
parallel:
easein_cubic 0.9 ypos 0.0
easein_cubic 0.9 ypos 0.0
parallel:
ease_cubic 2 xpos -0.125
parallel:
@ -823,7 +823,7 @@ label chapter_x10:
ypos -1.0
show keys:
easein_back 0.75 ypos -0.15
show raymba4s:
pause .3
easein_cubic 0.25 ypos 0.4
@ -933,7 +933,7 @@ label chapter_x10:
pause .5
"Owner is picked up slowly.{w=.4} Anon sits next to me and lowers a limb to make contact."
show anonpet:
ypos -0.5
easein_cubic 1.5 ypos 0.0 xpos -0.06
@ -952,6 +952,18 @@ label chapter_x10:
stop music fadeout 6
"{cps=*.05}...{/cps}"
pause 4
return
image big blending = Composite(
(1920, 1080),
(0, 0), "big ending",
(0, 1080-126), "the ending"
)
scene big ending with Dissolve(1)
scene big blending with Dissolve(1)
pause 8
scene black with Dissolve(2)
return