Added last farming timelines and fixed some minor issues
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=821 format=3 uid="uid://c25udixd5m6l0"]
|
||||
[gd_scene load_steps=822 format=3 uid="uid://c25udixd5m6l0"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://b05uyj001ehwi" path="res://scripts/CSharp/Common/Farming/VesnaBehaviour2D.cs" id="1_yd5ep"]
|
||||
[ext_resource type="Script" uid="uid://cjbclkxesh3hc" path="res://scripts/CSharp/Common/CharacterControls/Player2D.cs" id="2_1vqmv"]
|
||||
@@ -818,6 +818,7 @@
|
||||
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="816_1a3c1"]
|
||||
[ext_resource type="Script" uid="uid://bcskt5ckh3rqa" path="res://scripts/CSharp/Common/Farming/FarmingControls2D.cs" id="817_6nrw3"]
|
||||
[ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field_2d.tscn" id="818_16w6h"]
|
||||
[ext_resource type="Script" uid="uid://cvkw4qd2hxksi" path="res://scripts/GdScript/dialogic_toggle.gd" id="819_4na52"]
|
||||
|
||||
[sub_resource type="CircleShape2D" id="CircleShape2D_ssqtd"]
|
||||
radius = 110.018
|
||||
@@ -3563,5 +3564,11 @@ _fieldPrefab = ExtResource("818_16w6h")
|
||||
_movingPlayer = NodePath("../CharacterBody2D")
|
||||
_camera = NodePath("../CharacterBody2D/Camera2D")
|
||||
|
||||
[node name="Node2D" type="Node2D" parent="."]
|
||||
position = Vector2(0, 374)
|
||||
script = ExtResource("819_4na52")
|
||||
|
||||
[connection signal="PickedUpTool" from="." to="CharacterBody2D" method="ActivateTool"]
|
||||
[connection signal="WateringField" from="FarmingControls" to="CharacterBody2D" method="PlayWateringAnimation"]
|
||||
[connection signal="timelineEnded" from="Node2D" to="." method="EnableMovement"]
|
||||
[connection signal="timelineStarted" from="Node2D" to="." method="DisableMovement"]
|
||||
|
||||
@@ -183,7 +183,9 @@ animations = [{
|
||||
}]
|
||||
|
||||
[node name="Yeli" type="Node2D"]
|
||||
z_index = 1
|
||||
y_sort_enabled = true
|
||||
position = Vector2(0, 322)
|
||||
script = ExtResource("1_at1n1")
|
||||
|
||||
[node name="InteractionArea" parent="." instance=ExtResource("42_ahrat")]
|
||||
@@ -194,19 +196,18 @@ scale = Vector2(2.805, 2.805)
|
||||
shape = SubResource("CircleShape2D_at1n1")
|
||||
|
||||
[node name="Label" parent="InteractionArea" index="1"]
|
||||
top_level = true
|
||||
custom_minimum_size = Vector2(10, 10)
|
||||
offset_left = -94.0
|
||||
offset_top = 83.0
|
||||
offset_right = -39.65
|
||||
offset_bottom = 113.0
|
||||
scale = Vector2(3, 3)
|
||||
offset_left = -127.273
|
||||
offset_top = -245.633
|
||||
offset_right = 119.727
|
||||
offset_bottom = -142.633
|
||||
theme_override_font_sizes/font_size = 60
|
||||
text = "[E] talk"
|
||||
|
||||
[node name="TalkingControl" type="Node2D" parent="." node_paths=PackedStringArray("_sprite")]
|
||||
script = ExtResource("1_hn8at")
|
||||
_sprite = NodePath("AnimatedSprite")
|
||||
_timelinesToPlay = PackedStringArray("yeli_intro_01", "yeli_intro_02")
|
||||
_timelinesToPlay = PackedStringArray("yeli_intro_01", "yeli_intro_02", "yeli_intro_03", "yeli_intro_04")
|
||||
|
||||
[node name="AnimatedSprite" type="AnimatedSprite2D" parent="TalkingControl"]
|
||||
y_sort_enabled = true
|
||||
|
||||
@@ -19,6 +19,7 @@ scale = Vector2(2.225, 2.225)
|
||||
|
||||
[node name="FieldBehaviour" type="Sprite2D" parent="."]
|
||||
z_index = -1
|
||||
scale = Vector2(0.9, 1)
|
||||
texture = ExtResource("2_yi42k")
|
||||
script = ExtResource("2_femni")
|
||||
Tilled = ExtResource("2_yi42k")
|
||||
@@ -33,6 +34,13 @@ position = Vector2(6, -161)
|
||||
[node name="CollisionShape3D" parent="FieldBehaviour/BasePlant/ReadyPlantInventoryItem/InteractionArea2/Area2D" index="0"]
|
||||
shape = SubResource("CircleShape2D_femni")
|
||||
|
||||
[node name="ReadyPlant" parent="FieldBehaviour/BasePlant/ReadyPlantInventoryItem" index="5"]
|
||||
visible = false
|
||||
position = Vector2(0, -291.3)
|
||||
|
||||
[node name="01" parent="FieldBehaviour/BasePlant/ReadyPlantInventoryItem/ReadyPlant" index="0"]
|
||||
visible = true
|
||||
|
||||
[connection signal="Interacted" from="InteractionArea2" to="FieldBehaviour/BasePlant" method="Grow"]
|
||||
|
||||
[editable path="FieldBehaviour/BasePlant"]
|
||||
|
||||
@@ -39,7 +39,6 @@ position = Vector2(0, 0.5)
|
||||
[node name="TomatoSeed" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
@@ -48,7 +47,6 @@ region_rect = Rect2(-2, 15, 85, 81)
|
||||
[node name="TomatoSeed2" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
@@ -57,7 +55,6 @@ region_rect = Rect2(15, 177, 84, 108)
|
||||
[node name="TomatoSeed3" type="Sprite2D" parent="Seeds"]
|
||||
visible = false
|
||||
y_sort_enabled = true
|
||||
material = SubResource("ShaderMaterial_u4cty")
|
||||
texture = ExtResource("2_rmjrk")
|
||||
flip_v = true
|
||||
region_enabled = true
|
||||
|
||||
@@ -49,12 +49,13 @@ autowrap_mode = 3
|
||||
shape = SubResource("CircleShape2D_tlhp6")
|
||||
|
||||
[node name="Label" parent="InteractionArea2" index="1"]
|
||||
offset_left = -142.0
|
||||
offset_top = -278.0
|
||||
offset_right = 1.0
|
||||
offset_bottom = -170.0
|
||||
visible = false
|
||||
top_level = true
|
||||
offset_left = -72.0
|
||||
offset_top = -58.0
|
||||
offset_right = 71.0
|
||||
offset_bottom = 50.0
|
||||
theme = SubResource("Theme_xu8me")
|
||||
horizontal_alignment = 1
|
||||
vertical_alignment = 1
|
||||
|
||||
[node name="Icon" type="Sprite2D" parent="."]
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
[gd_scene load_steps=3 format=3 uid="uid://cqc72e4hq6bcd"]
|
||||
[gd_scene load_steps=4 format=3 uid="uid://cqc72e4hq6bcd"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://ckp413wrub5fm" path="res://scripts/CSharp/Common/CharacterControls/InteractionArea2D.cs" id="1_5ajrf"]
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
resource_local_to_scene = true
|
||||
radius = 300.0
|
||||
|
||||
[sub_resource type="Theme" id="Theme_5ajrf"]
|
||||
default_font_size = 75
|
||||
|
||||
[node name="InteractionArea" type="Node2D" node_paths=PackedStringArray("_area", "_label")]
|
||||
script = ExtResource("1_5ajrf")
|
||||
_area = NodePath("Area2D")
|
||||
@@ -19,10 +22,13 @@ shape = SubResource("CircleShape2D_npluf")
|
||||
|
||||
[node name="Label" type="Label" parent="."]
|
||||
visible = false
|
||||
offset_right = 50.0
|
||||
offset_bottom = 30.0
|
||||
scale = Vector2(2, 2)
|
||||
offset_left = -46.0
|
||||
offset_top = -55.0
|
||||
offset_right = 45.0
|
||||
offset_bottom = 48.0
|
||||
theme = SubResource("Theme_5ajrf")
|
||||
text = "[E]"
|
||||
horizontal_alignment = 1
|
||||
|
||||
[connection signal="body_entered" from="Area2D" to="." method="OnPlayerEntered"]
|
||||
[connection signal="body_exited" from="Area2D" to="." method="OnPlayerExited"]
|
||||
|
||||
Reference in New Issue
Block a user