Merge branch 'Rycarus_ObjectConnection' into dev

This commit is contained in:
Fabio 2024-08-18 20:15:37 +02:00
commit c77169deba
18 changed files with 520 additions and 82 deletions

View file

@ -1,7 +1,8 @@
[gd_scene load_steps=5 format=3 uid="uid://snxpqx0ony7s"]
[gd_scene load_steps=6 format=3 uid="uid://snxpqx0ony7s"]
[ext_resource type="Script" path="res://scripts/player_movement.gd" id="1_a6lhy"]
[ext_resource type="Texture2D" uid="uid://qcx482jc7pqr" path="res://textures/player.png" id="2_sscjv"]
[ext_resource type="Texture2D" uid="uid://dfvxk0e8taj1d" path="res://textures/Eye Lase.png" id="3_yg3ur"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_jqi2f"]
radius = 9.0
@ -29,4 +30,12 @@ collision_mask = 2
[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox"]
shape = SubResource("CircleShape2D_vxfel")
[node name="data_link" type="Line2D" parent="."]
visible = false
texture_repeat = 2
points = PackedVector2Array(0, 0, 0, 0)
default_color = Color(0.298039, 1, 0.141176, 1)
texture = ExtResource("3_yg3ur")
texture_mode = 1
[connection signal="body_entered" from="Hurtbox" to="." method="_on_hurtbox_body_entered"]

View file

@ -1,10 +1,10 @@
[gd_scene load_steps=4 format=3 uid="uid://br6fngf5208j0"]
[ext_resource type="Texture2D" uid="uid://bplkveclkwuk" path="res://textures/block-big.png" id="1_ejp7j"]
[ext_resource type="Texture2D" uid="uid://bplkveclkwuk" path="res://textures/block-blue.png" id="1_ejp7j"]
[ext_resource type="Script" path="res://scripts/resizable_block.gd" id="1_j40bu"]
[sub_resource type="CircleShape2D" id="CircleShape2D_h0307"]
radius = 35.0143
[sub_resource type="RectangleShape2D" id="RectangleShape2D_sgemy"]
size = Vector2(59, 59)
[node name="Block" type="StaticBody2D"]
collision_layer = 17
@ -16,6 +16,6 @@ script = ExtResource("1_j40bu")
texture = ExtResource("1_ejp7j")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_h0307")
shape = SubResource("RectangleShape2D_sgemy")
[connection signal="input_event" from="." to="." method="_on_input_event"]

View file

@ -0,0 +1,21 @@
[gd_scene load_steps=4 format=3 uid="uid://0jn86aogkcne"]
[ext_resource type="Script" path="res://scripts/resizable_block.gd" id="1_bulc3"]
[ext_resource type="Texture2D" uid="uid://dyl3dsoub6pmu" path="res://textures/block-small.png" id="2_42gyy"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_vlk61"]
size = Vector2(30, 30)
[node name="Block" type="StaticBody2D"]
collision_layer = 17
collision_mask = 22
input_pickable = true
script = ExtResource("1_bulc3")
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("2_42gyy")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("RectangleShape2D_vlk61")
[connection signal="input_event" from="." to="." method="_on_input_event"]