Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

Reworking 2D interactions

Browse Source
This commit is contained in:
Katharina Ziolkowski
2025-05-16 23:16:27 +02:00
parent ff85b67087
commit 4afb02440c
9 changed files with 112 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/Babushka_scene_farm_outside_2d.tscn
+46 -1
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=44 format=3 uid="uid://gigb28qk8t12"]
[gd_scene load_steps=47 format=3 uid="uid://gigb28qk8t12"]
[ext_resource type="PackedScene" uid="uid://c25udixd5m6l0" path="res://prefabs/Player2D.tscn" id="1_7wfwe"]
[ext_resource type="Texture2D" uid="uid://8sr11ex30n0m" path="res://art/mockups/Kenney_Backgrounds/Samples/uncolored_hills.png" id="2_7b2ri"]
@@ -26,6 +26,9 @@
[ext_resource type="Texture2D" uid="uid://dg7rlugnq0t45" path="res://art/farm/farming/farmobjekte/brünnen.png" id="21_ualyd"]
[ext_resource type="Script" uid="uid://dhxtdhfqx3bte" path="res://scripts/CSharp/Common/Farming/FieldService2D.cs" id="25_0qu0h"]
[ext_resource type="PackedScene" uid="uid://b1d2e7ely6hyw" path="res://prefabs/farm/base_field_2d.tscn" id="26_vbdb2"]
[ext_resource type="PackedScene" uid="uid://cqc72e4hq6bcd" path="res://prefabs/interaction_area_2d.tscn" id="27_klb81"]
[ext_resource type="PackedScene" uid="uid://ce0mc0ddijmyi" path="res://prefabs/interactions/sprite_switcher_2d.tscn" id="28_p6n74"]
[ext_resource type="Texture2D" uid="uid://x8hr8287ff2n" path="res://art/farm/farming/farmobjekte/tools atlas.png" id="29_p6n74"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_xy0kg"]
shader = ExtResource("13_7p0hq")
@@ -573,6 +576,8 @@ scale = Vector2(30, 1)
texture = ExtResource("20_if5vh")
[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Fence"]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Fence/StaticBody2D"]
position = Vector2(0.666672, 76)
@@ -587,6 +592,8 @@ scale = Vector2(30, 1)
texture = ExtResource("20_if5vh")
[node name="StaticBody2D" type="StaticBody2D" parent="Fence/Fence2"]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/Fence2/StaticBody2D"]
position = Vector2(0.266632, 172)
@@ -615,6 +622,8 @@ flip_h = true
position = Vector2(-5888, 4624)
rotation = 1.5708
scale = Vector2(8, 1)
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/EndLeftCollider"]
position = Vector2(-218, -4.00146)
@@ -624,6 +633,8 @@ shape = SubResource("RectangleShape2D_0qu0h")
position = Vector2(15952, 4592)
rotation = 1.5708
scale = Vector2(8, 1)
collision_layer = 2
collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Fence/EndRightCollider"]
position = Vector2(-206.5, 12.001)
@@ -640,6 +651,8 @@ scale = Vector2(5, 5)
texture = ExtResource("2_lhtpe")
[node name="StaticBody2D" type="StaticBody2D" parent="Farm visuals/Static/House Mockup"]
collision_layer = 2
collision_mask = 2
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Farm visuals/Static/House Mockup/StaticBody2D"]
position = Vector2(-257.6, 236.8)
@@ -683,3 +696,35 @@ position = Vector2(12080, 3296)
[node name="BaseField4" parent="." instance=ExtResource("26_vbdb2")]
position = Vector2(12080, 2544)
[node name="Hoe Pickup" parent="." instance=ExtResource("27_klb81")]
position = Vector2(3264, 2120)
rotation = 3.3074
[node name="SpriteSwitcher2d" parent="Hoe Pickup" instance=ExtResource("28_p6n74")]
scale = Vector2(0.5, 0.5)
[node name="Watercan Pickup" parent="." instance=ExtResource("27_klb81")]
position = Vector2(6216, 2248)
[node name="Label" parent="Watercan Pickup" index="1"]
z_index = 1
[node name="SpriteSwitcher2d" parent="Watercan Pickup" instance=ExtResource("28_p6n74")]
[node name="FirstSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="0"]
texture = ExtResource("29_p6n74")
region_rect = Rect2(-2, 1119, 430, 301)
[node name="SecondSprite" parent="Watercan Pickup/SpriteSwitcher2d" index="1"]
texture = ExtResource("29_p6n74")
region_rect = Rect2(1, 1127, 423, 301)
[connection signal="Interacted" from="Hoe Pickup" to="Hoe Pickup/SpriteSwitcher2d" method="SwitchState"]
[connection signal="Switch" from="Hoe Pickup/SpriteSwitcher2d" to="YSorted/Player2d" method="ActivateHoe"]
[connection signal="Interacted" from="Watercan Pickup" to="Watercan Pickup/SpriteSwitcher2d" method="SwitchState"]
[connection signal="Switch" from="Watercan Pickup/SpriteSwitcher2d" to="YSorted/Player2d" method="ActivateWateringCan"]
[editable path="Hoe Pickup"]
[editable path="Watercan Pickup"]
[editable path="Watercan Pickup/SpriteSwitcher2d"]