diff --git a/art/indoor/room export/Room_01_walls.png b/art/indoor/room export/Room_01_walls.png index 2d1d7c0..ca488d9 100644 Binary files a/art/indoor/room export/Room_01_walls.png and b/art/indoor/room export/Room_01_walls.png differ diff --git a/art/mockups/Jelena 2d/jelena_mockup_bg_02.png b/art/mockups/Jelena 2d/jelena_mockup_bg_02.png index 6014c1f..aa48b08 100644 Binary files a/art/mockups/Jelena 2d/jelena_mockup_bg_02.png and b/art/mockups/Jelena 2d/jelena_mockup_bg_02.png differ diff --git a/project.godot b/project.godot index 9f11baa..2f041c1 100644 --- a/project.godot +++ b/project.godot @@ -13,6 +13,7 @@ config_version=5 config/name="Babushka" run/main_scene="uid://bopv10dqm1knc" config/features=PackedStringArray("4.4", "C#", "Forward Plus") +run/max_fps=120 boot_splash/fullsize=false boot_splash/image="uid://utam4axkvutc" config/icon="uid://b2smanpdo1y5e" diff --git a/scenes/Babushka_scene_farm_outside_2d.tscn b/scenes/Babushka_scene_farm_outside_2d.tscn index ca55f9c..d55b216 100644 --- a/scenes/Babushka_scene_farm_outside_2d.tscn +++ b/scenes/Babushka_scene_farm_outside_2d.tscn @@ -454,13 +454,13 @@ texture = ExtResource("14_d53cn") [node name="JelenaMockupBg02" type="Sprite2D" parent="ParallaxBackground/background layer 4"] material = SubResource("ShaderMaterial_wtdui") position = Vector2(2668, 726) -scale = Vector2(1.3, 1.3) +scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") [node name="JelenaMockupBg03" type="Sprite2D" parent="ParallaxBackground/background layer 4"] material = SubResource("ShaderMaterial_wtdui") position = Vector2(7965, 728) -scale = Vector2(1.3, 1.3) +scale = Vector2(2.75, 2.75) texture = ExtResource("13_0qu0h") [node name="back back trees layer" type="ParallaxLayer" parent="ParallaxBackground"] @@ -839,6 +839,8 @@ material = SubResource("ShaderMaterial_2vojv") position = Vector2(7237, 3307) texture = ExtResource("21_ualyd") offset = Vector2(0, -800) +region_enabled = true +region_rect = Rect2(0, 0, 1504, 1686) [node name="StaticBody2D" type="StaticBody2D" parent="YSorted/BrĂ¼nnen"] collision_mask = 4 diff --git a/scenes/IndoorTest2.tscn b/scenes/IndoorTest2.tscn index 6a97db4..249f7cb 100644 --- a/scenes/IndoorTest2.tscn +++ b/scenes/IndoorTest2.tscn @@ -20,7 +20,7 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_a2ood"] resource_local_to_scene = true -size = Vector2(7680, 1336) +size = Vector2(3836, 1086) [sub_resource type="Animation" id="Animation_j5d18"] length = 0.001 @@ -119,12 +119,15 @@ script = ExtResource("1_aivb2") [node name="Room01Walls2" type="Sprite2D" parent="BackWall"] z_index = -100 -position = Vector2(-1072, -264) +position = Vector2(4992, -487) +scale = Vector2(2, 2) texture = ExtResource("3_a2ood") offset = Vector2(-2768, 264) [node name="wall 1" type="Sprite2D" parent="BackWall"] z_index = -100 +position = Vector2(-4368, 40) +scale = Vector2(2, 2) texture = ExtResource("3_a2ood") flip_h = true region_rect = Rect2(111, 292, 3323, 2160) @@ -132,48 +135,64 @@ region_rect = Rect2(111, 292, 3323, 2160) [node name="StaticBody2D" type="StaticBody2D" parent="BackWall/wall 1"] [node name="CollisionShape2D" type="CollisionShape2D" parent="BackWall/wall 1/StaticBody2D"] -position = Vector2(-1912, -396) +position = Vector2(950, -419) shape = SubResource("RectangleShape2D_a2ood") [node name="Room01DorrR" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-744, 16) +position = Vector2(936, -216) texture = ExtResource("5_8o6or") +region_enabled = true +region_rect = Rect2(3161, 313, 679, 1050) [node name="Room01DioorL" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-3288, 8) +position = Vector2(-3296, 48) texture = ExtResource("8_wuntg") +region_enabled = true +region_rect = Rect2(0, 0, 3840, 2160) [node name="Room01Pechka" type="Sprite2D" parent="BackWall"] z_index = -80 -position = Vector2(-752, 0) +position = Vector2(-224, -392) texture = ExtResource("9_aivb2") +region_enabled = true +region_rect = Rect2(2236, 0, 724, 1392) [node name="Room01Window2" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-2952, 16) +position = Vector2(-3192, -344) texture = ExtResource("6_j5d18") +region_enabled = true +region_rect = Rect2(1020, 338, 607, 757) [node name="Room01Window3" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-944, -8) +position = Vector2(-1792, -336) texture = ExtResource("6_j5d18") +region_enabled = true +region_rect = Rect2(1020, 338, 607, 757) [node name="Room01PechkaDoor" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-710, 0) +position = Vector2(-248, -96) texture = ExtResource("10_835kg") +region_enabled = true +region_rect = Rect2(2360, 864, 356, 251) [node name="Room01Chugun" type="Sprite2D" parent="BackWall"] z_index = -40 -position = Vector2(-736, 8) +position = Vector2(16, -560) texture = ExtResource("11_atjbs") +region_enabled = true +region_rect = Rect2(2469, 459, 247, 131) [node name="Room01Shelf" type="Sprite2D" parent="BackWall"] z_index = -50 -position = Vector2(-832, 56) +position = Vector2(-880, -416) texture = ExtResource("8_8o6or") +region_enabled = true +region_rect = Rect2(1846, 471, 348, 490) [node name="Player2d" parent="." instance=ExtResource("2_a2ood")] position = Vector2(-1464, 136) @@ -184,30 +203,40 @@ _speed = 500.0 [node name="Animated Sprites" parent="Player2d/CharacterBody2D/visuals" index="0"] z_index = 50 -[node name="Room01Table" type="Sprite2D" parent="."] +[node name="Table" type="Sprite2D" parent="."] y_sort_enabled = true -position = Vector2(-2056, 888) +position = Vector2(-2120, 1728) texture = ExtResource("3_je1cl") offset = Vector2(192, -848) +region_enabled = true +region_rect = Rect2(1012, 1743, 1470, 417) -[node name="Room01Chair" type="Sprite2D" parent="."] -position = Vector2(-2792, 1096) +[node name="Chair" type="Sprite2D" parent="."] +position = Vector2(-3000, 2056) texture = ExtResource("4_hjjhl") offset = Vector2(216, -1064) +region_enabled = true +region_rect = Rect2(1534, 1976, 379, 184) -[node name="Room01Chair2" type="Sprite2D" parent="."] -position = Vector2(-1304, 1080) +[node name="Chair2" type="Sprite2D" parent="."] +position = Vector2(-1160, 2048) texture = ExtResource("4_hjjhl") offset = Vector2(184, -1056) +region_enabled = true +region_rect = Rect2(1534, 1976, 379, 184) -[node name="Room01Bench" type="Sprite2D" parent="."] -position = Vector2(-3280, 24) +[node name="Bench" type="Sprite2D" parent="."] +position = Vector2(-3240, 224) texture = ExtResource("7_ciwvv") flip_h = true +region_enabled = true +region_rect = Rect2(1156, 1185, 940, 189) -[node name="Room01Bench2" type="Sprite2D" parent="."] -position = Vector2(-784, 40) +[node name="Bench2" type="Sprite2D" parent="."] +position = Vector2(-1824, 224) texture = ExtResource("7_ciwvv") +region_enabled = true +region_rect = Rect2(1156, 1185, 940, 189) [node name="Room assets" type="Node" parent="."] @@ -217,7 +246,7 @@ position = Vector2(-2000, 696) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true -region_rect = Rect2(2085, 40, 446, 654) +region_rect = Rect2(2093, 49, 421, 630) [node name="wood" type="Sprite2D" parent="Room assets"] y_sort_enabled = true @@ -233,11 +262,11 @@ position = Vector2(336, 480) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true -region_rect = Rect2(3157, 688, 131, 221) +region_rect = Rect2(3157, 688, 118.519, 221) [node name="vase" type="Sprite2D" parent="Room assets"] y_sort_enabled = true -position = Vector2(-712, 72) +position = Vector2(-856, -32) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true @@ -245,7 +274,7 @@ region_rect = Rect2(2748, 432, 174, 191) [node name="candle" type="Sprite2D" parent="Room assets"] y_sort_enabled = true -position = Vector2(-272, -56) +position = Vector2(-424, -72) rotation = -0.0663225 texture = ExtResource("13_j5d18") offset = Vector2(0, -296) @@ -272,7 +301,7 @@ playback_auto_capture = false [node name="herbsline" type="Sprite2D" parent="Room assets"] y_sort_enabled = true -position = Vector2(440, -168) +position = Vector2(288, -152) texture = ExtResource("13_j5d18") offset = Vector2(0, -296) region_enabled = true @@ -303,7 +332,6 @@ region_enabled = true region_rect = Rect2(2647, 15, 286, 183) [node name="offerings" type="Node2D" parent="Room assets"] -visible = false [node name="apple" type="Sprite2D" parent="Room assets/offerings"] position = Vector2(229.5, 331.5) @@ -327,14 +355,19 @@ region_enabled = true region_rect = Rect2(2576, 802, 219, 64) [node name="Yeli" parent="." instance=ExtResource("15_ciwvv")] +visible = false position = Vector2(-2912, 432) [node name="CollisionShape3D" parent="Yeli/InteractionArea/Area2D" index="0"] +position = Vector2(-205.348, 131.907) shape = SubResource("CircleShape2D_wuntg") [node name="TalkingControl" parent="Yeli" index="1"] _timelinesToPlay = PackedStringArray("yeli_intro_05") +[node name="AnimatedSprite" parent="Yeli/TalkingControl" index="0"] +position = Vector2(-576, 368) + [node name="dialogic_toggle" type="Node2D" parent="Yeli"] script = ExtResource("17_835kg") metadata/_custom_type_script = "uid://cvkw4qd2hxksi"