rotation rework, deletion of complex objects

This commit is contained in:
Rendo 2025-10-16 19:47:52 +05:00
commit 8dcd7725a9
15 changed files with 103 additions and 147 deletions

View file

@ -1,10 +1,12 @@
[gd_scene load_steps=14 format=3 uid="uid://b0h8dd82b3ox5"]
[gd_scene load_steps=16 format=3 uid="uid://b0h8dd82b3ox5"]
[ext_resource type="Texture2D" uid="uid://gfkhedfdi7ug" path="res://sprites/atlasses/Popekko.png" id="1_kqxj7"]
[ext_resource type="Script" uid="uid://bbd7o2st8kmgl" path="res://scripts/structure.gd" id="1_y326v"]
[ext_resource type="Script" uid="uid://bd4ojfqrl8idm" path="res://scripts/inventory/inventory_slot.gd" id="2_54w8r"]
[ext_resource type="Script" uid="uid://v0hkuo3gda1b" path="res://scripts/inventory/belt_inventory.gd" id="3_ruvuk"]
[ext_resource type="Script" uid="uid://bp341eiwvfvyl" path="res://scripts/structures/belt.gd" id="5_54w8r"]
[ext_resource type="Script" uid="uid://lchhqigib2t0" path="res://scripts/structures/directional_sprite.gd" id="5_ruvuk"]
[ext_resource type="Script" uid="uid://drsty3i1820ha" path="res://scripts/structures/belt_animation_sync.gd" id="7_t4je2"]
[sub_resource type="Resource" id="Resource_t4je2"]
resource_local_to_scene = true
@ -21,7 +23,19 @@ metadata/_custom_type_script = "uid://v0hkuo3gda1b"
[sub_resource type="AtlasTexture" id="AtlasTexture_54w8r"]
atlas = ExtResource("1_kqxj7")
region = Rect2(16, 0, 16, 128)
region = Rect2(16, 0, 16, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_crbfm"]
atlas = ExtResource("1_kqxj7")
region = Rect2(32, 64, 16, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_t4je2"]
atlas = ExtResource("1_kqxj7")
region = Rect2(32, 0, 16, 64)
[sub_resource type="AtlasTexture" id="AtlasTexture_ruvuk"]
atlas = ExtResource("1_kqxj7")
region = Rect2(16, 64, 16, 64)
[sub_resource type="Animation" id="Animation_ruvuk"]
length = 0.001
@ -38,41 +52,6 @@ tracks/0/keys = {
"values": [0]
}
[sub_resource type="Animation" id="Animation_1rfp0"]
resource_name = "down"
loop_mode = 1
step = 0.25
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.25, 0.5, 0.75),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [7, 6, 5, 4]
}
[sub_resource type="Animation" id="Animation_t4je2"]
resource_name = "left"
length = 1.000025
loop_mode = 1
step = 0.25
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.25, 0.5, 0.75),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [3, 2, 1, 0]
}
[sub_resource type="Animation" id="Animation_54w8r"]
resource_name = "right"
length = 1.000025
@ -91,40 +70,24 @@ tracks/0/keys = {
"values": [0, 1, 2, 3]
}
[sub_resource type="Animation" id="Animation_crbfm"]
resource_name = "up"
loop_mode = 1
step = 0.25
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Sprite2D:frame")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.25, 0.5, 0.75),
"transitions": PackedFloat32Array(1, 1, 1, 1),
"update": 1,
"values": [4, 5, 6, 7]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_crbfm"]
_data = {
&"RESET": SubResource("Animation_ruvuk"),
&"down": SubResource("Animation_1rfp0"),
&"left": SubResource("Animation_t4je2"),
&"right": SubResource("Animation_54w8r"),
&"up": SubResource("Animation_crbfm")
&"right": SubResource("Animation_54w8r")
}
[node name="Conveyor" type="Node2D" groups=["buildings"]]
script = ExtResource("1_y326v")
inventory = SubResource("Resource_t4je2")
facing = 1
direction = null
maximum_directions = 4
[node name="Sprite2D" type="Sprite2D" parent="."]
[node name="Sprite2D" type="Sprite2D" parent="." node_paths=PackedStringArray("structure")]
texture = SubResource("AtlasTexture_54w8r")
vframes = 8
vframes = 4
script = ExtResource("5_ruvuk")
textures = Array[Texture]([SubResource("AtlasTexture_54w8r"), SubResource("AtlasTexture_crbfm"), SubResource("AtlasTexture_t4je2"), SubResource("AtlasTexture_ruvuk")])
structure = NodePath("..")
[node name="Conveyor" type="Node2D" parent="."]
z_index = 1
@ -135,5 +98,4 @@ libraries = {
&"": SubResource("AnimationLibrary_crbfm")
}
autoplay = "right"
[connection signal="switched_facing" from="." to="Conveyor" method="_on_conveyor_switched_facing"]
script = ExtResource("7_t4je2")

