refactor and adjust defualt metro view to be lower

This commit is contained in:
Mappening 2023-05-19 20:30:26 -05:00
parent 0ae38d6ef2
commit fb63a2afa3
4 changed files with 53 additions and 36 deletions

View File

@ -189,8 +189,8 @@ label chapter_2:
"Like a movie poster, almost."
show metroferris behind bg_metro_overlay with eidissolve:
truecenter
moveindown(0.5, 0.5)
tf_metro_defaultalign
moveindown(METRO_DEFAULTALIGNX, METRO_DEFAULTALIGNY)
pause 0.5
"I'd take a picture, but it might be a little too awkward for me."
@ -208,10 +208,10 @@ label chapter_2:
pause 0.5
show layer master:
ease_cubic 2 ypos 500
ease_cubic 2 ypos METRO_CAMERA_FERRISVIEW
pause 3
show layer master:
ypos 500 # necessary for some stupid reason
ypos METRO_CAMERA_FERRISVIEW # necessary for some stupid reason
"I'm taken aback at his authoritative stature."

View File

@ -1076,8 +1076,8 @@ label chapter_3:
"Right?{w=0.3} Huh{cps=5}...{/cps}"
show metroferris behind bg_metro_overlay with eidissolve:
truecenter
moveindown(0.5, 0.5)
tf_metro_defaultalign
moveindown(METRO_DEFAULTALIGNX, METRO_DEFAULTALIGNY)
pause 0.5
"Anyways."
@ -1087,10 +1087,10 @@ label chapter_3:
"Must be Mr. Ferris."
show layer master:
ease_cubic 1.5 ypos 500
ease_cubic 1.5 ypos METRO_CAMERA_FERRISVIEW
pause 1.5
show layer master:
ypos 500
ypos METRO_CAMERA_FERRISVIEW
Fe "Good morning, Inco."
@ -1119,14 +1119,14 @@ label chapter_3:
show metroferris neutral_considering
show layer master:
ypos 500
ease_cubic 1.5 ypos 100
ypos METRO_CAMERA_FERRISVIEW
ease_cubic 1.5 ypos 200
pause 2
ease_cubic 1.5 ypos 500
ease_cubic 1.5 ypos METRO_CAMERA_FERRISVIEW
pause 5
show layer master:
ypos 500
ypos METRO_CAMERA_FERRISVIEW
Fe "{cps=5}...{/cps}"
pause 0.5

View File

@ -354,8 +354,9 @@ image anim_pooldunk5:
image spr_metrorandy_hoe:
# WHAT THE FUCK. WHY DOES THIS FUCKING CONTAINS SHIT NOT BE AFFECTED BY XALIGN OR YALIGN OUTSIDE OF HERE, WHY DOES IT ONLY AFFECT THIS BITCH
# AND WHY THE FUCK DO I HAVE TO MANUALLY PUT IN SEEMINGLY ARBITRARY OFFSETS
"spr_null"
xoffset -27
yoffset -551
yoffset -648
contains:
"spr_metrorandy_hoe_body"
contains:
@ -369,8 +370,9 @@ image spr_metrorandy_hoe_bump:
pause 0.083
"spr_metrorandy_hoe"
image spr_metrorandy_hoe_blink:
"spr_null"
xoffset -27
yoffset -551
yoffset -648
contains:
"spr_metrorandy_hoe_body"
contains:

View File

