From 2a60005ce80da4a41c97a4f5b6c752341e10579a Mon Sep 17 00:00:00 2001 From: Harmony Honey Date: Wed, 29 Mar 2023 16:39:21 -0400 Subject: [PATCH] MenuMakeover fade out star_light and CanvasModulate --- src/autoload/Clouds.gd | 8 +- src/menu/MenuMakeover.tscn | 210 +++++++++++++++++-------------------- 2 files changed, 103 insertions(+), 115 deletions(-) diff --git a/src/autoload/Clouds.gd b/src/autoload/Clouds.gd index 7bd614f..dd015b9 100644 --- a/src/autoload/Clouds.gd +++ b/src/autoload/Clouds.gd @@ -62,6 +62,8 @@ export var color_bright := Color.white export var color_dark := Color("bfbfbf") func _enter_tree(): + if Engine.editor_hint: return + Shared.connect("scene_changed", self, "scene") Cam.connect("moved", self, "cam_moved") @@ -122,7 +124,11 @@ func _process(delta): moon.modulate.a = moon_frac starfield.modulate.a = moon_frac starfield.visible = moon_frac > 0 - canvas_mod.color = color_bright.linear_interpolate(color_dark, moon_frac) + + var mf = MenuMakeover.fade_ease + canvas_mod.color = color_bright.linear_interpolate(color_dark, max(moon_frac - mf.smooth(), 0.0)) + if !mf.is_last: + star_light.energy = lerp(0.4, 0.0, mf.smooth()) # rotation star_rotation = day_frac * TAU diff --git a/src/menu/MenuMakeover.tscn b/src/menu/MenuMakeover.tscn index 03727f7..ddd96b9 100644 --- a/src/menu/MenuMakeover.tscn +++ b/src/menu/MenuMakeover.tscn @@ -1,5 +1,6 @@ [gd_scene load_steps=12 format=2] +[ext_resource path="res://src/class/shape/Rectangle.gd" type="Script" id=1] [ext_resource path="res://src/menu/MenuMakeover.gd" type="Script" id=2] [ext_resource path="res://src/menu/options/scroll/Hairstyle.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actor/Hair.tscn" type="PackedScene" id=4] @@ -25,10 +26,6 @@ corner_radius_bottom_left = 50 [sub_resource type="StyleBoxFlat" id=6] bg_color = Color( 1, 1, 1, 1 ) -[sub_resource type="Curve" id=7] -min_value = 0.73 -_data = [ Vector2( 0, 0.73 ), 0.0, 0.27, 0, 1, Vector2( 1, 1 ), 0.27, 0.0, 1, 0 ] - [node name="MenuMakeover" type="CanvasLayer"] pause_mode = 2 script = ExtResource( 2 ) @@ -491,32 +488,29 @@ points = 8 position = Vector2( 35, 35 ) scale = Vector2( 1.333, 1.333 ) -[node name="LegL" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] -position = Vector2( -5, -9.5 ) +[node name="LegL" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] +position = Vector2( -3, -14 ) rotation = 0.387463 -points = PoolVector2Array( 0, 0, -7.62939e-06, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="LegR" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] -position = Vector2( 5, -9.5 ) +[node name="LegR" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] +position = Vector2( 3, -14 ) rotation = -0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="Torso" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] -position = Vector2( 0, -9.5 ) -points = PoolVector2Array( 0, -5, 0, 20 ) -width = 15.5 -width_curve = SubResource( 7 ) -default_color = Color( 1, 1, 1, 1 ) +[node name="Torso" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle/Fit"] +position = Vector2( 0, -14.5 ) +polygon = PoolVector2Array( 7.6, 25, -7.6, 25, -5.55, 0, 5.55, 0 ) [node name="Circle2" type="Control" parent="Dialog/List/Fit/HBoxContainer"] modulate = Color( 1, 0, 0, 1 ) @@ -532,32 +526,29 @@ points = 8 position = Vector2( 35, 35 ) scale = Vector2( 1.444, 1.444 ) -[node name="LegL" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] -position = Vector2( -5, -9.5 ) +[node name="LegL" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] +position = Vector2( -3, -14 ) rotation = 0.387463 -points = PoolVector2Array( 0, 0, -7.62939e-06, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="LegR" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] -position = Vector2( 5, -9.5 ) +[node name="LegR" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] +position = Vector2( 3, -14 ) rotation = -0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="Torso" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] -position = Vector2( 0, -9.5 ) -points = PoolVector2Array( 0, -5, 0, 20 ) -width = 15.5 -width_curve = SubResource( 7 ) -default_color = Color( 1, 1, 1, 1 ) +[node name="Torso" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle2/Fit"] +position = Vector2( 0, -14.5 ) +polygon = PoolVector2Array( 7.6, 25, -7.6, 25, -5.55, 0, 5.55, 0 ) [node name="Circle3" type="Control" parent="Dialog/List/Fit/HBoxContainer"] modulate = Color( 0, 0, 1, 1 ) @@ -573,32 +564,29 @@ points = 8 position = Vector2( 35, 35 ) scale = Vector2( 1.667, 1.667 ) -[node name="LegL" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] -position = Vector2( -5, -9.5 ) +[node name="LegL" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] +position = Vector2( -3, -14 ) rotation = 0.387463 -points = PoolVector2Array( 0, 0, -7.62939e-06, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="LegR" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] -position = Vector2( 5, -9.5 ) +[node name="LegR" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] +position = Vector2( 3, -14 ) rotation = -0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="Torso" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] -position = Vector2( 0, -9.5 ) -points = PoolVector2Array( 0, -5, 0, 20 ) -width = 15.5 -width_curve = SubResource( 7 ) -default_color = Color( 1, 1, 1, 1 ) +[node name="Torso" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle3/Fit"] +position = Vector2( 0, -14.5 ) +polygon = PoolVector2Array( 7.6, 25, -7.6, 25, -5.55, 0, 5.55, 0 ) [node name="Circle4" type="Control" parent="Dialog/List/Fit/HBoxContainer"] margin_left = 249.0 @@ -613,32 +601,29 @@ points = 8 position = Vector2( 35, 35 ) scale = Vector2( 1.444, 1.444 ) -[node name="LegL" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] -position = Vector2( -5, -9.5 ) +[node name="LegL" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] +position = Vector2( -3, -14 ) rotation = 0.387463 -points = PoolVector2Array( 0, 0, -7.62939e-06, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="LegR" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] -position = Vector2( 5, -9.5 ) +[node name="LegR" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] +position = Vector2( 3, -14 ) rotation = -0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="Torso" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] -position = Vector2( 0, -9.5 ) -points = PoolVector2Array( 0, -5, 0, 20 ) -width = 15.5 -width_curve = SubResource( 7 ) -default_color = Color( 1, 1, 1, 1 ) +[node name="Torso" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle4/Fit"] +position = Vector2( 0, -14.5 ) +polygon = PoolVector2Array( 7.6, 25, -7.6, 25, -5.55, 0, 5.55, 0 ) [node name="Circle5" type="Control" parent="Dialog/List/Fit/HBoxContainer"] modulate = Color( 0, 0, 0, 1 ) @@ -654,32 +639,29 @@ points = 8 position = Vector2( 35, 35 ) scale = Vector2( 1.333, 1.333 ) -[node name="LegL" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] -position = Vector2( -5, -9.5 ) +[node name="LegL" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] +position = Vector2( -3, -14 ) rotation = 0.387463 -points = PoolVector2Array( 0, 0, -7.62939e-06, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="LegR" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] -position = Vector2( 5, -9.5 ) +[node name="LegR" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] +position = Vector2( 3, -14 ) rotation = -0.387463 -points = PoolVector2Array( 0, 0, 0, 26 ) -default_color = Color( 1, 1, 1, 1 ) -begin_cap_mode = 2 -end_cap_mode = 2 -round_precision = 6 -antialiased = true +polygon = PoolVector2Array( 5, 31, 4.33013, 33.5, 2.5, 35.3301, -2.18557e-07, 36, -2.5, 35.3301, -4.33013, 33.5, -5, 31, -5, 5, -4.33013, 2.5, -2.5, 0.669873, 5.96244e-08, 0, 2.5, 0.669873, 4.33013, 2.5, 5, 5 ) +script = ExtResource( 1 ) +size = Vector2( 5, 18 ) +rect_offset = Vector2( 0, 18 ) +radius = Plane( -2, -1, -1, -1 ) +points = 4 -[node name="Torso" type="Line2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] -position = Vector2( 0, -9.5 ) -points = PoolVector2Array( 0, -5, 0, 20 ) -width = 15.5 -width_curve = SubResource( 7 ) -default_color = Color( 1, 1, 1, 1 ) +[node name="Torso" type="Polygon2D" parent="Dialog/List/Fit/HBoxContainer/Circle5/Fit"] +position = Vector2( 0, -14.5 ) +polygon = PoolVector2Array( 7.6, 25, -7.6, 25, -5.55, 0, 5.55, 0 ) [node name="Random" type="TextureRect" parent="Dialog/List"] margin_left = 175.0