View file

@ -1,10 +1,11 @@
[gd_scene load_steps=9 format=3 uid="uid://dfatkxv6n55dw"]
[gd_scene load_steps=13 format=3 uid="uid://dfatkxv6n55dw"]
[ext_resource type="Script" uid="uid://bbd7o2st8kmgl" path="res://scripts/structure.gd" id="1_k5y3y"]
[ext_resource type="Texture2D" uid="uid://gfkhedfdi7ug" path="res://sprites/atlasses/Popekko.png" id="2_4befw"]
[ext_resource type="Script" uid="uid://bd4ojfqrl8idm" path="res://scripts/inventory/inventory_slot.gd" id="2_p1cyh"]
[ext_resource type="Script" uid="uid://m6b6vawdqgqb" path="res://scripts/inventory/in_out_inventory.gd" id="3_wqoim"]
[ext_resource type="Script" uid="uid://c7mx3uatj6ulm" path="res://scripts/structures/assembler.gd" id="5_0x00x"]
[ext_resource type="Script" uid="uid://lchhqigib2t0" path="res://scripts/structures/directional_sprite.gd" id="5_kno0u"]
[ext_resource type="Resource" uid="uid://d2lbc1qqkayaa" path="res://generic/recipes/test_recipe.tres" id="6_wqoim"]
[sub_resource type="Resource" id="Resource_kno0u"]
@ -21,17 +22,33 @@ metadata/_custom_type_script = "uid://m6b6vawdqgqb"
[sub_resource type="AtlasTexture" id="AtlasTexture_xh4eg"]
atlas = ExtResource("2_4befw")
region = Rect2(32, 0, 32, 32)
region = Rect2(48, 0, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_0x00x"]
atlas = ExtResource("2_4befw")
region = Rect2(48, 32, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_dr8in"]
atlas = ExtResource("2_4befw")
region = Rect2(48, 96, 32, 32)
[sub_resource type="AtlasTexture" id="AtlasTexture_kno0u"]
atlas = ExtResource("2_4befw")
region = Rect2(48, 64, 32, 32)
[node name="DebugAssembler" type="Node2D"]
script = ExtResource("1_k5y3y")
dimensions = Rect2i(0, 0, 2, 2)
inventory = SubResource("Resource_kno0u")
facing = 2
direction = 1.571
maximum_directions = 4
[node name="Sprite2D" type="Sprite2D" parent="."]
[node name="Sprite2D" type="Sprite2D" parent="." node_paths=PackedStringArray("structure")]
texture = SubResource("AtlasTexture_xh4eg")
offset = Vector2(8, 8)
script = ExtResource("5_kno0u")
textures = Array[Texture]([SubResource("AtlasTexture_0x00x"), SubResource("AtlasTexture_xh4eg"), SubResource("AtlasTexture_dr8in"), SubResource("AtlasTexture_kno0u")])
structure = NodePath("..")
[node name="Assembler" type="Node2D" parent="."]
position = Vector2(16, 16)