diff --git a/src/base-environments/youth_room/youth_room.tscn b/src/base-environments/youth_room/youth_room.tscn index 989dd6e..f6132d2 100644 --- a/src/base-environments/youth_room/youth_room.tscn +++ b/src/base-environments/youth_room/youth_room.tscn @@ -2266,7 +2266,6 @@ light_array = Array[Vector3]([Vector3(-0.545, 0.915, 1.035), Vector3(-0.47, 0.85 [connection signal="body_exited" from="logic/Bed and Ladders/reset_failover" to="logic/PlayerController" method="_on_bed_exit"] [connection signal="pressed" from="logic/UI/ending_button" to="logic/UI/ending_button" method="hide"] [connection signal="pressed" from="logic/UI/ending_button" to="logic/UI/ending" method="show"] -[connection signal="cards_picked" from="logic/UI/Picker" to="logic/UI/Board" method="populate_board"] [connection signal="board_completed" from="logic/UI/Board" to="logic/UI/ending_button" method="show"] [connection signal="finished" from="logic/ScenePlayer/draven" to="logic/ScenePlayer" method="on_draeven_done"] [connection signal="input_event" from="logic/MaskMemento/UiWrapper" to="logic/MaskMemento/UiWrapper" method="_on_input_event"] diff --git a/src/dev-util/board of devs.tscn b/src/dev-util/board of devs.tscn index d3218ce..bb31c74 100644 --- a/src/dev-util/board of devs.tscn +++ b/src/dev-util/board of devs.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://bvowj4l8dtceu"] +[gd_scene load_steps=4 format=3 uid="uid://bvowj4l8dtceu"] [ext_resource type="Script" uid="uid://b6xp63orcmjq8" path="res://dev-util/devs_board.gd" id="1_ols6o"] [ext_resource type="PackedScene" uid="uid://dy5rd437h5hsw" path="res://logic-scenes/board/card.tscn" id="1_xrckx"] [ext_resource type="PackedScene" uid="uid://vkcdj8c3ytbq" path="res://logic-scenes/board/sticky-note.tscn" id="2_ucudl"] -[ext_resource type="PackedScene" uid="uid://vqwep0whfb0o" path="res://logic-scenes/board/void_card.tscn" id="4_b7cny"] [node name="board of devs" type="Control"] layout_mode = 3 @@ -163,9 +162,6 @@ text = "My body just didn't feel right" position = Vector2(-32, 140) text = "I just hate being treated like a girl" -[node name="c_void" parent="juijutsu" instance=ExtResource("4_b7cny")] -position = Vector2(16, 598) - [node name="c_hit" parent="juijutsu" node_paths=PackedStringArray("evil_sticky_notes") instance=ExtResource("1_xrckx")] position = Vector2(15, 297) evil_sticky_notes = [NodePath("../../childhood/c_teachers/p_becoming_teacher")] @@ -179,12 +175,15 @@ text = "that gives me a lot of confidence." position = Vector2(-32, 140) text = "and that’s a great vent." -[node name="p_wet" parent="juijutsu/c_hit" groups=["c_void"] instance=ExtResource("2_ucudl")] -position = Vector2(-31, 351) +[node name="c_void" parent="juijutsu" instance=ExtResource("1_xrckx")] +position = Vector2(16, 598) + +[node name="p_wet" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] +position = Vector2(-32, 50) text = "I was wet, so I must have been into it." -[node name="p_stop" parent="juijutsu/c_hit" groups=["c_void"] instance=ExtResource("2_ucudl")] -position = Vector2(-31, 441) +[node name="p_stop" parent="juijutsu/c_void" groups=["c_void"] instance=ExtResource("2_ucudl")] +position = Vector2(-32, 140) text = "I didn't say stop." [node name="test2" type="Control" parent="."] diff --git a/src/logic-scenes/board/card.gd b/src/logic-scenes/board/card.gd index 206771f..ee0ac13 100644 --- a/src/logic-scenes/board/card.gd +++ b/src/logic-scenes/board/card.gd @@ -103,6 +103,12 @@ func _ready(): wiggle_pos = float(text.hash() % 100) if not Engine.is_editor_hint(): _handle_wiggle(0) + + if text == "": + become_void() + +func become_void(): + %BackgroundSprite.add_child(load("res://logic-scenes/board/void_stuff.tscn").instantiate()) func _process(delta: float) -> void: if highlighted: diff --git a/src/logic-scenes/board/sticky-note.tscn b/src/logic-scenes/board/sticky-note.tscn index a729e46..926f835 100644 --- a/src/logic-scenes/board/sticky-note.tscn +++ b/src/logic-scenes/board/sticky-note.tscn @@ -8,92 +8,92 @@ radius = 48.0 height = 312.0 -[sub_resource type="AtlasTexture" id="AtlasTexture_nj16s"] +[sub_resource type="AtlasTexture" id="AtlasTexture_260t4"] atlas = ExtResource("2_j17jn") region = Rect2(0, 0, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_23tiq"] +[sub_resource type="AtlasTexture" id="AtlasTexture_1dusx"] atlas = ExtResource("2_j17jn") region = Rect2(500, 0, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_aomh0"] -atlas = ExtResource("2_j17jn") -region = Rect2(1000, 0, 500, 220) - -[sub_resource type="AtlasTexture" id="AtlasTexture_n3svg"] -atlas = ExtResource("2_j17jn") -region = Rect2(1500, 0, 500, 220) - -[sub_resource type="AtlasTexture" id="AtlasTexture_tfg7a"] +[sub_resource type="AtlasTexture" id="AtlasTexture_3dfo6"] atlas = ExtResource("2_j17jn") region = Rect2(0, 220, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_dtics"] +[sub_resource type="AtlasTexture" id="AtlasTexture_ltrdw"] atlas = ExtResource("2_j17jn") region = Rect2(500, 220, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_e0ocs"] -atlas = ExtResource("2_j17jn") -region = Rect2(1000, 220, 500, 220) - -[sub_resource type="AtlasTexture" id="AtlasTexture_bpwg2"] -atlas = ExtResource("2_j17jn") -region = Rect2(1500, 220, 500, 220) - -[sub_resource type="AtlasTexture" id="AtlasTexture_xaxol"] +[sub_resource type="AtlasTexture" id="AtlasTexture_spwka"] atlas = ExtResource("2_j17jn") region = Rect2(0, 440, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_ifitb"] +[sub_resource type="AtlasTexture" id="AtlasTexture_62rvp"] atlas = ExtResource("2_j17jn") region = Rect2(500, 440, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_6slhe"] +[sub_resource type="AtlasTexture" id="AtlasTexture_v1axh"] atlas = ExtResource("2_j17jn") region = Rect2(1000, 440, 500, 220) -[sub_resource type="AtlasTexture" id="AtlasTexture_4tk5m"] +[sub_resource type="AtlasTexture" id="AtlasTexture_5ria3"] +atlas = ExtResource("2_j17jn") +region = Rect2(1000, 220, 500, 220) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7ii0f"] +atlas = ExtResource("2_j17jn") +region = Rect2(1000, 0, 500, 220) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7upwc"] +atlas = ExtResource("2_j17jn") +region = Rect2(1500, 0, 500, 220) + +[sub_resource type="AtlasTexture" id="AtlasTexture_drssb"] +atlas = ExtResource("2_j17jn") +region = Rect2(1500, 220, 500, 220) + +[sub_resource type="AtlasTexture" id="AtlasTexture_anws8"] atlas = ExtResource("2_j17jn") region = Rect2(1500, 440, 500, 220) -[sub_resource type="SpriteFrames" id="SpriteFrames_2amsi"] +[sub_resource type="SpriteFrames" id="SpriteFrames_5scpe"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_nj16s") +"texture": SubResource("AtlasTexture_260t4") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_23tiq") +"texture": SubResource("AtlasTexture_1dusx") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_aomh0") +"texture": SubResource("AtlasTexture_3dfo6") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_n3svg") +"texture": SubResource("AtlasTexture_ltrdw") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_tfg7a") +"texture": SubResource("AtlasTexture_spwka") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_dtics") +"texture": SubResource("AtlasTexture_62rvp") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_e0ocs") +"texture": SubResource("AtlasTexture_v1axh") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_bpwg2") +"texture": SubResource("AtlasTexture_5ria3") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_xaxol") +"texture": SubResource("AtlasTexture_7ii0f") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_ifitb") +"texture": SubResource("AtlasTexture_7upwc") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_6slhe") +"texture": SubResource("AtlasTexture_drssb") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_4tk5m") +"texture": SubResource("AtlasTexture_anws8") }], "loop": true, "name": &"default", @@ -115,8 +115,7 @@ shape = SubResource("CapsuleShape2D_ml4q7") [node name="BackgroundSprite" type="AnimatedSprite2D" parent="Content"] position = Vector2(99.5, 0) scale = Vector2(0.65, 0.65) -sprite_frames = SubResource("SpriteFrames_2amsi") -frame = 5 +sprite_frames = SubResource("SpriteFrames_5scpe") [node name="Label" type="Label" parent="Content"] anchors_preset = 8 diff --git a/src/logic-scenes/board/void_card.tscn b/src/logic-scenes/board/void_card.tscn index b027802..71f89e7 100644 --- a/src/logic-scenes/board/void_card.tscn +++ b/src/logic-scenes/board/void_card.tscn @@ -1,9 +1,8 @@ -[gd_scene load_steps=20 format=3 uid="uid://vqwep0whfb0o"] +[gd_scene load_steps=12 format=3 uid="uid://vqwep0whfb0o"] [ext_resource type="Script" uid="uid://2loic2eeec5b" path="res://logic-scenes/board/card.gd" id="1_6ceun"] [ext_resource type="Texture2D" uid="uid://sv0nhkkur1tt" path="res://logic-scenes/board/card-textures/cardsheet.png" id="2_buevv"] -[ext_resource type="Texture2D" uid="uid://kpmk21d8rlso" path="res://logic-scenes/board/particle_textures/star.png" id="3_8wu8j"] -[ext_resource type="Texture2D" uid="uid://bqilajx05t0eb" path="res://logic-scenes/board/particle_textures/void_nomotion.png" id="4_jam8u"] +[ext_resource type="PackedScene" uid="uid://b2st6v25p0ley" path="res://logic-scenes/board/void_stuff.tscn" id="3_ipd1f"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_aqrbw"] radius = 110.0 @@ -79,60 +78,6 @@ animations = [{ "speed": 5.0 }] -[sub_resource type="Gradient" id="Gradient_v70nd"] -interpolation_mode = 2 -offsets = PackedFloat32Array(0, 0.0529197, 0.191606, 1) -colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0.491329, 1, 1, 1, 0) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_xxq8p"] -gradient = SubResource("Gradient_v70nd") - -[sub_resource type="Curve" id="Curve_q6cmf"] -_data = [Vector2(0, 0), 0.0, 3.16529, 0, 0, Vector2(0.241056, 0.191336), 0.132446, 0.132446, 0, 0, Vector2(1, 1), 3.94797, 0.0, 0, 0] -point_count = 3 - -[sub_resource type="CurveTexture" id="CurveTexture_cg0w1"] -curve = SubResource("Curve_q6cmf") - -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_by44l"] -particle_flag_disable_z = true -emission_shape = 6 -emission_ring_axis = Vector3(0, 0, 1) -emission_ring_height = 0.0 -emission_ring_radius = 180.0 -emission_ring_inner_radius = 185.0 -emission_ring_cone_angle = 90.0 -spread = 180.0 -initial_velocity_min = -10.0 -initial_velocity_max = 10.0 -angular_velocity_min = -150.0 -angular_velocity_max = -150.0 -gravity = Vector3(0, 0, 0) -radial_accel_min = -20.0 -radial_accel_max = -5.0 -tangential_accel_min = 20.0 -tangential_accel_max = 30.0 -attractor_interaction_enabled = false -scale_min = 3.0 -scale_max = 5.0 -scale_curve = SubResource("CurveTexture_cg0w1") -color_ramp = SubResource("GradientTexture1D_xxq8p") -turbulence_noise_strength = 0.1 - -[sub_resource type="GDScript" id="GDScript_vjwk7"] -script/source = "extends GPUParticles2D - -func _process(_delta): - self.visible = !State.reduce_motion -" - -[sub_resource type="GDScript" id="GDScript_tgc0b"] -script/source = "extends Sprite2D - -func _process(_delta): - self.visible = State.reduce_motion -" - [node name="c_void" type="Area2D"] script = ExtResource("1_6ceun") metadata/type = "card" @@ -150,23 +95,9 @@ script = SubResource("GDScript_8bs16") unique_name_in_owner = true clip_children = 2 sprite_frames = SubResource("SpriteFrames_cu2at") +frame = 1 -[node name="GPUParticles2D" type="GPUParticles2D" parent="Visual/BackgroundSprite"] -amount = 500 -texture = ExtResource("3_8wu8j") -lifetime = 2.5 -speed_scale = 1.3 -explosiveness = 0.2 -randomness = 0.14 -local_coords = true -process_material = SubResource("ParticleProcessMaterial_by44l") -script = SubResource("GDScript_vjwk7") - -[node name="Sprite2D" type="Sprite2D" parent="Visual/BackgroundSprite"] -visible = false -scale = Vector2(0.4, 0.4) -texture = ExtResource("4_jam8u") -script = SubResource("GDScript_tgc0b") +[node name="void_stuff" parent="Visual/BackgroundSprite" instance=ExtResource("3_ipd1f")] [node name="StickyNoteAncor" type="Node2D" parent="Visual/BackgroundSprite"] unique_name_in_owner = true diff --git a/src/logic-scenes/board/void_stuff.tscn b/src/logic-scenes/board/void_stuff.tscn new file mode 100644 index 0000000..9adebae --- /dev/null +++ b/src/logic-scenes/board/void_stuff.tscn @@ -0,0 +1,77 @@ +[gd_scene load_steps=10 format=3 uid="uid://b2st6v25p0ley"] + +[ext_resource type="Texture2D" uid="uid://kpmk21d8rlso" path="res://logic-scenes/board/particle_textures/star.png" id="1_kbpjt"] +[ext_resource type="Texture2D" uid="uid://bqilajx05t0eb" path="res://logic-scenes/board/particle_textures/void_nomotion.png" id="2_5si5k"] + +[sub_resource type="Gradient" id="Gradient_v70nd"] +interpolation_mode = 2 +offsets = PackedFloat32Array(0, 0.0529197, 0.191606, 1) +colors = PackedColorArray(1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0.491329, 1, 1, 1, 0) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_xxq8p"] +gradient = SubResource("Gradient_v70nd") + +[sub_resource type="Curve" id="Curve_q6cmf"] +_data = [Vector2(0, 0), 0.0, 3.16529, 0, 0, Vector2(0.241056, 0.191336), 0.132446, 0.132446, 0, 0, Vector2(1, 1), 3.94797, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="CurveTexture" id="CurveTexture_cg0w1"] +curve = SubResource("Curve_q6cmf") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_by44l"] +particle_flag_disable_z = true +emission_shape = 6 +emission_ring_axis = Vector3(0, 0, 1) +emission_ring_height = 0.0 +emission_ring_radius = 180.0 +emission_ring_inner_radius = 185.0 +emission_ring_cone_angle = 90.0 +spread = 180.0 +initial_velocity_min = -10.0 +initial_velocity_max = 10.0 +angular_velocity_min = -150.0 +angular_velocity_max = -150.0 +gravity = Vector3(0, 0, 0) +radial_accel_min = -20.0 +radial_accel_max = -5.0 +tangential_accel_min = 20.0 +tangential_accel_max = 30.0 +attractor_interaction_enabled = false +scale_min = 3.0 +scale_max = 5.0 +scale_curve = SubResource("CurveTexture_cg0w1") +color_ramp = SubResource("GradientTexture1D_xxq8p") +turbulence_noise_strength = 0.1 + +[sub_resource type="GDScript" id="GDScript_vjwk7"] +script/source = "extends GPUParticles2D + +func _process(_delta): + self.visible = !State.reduce_motion +" + +[sub_resource type="GDScript" id="GDScript_tgc0b"] +script/source = "extends Sprite2D + +func _process(_delta): + self.visible = State.reduce_motion +" + +[node name="void_stuff" type="Node2D"] + +[node name="GPUParticles2D" type="GPUParticles2D" parent="."] +amount = 500 +texture = ExtResource("1_kbpjt") +lifetime = 2.5 +speed_scale = 1.3 +explosiveness = 0.2 +randomness = 0.14 +local_coords = true +process_material = SubResource("ParticleProcessMaterial_by44l") +script = SubResource("GDScript_vjwk7") + +[node name="Sprite2D" type="Sprite2D" parent="."] +visible = false +scale = Vector2(0.4, 0.4) +texture = ExtResource("2_5si5k") +script = SubResource("GDScript_tgc0b") diff --git a/src/project.godot b/src/project.godot index 20142f9..e102269 100644 --- a/src/project.godot +++ b/src/project.godot @@ -26,7 +26,7 @@ config/icon="res://icon.png" State="*res://singletons/global_state.gd" Scenes="*res://singletons/scene_reference.gd" -Steamworks="res://dev-util/steamworks.gd" +Steamworks="*res://dev-util/steamworks.gd" PromptManager="*res://addons/input_prompts/input_prompt_manager.gd" [debug]