From 51012571ae3d06ad91a492c60e74f889e003ab2a Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Fri, 2 Feb 2024 21:34:02 +0100 Subject: [PATCH] Fix issues with demon & imp loading --- demo/demo/agents/agent_demon.tscn | 6 ++--- demo/demo/agents/agent_imp.tscn | 24 -------------------- demo/demo/agents/fireball/fireball.tscn | 30 ++++++++++++------------- demo/demo/scenes/demo.tscn | 10 ++++----- 4 files changed, 23 insertions(+), 47 deletions(-) delete mode 100644 demo/demo/agents/agent_imp.tscn diff --git a/demo/demo/agents/agent_demon.tscn b/demo/demo/agents/agent_demon.tscn index 1667ebc..fae8f67 100644 --- a/demo/demo/agents/agent_demon.tscn +++ b/demo/demo/agents/agent_demon.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=5 format=3 uid="uid://jb504ogmwmjk"] +[gd_scene load_steps=5 format=3 uid="uid://dbmcufef0cc4b"] [ext_resource type="PackedScene" uid="uid://ooigbfhfy4wa" path="res://demo/agents/agent_base.tscn" id="1_115kp"] [ext_resource type="Texture2D" uid="uid://d1tx7u8ho0r4v" path="res://demo/assets/agent_demon.png" id="2_cb5f2"] [ext_resource type="BehaviorTree" uid="uid://cpcnbi81jqge4" path="res://demo/ai/trees/enemy_demon.tres" id="3_ebd57"] -[sub_resource type="BlackboardPlan" id="BlackboardPlan_ju1qf"] +[sub_resource type="BlackboardPlan" id="BlackboardPlan_5sr4g"] var/speed/name = "speed" var/speed/type = 3 var/speed/value = 400.0 @@ -33,4 +33,4 @@ texture = ExtResource("2_cb5f2") [node name="BTPlayer" type="BTPlayer" parent="." index="5"] behavior_tree = ExtResource("3_ebd57") -blackboard_plan = SubResource("BlackboardPlan_ju1qf") +blackboard_plan = SubResource("BlackboardPlan_5sr4g") diff --git a/demo/demo/agents/agent_imp.tscn b/demo/demo/agents/agent_imp.tscn deleted file mode 100644 index 7c7f237..0000000 --- a/demo/demo/agents/agent_imp.tscn +++ /dev/null @@ -1,24 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://jb504ogmwmjk"] - -[ext_resource type="PackedScene" uid="uid://ooigbfhfy4wa" path="res://demo/agents/agent_base.tscn" id="1_y8fj3"] -[ext_resource type="Texture2D" uid="uid://h70okn6hmxum" path="res://demo/assets/agent_imp.png" id="2_iv43q"] - -[node name="Bobby" instance=ExtResource("1_y8fj3")] - -[node name="LegL" parent="Root/Rig" index="0"] -texture = ExtResource("2_iv43q") - -[node name="LegR" parent="Root/Rig" index="1"] -texture = ExtResource("2_iv43q") - -[node name="Body" parent="Root/Rig" index="2"] -texture = ExtResource("2_iv43q") - -[node name="Hat" parent="Root/Rig/Body" index="0"] -texture = ExtResource("2_iv43q") - -[node name="HandL" parent="Root/Rig/Body" index="1"] -texture = ExtResource("2_iv43q") - -[node name="HandR" parent="Root/Rig/Body" index="2"] -texture = ExtResource("2_iv43q") diff --git a/demo/demo/agents/fireball/fireball.tscn b/demo/demo/agents/fireball/fireball.tscn index 68e0e9b..160c015 100644 --- a/demo/demo/agents/fireball/fireball.tscn +++ b/demo/demo/agents/fireball/fireball.tscn @@ -70,6 +70,21 @@ color_ramp = SubResource("GradientTexture1D_fhxvw") [sub_resource type="CircleShape2D" id="CircleShape2D_7uc1b"] radius = 25.13 +[sub_resource type="Animation" id="Animation_wr7y0"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Root/Fireball:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + [sub_resource type="Animation" id="Animation_ey8it"] resource_name = "default" length = 0.3 @@ -87,21 +102,6 @@ tracks/0/keys = { "values": [0, 1, 2, 0] } -[sub_resource type="Animation" id="Animation_wr7y0"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Root/Fireball:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_cphpk"] _data = { "RESET": SubResource("Animation_wr7y0"), diff --git a/demo/demo/scenes/demo.tscn b/demo/demo/scenes/demo.tscn index 25d977c..8541ef2 100644 --- a/demo/demo/scenes/demo.tscn +++ b/demo/demo/scenes/demo.tscn @@ -11,7 +11,7 @@ [ext_resource type="PackedScene" uid="uid://co6yeafaljbq0" path="res://demo/agents/agent_skirmisher.tscn" id="8_a0psq"] [ext_resource type="PackedScene" uid="uid://2e4ohaqjaawb" path="res://demo/agents/agent_melee_nuanced.tscn" id="8_ovfbp"] [ext_resource type="PackedScene" uid="uid://g1pnvanyxcpa" path="res://demo/agents/agent_charger.tscn" id="9_k8jcc"] -[ext_resource type="PackedScene" uid="uid://jb504ogmwmjk" path="res://demo/agents/agent_demon.tscn" id="10_nds64"] +[ext_resource type="PackedScene" uid="uid://dbmcufef0cc4b" path="res://demo/agents/agent_demon.tscn" id="10_76xnn"] [sub_resource type="Animation" id="Animation_gwtgs"] length = 0.001 @@ -2920,11 +2920,11 @@ process_mode = 4 visible = false position = Vector2(1400, 382) -[node name="AgentDemon" parent="YSort/Agents" instance=ExtResource("10_nds64")] -position = Vector2(1417, 503) +[node name="AgentDemon" parent="YSort/Agents" instance=ExtResource("10_76xnn")] +position = Vector2(-49, 292) -[node name="AgentDemon2" parent="YSort/Agents" instance=ExtResource("10_nds64")] -position = Vector2(70, 537) +[node name="AgentDemon2" parent="YSort/Agents" instance=ExtResource("10_76xnn")] +position = Vector2(1637, 514) [node name="Props" type="Node2D" parent="YSort"] y_sort_enabled = true