mirror of
https://git.cavemanon.xyz/Cavemanon/SnootGame.git
synced 2025-01-22 17:26:20 +01:00
fix fang not having her pendant
This commit is contained in:
Map
parent
e7910dbd44
commit
ccc574f96c
8 changed files with 54 additions and 48 deletions
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
|
|
@ -134,8 +134,8 @@ default preferences.text_cps = 50
|
|||
default preferences.afm_time = 15
|
||||
|
||||
##Default Audio is not ear rape
|
||||
define config.default_music_volume = 0.55
|
||||
define config.default_sfx_volume = 0.90
|
||||
define config.default_music_volume = 0.48
|
||||
define config.default_sfx_volume = 0.80
|
||||
|
||||
## Save directory ##############################################################
|
||||
##
|
||||
|
|
|
|||
|
|
@ -25,7 +25,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
|
||||
|
|
@ -56,7 +56,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
|
||||
|
|
@ -96,10 +96,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)
|
||||
|
|
@ -116,7 +116,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
|
||||
|
|
@ -130,12 +130,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
|
||||
|
||||
|
|
@ -165,7 +165,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
|
||||
|
|
@ -260,7 +260,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)
|
||||
|
|
@ -289,7 +289,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
|
||||
|
|
@ -306,7 +306,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
|
||||
|
|
@ -330,13 +330,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
|
||||
|
||||
|
|
@ -383,7 +383,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}"
|
||||
|
|
@ -404,7 +404,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?"
|
||||
|
|
@ -421,7 +421,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
|
||||
|
||||
|
|
@ -453,7 +453,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."
|
||||
|
|
@ -487,7 +487,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
|
||||
|
|
@ -509,7 +509,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
|
||||
|
|
@ -592,7 +592,7 @@ label chapter_x6:
|
|||
with None
|
||||
show tana cheer
|
||||
show trevor awe
|
||||
show fang happy flip
|
||||
show fang phappy flip
|
||||
with dissolve
|
||||
pause 1
|
||||
|
||||
|
|
@ -670,7 +670,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)
|
||||
|
|
@ -703,7 +703,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
|
||||
|
|
@ -729,7 +729,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}"
|
||||
|
||||
|
|
@ -753,7 +753,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
|
||||
|
|
@ -789,7 +789,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}"
|
||||
|
|
@ -821,7 +821,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
|
||||
|
|
@ -870,7 +870,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
|
||||
|
|
@ -892,7 +892,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:
|
||||
|
|
@ -920,7 +920,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
|
||||
|
||||
|
|
@ -1110,7 +1110,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
|
||||
|
|
@ -1361,7 +1361,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
|
||||
|
|
|
|||
|
|
@ -702,14 +702,13 @@ image fangroom blurred = Composite(
|
|||
(0, 0), Transform('images/backgrounds/fangroom text.png', blur=20)
|
||||
)
|
||||
image lighter = "images/other/lighter.png"
|
||||
image amberpendant = "images/other/amberpendant1.png"
|
||||
image amberpendant = "images/fang/pendant/amberpendant1.png"
|
||||
image fangphonelayer1 = "images/other/fangphonelayer1.png"
|
||||
image fangphonelayer2 = im.Alpha("images/other/fangphonelayer2.png", 0.4)
|
||||
image nonalcoholic = "images/other/soda.png"
|
||||
image amberpendant = "images/other/amberpendant1.png"
|
||||
image amberpendant6veryhappy = 'images/other/amberpendant6veryhappy.png'
|
||||
image amberpendant7earcover = 'images/other/amberpendant7earcover.png'
|
||||
image amberpendant4shock = 'images/other/amberpendant4shock.png'
|
||||
image amberpendant6veryhappy = 'images/fang/pendant/amberpendant6veryhappy.png'
|
||||
image amberpendant7earcover = 'images/fang/pendant/amberpendant7earcover.png'
|
||||
image amberpendant4shock = 'images/fang/pendant/amberpendant4shock.png'
|
||||
image chillicheesefries = 'images/other/chilli cheese fries.png'
|
||||
image chillicheesefries_hack = 'images/other/chilli cheese fries.png'
|
||||
image ccf_rstain = 'images/other/rstain base set for composites.png'
|
||||
|
|
@ -832,7 +831,7 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant sad = Composite(
|
||||
|
|
@ -846,7 +845,7 @@ image fang psad flip = Composite(
|
|||
# (1412, 1500),
|
||||
(1412, 1500),
|
||||
(0, 0), im.Flip("fang/basic set/fang sad.png", horizontal=True),
|
||||
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant unimpressed = Composite(
|
||||
|
|
@ -866,7 +865,7 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant angry = Composite(
|
||||
|
|
@ -880,21 +879,21 @@ image fang pangry flip = Composite(
|
|||
# (1412, 1500),
|
||||
(1412, 1500),
|
||||
(0, 0), im.Flip("fang/basic set/fang angry.png", horizontal=True),
|
||||
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang punimpressed flip = Composite(
|
||||
# (1412, 1500),
|
||||
(1412, 1500),
|
||||
(0, 0), im.Flip("fang/basic set/fang unimpressed.png", horizontal=True),
|
||||
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang pconsidering flip = Composite(
|
||||
# (1412, 1500),
|
||||
(1412, 1500),
|
||||
(0, 0), im.Flip("fang/basic set/fang considering.png", horizontal=True),
|
||||
(0, 0), im.Flip("images/other/amberpendant1.png", horizontal=True)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant neutral = Composite(
|
||||
|
|
@ -907,7 +906,7 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant considering = Composite(
|
||||
|
|
@ -934,7 +933,7 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant6veryhappy.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang nonxmas pendant shocked = Composite(
|
||||
|
|
@ -947,7 +946,7 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant4shock.png", horizontal=True)
|
||||
)
|
||||
|
||||
image fang pear cover = Composite(
|
||||
|
|
@ -966,7 +965,14 @@ 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)
|
||||
(0, 0), im.Flip("images/fang/pendant/amberpendant1.png", horizontal=True)
|
||||
)
|
||||
|
||||
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/fang/pendant/amberpendant4shock.png", horizontal=True)
|
||||
)
|
||||
|
||||
image stella_hack = Composite(
|
||||
|
|
|
|||
Loading…
Reference in a new issue