nutbuster/SnootGame
3
0
Fork 0
forked from Cavemanon/SnootGame
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'give Fang the pendant for later RAYmba scene and whole of Trish III' (#111) from fang-pendant-fix into master

Browse Source 
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/111
This commit is contained in:
Nutbuster 2021-10-15 19:16:48 +00:00
commit c3cd05be49
3 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
game/script.rpy
View File

@ -518,6 +518,7 @@ image naser fullystained shocked = Composite(
(-40, -20), "ccf_rstain"
)
# TODO: these should be defined in a much more concise way e.g `fangp happy`, the extra tags are very cumbersome and unnecessary
#fang w pendant ending D
image fang nonxmas pendant happy = Composite(
# (1412, 1500),
@ -525,6 +526,12 @@ image fang nonxmas pendant happy = Composite(
(0, 0), "fang happy",
(0, 0), "amberpendant"
)
image fang phappy flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/basic set/fang happy.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
)
image fang nonxmas pendant sad = Composite(
# (1412, 1500),
@ -546,6 +553,12 @@ image fang nonxmas pendant surprised = Composite(
(0, 0), "fang surprised",
(0, 0), "amberpendant"
)
image fang psurprised flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/basic set/fang surprised.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
)
image fang nonxmas pendant angry = Composite(
# (1412, 1500),
@ -560,6 +573,12 @@ image fang nonxmas pendant neutral = Composite(
(0, 0), "fang neutral",
(0, 0), "amberpendant"
)
image fang pneutral flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/basic set/fang neutral.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
)
image fang nonxmas pendant considering = Composite(
# (1412, 1500),
@ -581,6 +600,12 @@ image fang nonxmas pendant very happy = Composite(
(0, 0), "fang very happy",
(0, 0), "amberpendant6veryhappy"
)
image fang pvhappy flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/emotive set/fang very happy.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant6veryhappy.png", horizontal=True)
)
image fang nonxmas pendant shocked = Composite(
# (1412, 1500),
@ -588,6 +613,12 @@ image fang nonxmas pendant shocked = Composite(
(0, 0), "fang shocked",
(0, 0), "amberpendant4shock"
)
image fang pshocked flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/emotive set/fang shocked.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant4shock.png", horizontal=True)
)
image fang nonxmas pendant flip off happy = Composite(
# (1412, 1500),
@ -595,6 +626,12 @@ image fang nonxmas pendant flip off happy = Composite(
(0, 0), "fang flip off happy",
(0, 0), "amberpendant"
)
image fang pbird happy flip = Composite(
# (1412, 1500),
(1412, 1500),
(0, 0), im.Flip("fang/emotive set/fang flip off happy.png", horizontal=True),
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
)
#phone gallery effect

6
game/script/x10-raymbas-observations.rpy
View File

@ -623,7 +623,7 @@ label chapter_x10:
F "Hey, don’t touch him. That’s RAYmba, I’m keeping him safe for a while."
show fang neutral flip behind raymbabox:
show fang pneutral flip behind raymbabox:
xcenter 1.5 yalign 0.45 zoom 2
blur 5
show fang:
@ -661,11 +661,11 @@ label chapter_x10:
"Observation:{w=.4} Unknown guest has left the room."
pause .5
show fang flip off happy flip with dissolve
show fang pbird happy flip with dissolve
stop music fadeout 6
F "{cps=*.1}...{/cps}Bitch{cps=*.1}...{/cps}"
show fang neutral flip with Dissolve(1)
show fang pneutral flip with Dissolve(1)
"Unknown guest designation confirmed."
pause 1

64
game/script/x6-passion-of-the-trigga.rpy
View File

@ -24,7 +24,7 @@ label chapter_x6:
yalign 0.1 xalign 0.75
show rosa neutral:
yalign 0.2 xalign 0.4
show fang neutral:
show fang nonxmas pendant neutral:
yalign 0.0 xalign -0.05
show anon neutral:
yalign 0.1 xalign -0.25
@ -55,7 +55,7 @@ label chapter_x6:
"A feathered elbow pierces my side."
show fang considering with Dissolve(.25)
show fang nonxmas pendant considering with Dissolve(.25)
F "Her mother works two jobs overtime just so Trish can go to school with us instead of Reef City Continuation."
show anon shrug with dissolve
@ -93,10 +93,10 @@ label chapter_x6:
show anon concerned with Dissolve(.25)
A "Oh no."
show fang unimpressed with Dissolve(.25)
show fang nonxmas pendant unimpressed with Dissolve(.25)
F "I went there for a week last September because Spears caught me slashing tires."
show fang sad with dissolve
show fang nonxmas pendant sad with dissolve
F "It’s hell."
show reed considering flip with Dissolve(.25)
@ -113,7 +113,7 @@ label chapter_x6:
Ro "We’re getting close to Trish’s place, no?"
show anon neutral
show fang neutral
show fang nonxmas pendant neutral
show reed neutral flip
show stella considering flip
show rosa considering flip
@ -127,12 +127,12 @@ label chapter_x6:
A "Why’s that?"
show fang considering with Dissolve(.25)
show fang nonxmas pendant considering with Dissolve(.25)
F "It’s summer vacation."
A "{cps=*.1}...{/cps}And?"
show fang happy with dissolve
show fang nonxmas pendant happy with dissolve
F "You’ll see."
pause .5
@ -158,7 +158,7 @@ label chapter_x6:
yalign 0.1 xalign 0.2
show stella neutral:
yalign 0.1 xalign 0.2
show fang neutral:
show fang nonxmas pendant neutral:
yalign 0.0 xalign -0.525
show rosa considering:
yalign 0.2 xalign -0.55
@ -249,7 +249,7 @@ label chapter_x6:
show rosa neutral with Dissolve(.25)
Ro "He’s so cute! Trish why did you not tell us you had a kid brother?"
show fang considering with Dissolve(.25)
show fang nonxmas pendant considering with Dissolve(.25)
F "Because-"
show trish unimpressed flip with Dissolve(.25)
@ -276,7 +276,7 @@ label chapter_x6:
show trish annoyed flip with dissolve
T "Riley, I swear to fuck-"
show fang happy with Dissolve(.25)
show fang nonxmas pendant happy with Dissolve(.25)
F "Hooookay, how about we get this party started!"
show stella neutral
@ -291,7 +291,7 @@ label chapter_x6:
stop music fadeout 4
play ambient 'audio/effects/outdoorloop.ogg' fadein 5
scene courtyard
show fang neutral:
show fang nonxmas pendant neutral:
yalign 0.0 xalign -0.3
show anon neutral:
yalign 0.1 xalign -0.3
@ -315,13 +315,13 @@ label chapter_x6:
"He flips the latches open to reveal a charcoal tray."
show fang surprised
show fang nonxmas pendant surprised
with Dissolve(.25)
A "What the?"
Re "Made this last week, just for the occasion."
show fang neutral with Dissolve(.25)
show fang nonxmas pendant neutral with Dissolve(.25)
F "An entire grill in a briefcase? Why?"
pause .5
@ -366,7 +366,7 @@ label chapter_x6:
show trish considering with Dissolve(.25)
T "There’s always at least one running around screeching."
show fang happy with Dissolve(.25)
show fang nonxmas pendant happy with Dissolve(.25)
F "Trish, why don’t you invite us over more often?"
F "I’d be glad to help when I don’t have classes{cps=*.1}...{/cps}"
@ -387,7 +387,7 @@ label chapter_x6:
Re "Fang, you wanna help a bit?"
show reed neutral flip
show fang neutral
show fang nonxmas pendant neutral
with Dissolve(.25)
F "Me? Uh{cps=*.1}...{/cps} Sure?"
@ -404,7 +404,7 @@ label chapter_x6:
F "I only wish I came up with the idea for a party sooner, I didn’t have much time to get everything together."
show fang happy with Dissolve(.25)
show fang nonxmas pendant happy with Dissolve(.25)
F "Like, imagine if we rented a bouncy house?"
pause .5
@ -436,7 +436,7 @@ label chapter_x6:
show fang:
easein_quart 1 xalign -0.25
show fang surprised with Dissolve(.25)
show fang nonxmas pendant surprised with Dissolve(.25)
F "Crap!"
"Fang returns her attention to the grill."
@ -449,7 +449,7 @@ label chapter_x6:
show anon:
easein_cubic 1.5 xalign 0.6
show fang:
show fang nonxmas pendant:
easein_cubic 1.5 xalign 1.4
show trish:
easein_cubic 1.5 xalign 1.15
@ -468,7 +468,7 @@ label chapter_x6:
easein_cubic 1.5 xalign 0.2
show tana:
easein_cubic 1.5 xalign 0.0
show fang neutral
show fang nonxmas pendant neutral
hide reed
hide rosa
hide stella
@ -490,7 +490,7 @@ label chapter_x6:
Tana "Is it true you can light things on fire with your hands?"
show fang neutral flip behind trish
show fang pneutral flip behind trish
show trish neutral flip
with dissolve
pause .5
@ -571,7 +571,7 @@ label chapter_x6:
with None
show tana cheer
show trevor awe
show fang happy flip
show fang phappy flip
with dissolve
pause 1
@ -645,7 +645,7 @@ label chapter_x6:
show reed:
easein_cubic 1.5 xalign 0.95
with None
show fang happy behind anon
show fang nonxmas pendant happy behind anon
show trish neutral behind fang
show anon neutral
with Dissolve(1)
@ -674,7 +674,7 @@ label chapter_x6:
yalign 0.1 xalign 0.1
show reed neutral:
yalign 0.1 xalign -0.6
show fang neutral flip:
show fang pneutral flip:
yalign 0.0 xalign 0.45
show anon neutral flip:
yalign 0.1 xalign 0.8
@ -700,7 +700,7 @@ label chapter_x6:
"She’s entirely focused on her greasy prey."
show fang happy flip with dissolve
show fang phappy flip with dissolve
"After a few test bites she throws the whole thing in the air{cps=*.1}...{/cps}"
@ -722,7 +722,7 @@ label chapter_x6:
with dissolve
pause .5
show fang shocked flip with dissolve
show fang pshocked flip with dissolve
"Only then does she remember others are watching."
show anon grin flip with dissolve
@ -758,7 +758,7 @@ label chapter_x6:
show fang behind stella:
ease_cubic 1 xalign 0.3
show fang surprised with dissolve
show fang nonxmas pendant surprised with dissolve
pause .5
A "If you’d all follow me back out front of the building{cps=*.1}...{/cps}"
@ -786,7 +786,7 @@ label chapter_x6:
yalign 0.1 xalign 0.9
show rosa considering flip:
yalign 0.2 xalign 1.5
show fang neutral flip:
show fang pneutral flip:
yalign 0.0 xalign -0.1
show reed neutral flip:
yalign 0.1 xalign 0.55
@ -833,7 +833,7 @@ label chapter_x6:
easein_quart 1.5 xalign 0.65 #0.65
with None
show trish surprised flip
show fang surprised flip
show fang psurprised flip
show reed shocked flip
with dissolve
show rosa neutral flip
@ -855,7 +855,7 @@ label chapter_x6:
show fang:
easein_quart 1 xalign -0.15
show fang shocked flip with Dissolve(.25)
show fang pshocked flip with Dissolve(.25)
F "How did you-?"
show reed:
@ -881,7 +881,7 @@ label chapter_x6:
parallel:
pause 0.5
easeout_cubic 1 xalign -1.5
show fang very happy flip with dissolve
show fang pvhappy flip with dissolve
pause .5
hide fang with dissolve
@ -1059,7 +1059,7 @@ label chapter_x6:
pause .5
scene trishhome
show fang happy flip:
show fang phappy flip:
yalign 0.0 xalign 0.8
show anon neutral flip:
yalign 0.1 xalign 1.0
@ -1297,7 +1297,7 @@ label chapter_x6:
easein_back 2 xalign 0.6 yalign 0.05
with None
show anon fear
show fang shocked
show fang nonxmas pendant shocked
show trish surprised
show tali happy flip
show chondra happy flip