@ -232,6 +232,21 @@ transform tf_metro_soundplayer:
pause 6
repeat
#constants
init python:
# Metro asset aligns. Effectively the camera, but the camera's position would not be affected. This makes it so the default view lets the camera be located at (0.0, 0.0)
METRO_DEFAULTALIGNX = 0.5
METRO_DEFAULTALIGNY = 0.59
# Positions for the camera to pan up/down
METRO_CAMERA_FERRISVIEW = 600
# Aligns the metro to it's default view to the camera without needing to adjust the camera to the correct position
transform tf_metro_defaultalign:
xalign METRO_DEFAULTALIGNX
yalign METRO_DEFAULTALIGNY
# Call these labels, so you can quickly setup the metro scene in a chapter
@ -240,7 +255,7 @@ label l_metro_day_sound:
show bg_metro_skyline:
xpos 0.46
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, -9.0, 0.0)
block:
xpan 0
@ -248,17 +263,17 @@ label l_metro_day_sound:
repeat
show bg_metro_skyline as bg_metro_skyline2:
xpos -0.96
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, 9.0, 0.0)
block:
xpan 0
linear 140 xpan -360
repeat
show bg_metro_base at truecenter
show bg_metro_base at tf_metro_defaultalign
show spr_metrorandy_hoe:
truecenter
tf_metro_defaultalign
pause 4
"spr_metrorandy_hoe_blink"
pause 4.1
@ -274,14 +289,14 @@ label l_metro_day_sound:
repeat
show spr_metrorandy_rebels:
truecenter
tf_metro_defaultalign
pause 8.1
block:
"spr_metrorandy_rebels_bump"
pause 8
repeat
show spr_metrorandy_paperguy:
truecenter
tf_metro_defaultalign
pause 8.1
block:
"spr_metrorandy_paperguy_bump"
@ -294,8 +309,8 @@ label l_metro_day_sound:
pause 8
repeat
show bg_metro_bars at truecenter
show bg_metro_overlay at truecenter
show bg_metro_bars at tf_metro_defaultalign
show bg_metro_overlay at tf_metro_defaultalign
return
@ -306,7 +321,7 @@ label l_metro_day:
show bg_metro_skyline:
xpos 0.46
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, -9.0, 0.0)
block:
xpan 0
@ -314,17 +329,17 @@ label l_metro_day:
repeat
show bg_metro_skyline as bg_metro_skyline2:
xpos -0.96
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, 9.0, 0.0)
block:
xpan 0
linear 140 xpan -360
repeat
show bg_metro_base at truecenter
show bg_metro_base at tf_metro_defaultalign
show spr_metrorandy_hoe:
truecenter
tf_metro_defaultalign
pause 4
"spr_metrorandy_hoe_blink"
pause 4.1
@ -340,14 +355,14 @@ label l_metro_day:
repeat
show spr_metrorandy_rebels:
truecenter
tf_metro_defaultalign
pause 8.1
block:
"spr_metrorandy_rebels_bump"
pause 8
repeat
show spr_metrorandy_paperguy:
truecenter
tf_metro_defaultalign
pause 8.1
block:
"spr_metrorandy_paperguy_bump"
@ -360,8 +375,8 @@ label l_metro_day:
pause 8
repeat
show bg_metro_bars at truecenter
show bg_metro_overlay at truecenter
show bg_metro_bars at tf_metro_defaultalign
show bg_metro_overlay at tf_metro_defaultalign
camera:
perspective True
@ -376,7 +391,7 @@ label l_metro_dusk:
show bg_metro_skyline:
xpos 0.46
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, -9.0, 0.0)
block:
xpan 0
@ -384,17 +399,17 @@ label l_metro_dusk:
repeat
show bg_metro_skyline as bg_metro_skyline2:
xpos -0.96
ypos -0.61
ypos -0.69
matrixtransform RotateMatrix(0.0, 9.0, 0.0)
block:
xpan 0
linear 140 xpan 360
repeat
show bg_metro_base at truecenter
show bg_metro_base at tf_metro_defaultalign
show spr_metrorandy_paperguy:
truecenter
tf_metro_defaultalign
pause 8.1
block:
"spr_metrorandy_paperguy_bump"
@ -407,8 +422,8 @@ label l_metro_dusk:
pause 8
repeat
show bg_metro_bars at truecenter
show bg_metro_overlay at truecenter
show bg_metro_bars at tf_metro_defaultalign
show bg_metro_overlay at tf_metro_defaultalign
camera:
perspective True