From e09928f87f2d2c9cd7e70782e1a8188ff99b0e82 Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Tue, 13 Feb 2024 21:56:25 +0100 Subject: [PATCH] Demo: Fix ninja star --- demo/demo/agents/01_agent_melee_simple.tscn | 4 ---- demo/demo/agents/02_agent_charger.tscn | 2 +- demo/demo/agents/04_agent_skirmisher.tscn | 4 ---- demo/demo/agents/05_agent_ranged.tscn | 9 ++++---- demo/demo/agents/06_agent_melee_combo.tscn | 5 ---- demo/demo/agents/07_agent_melee_nuanced.tscn | 4 ---- demo/demo/agents/08_agent_demon.tscn | 4 ---- demo/demo/agents/09_agent_summoner.tscn | 4 ---- demo/demo/agents/agent_base.tscn | 24 ++++++++------------ demo/demo/agents/player/player.tscn | 7 ++---- 10 files changed, 17 insertions(+), 50 deletions(-) diff --git a/demo/demo/agents/01_agent_melee_simple.tscn b/demo/demo/agents/01_agent_melee_simple.tscn index c80a81d..d4ee08c 100644 --- a/demo/demo/agents/01_agent_melee_simple.tscn +++ b/demo/demo/agents/01_agent_melee_simple.tscn @@ -31,10 +31,6 @@ texture = ExtResource("2_bvbes") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_bvbes") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 3.0 diff --git a/demo/demo/agents/02_agent_charger.tscn b/demo/demo/agents/02_agent_charger.tscn index 956e3c2..46ba381 100644 --- a/demo/demo/agents/02_agent_charger.tscn +++ b/demo/demo/agents/02_agent_charger.tscn @@ -36,7 +36,7 @@ texture = ExtResource("2_y7pic") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_y7pic") -[node name="Hitbox" parent="Root" index="2"] +[node name="Hitbox" parent="Root" index="1"] damage = 2.0 [node name="Health" parent="." index="3"] diff --git a/demo/demo/agents/04_agent_skirmisher.tscn b/demo/demo/agents/04_agent_skirmisher.tscn index 41f8370..afb5982 100644 --- a/demo/demo/agents/04_agent_skirmisher.tscn +++ b/demo/demo/agents/04_agent_skirmisher.tscn @@ -41,10 +41,6 @@ texture = ExtResource("2_w8tqw") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_w8tqw") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 7.0 diff --git a/demo/demo/agents/05_agent_ranged.tscn b/demo/demo/agents/05_agent_ranged.tscn index f725d3a..8018bb4 100644 --- a/demo/demo/agents/05_agent_ranged.tscn +++ b/demo/demo/agents/05_agent_ranged.tscn @@ -10,6 +10,11 @@ var/speed/type = 3 var/speed/value = 400.0 var/speed/hint = 1 var/speed/hint_string = "10,1000,10" +var/run_speed/name = "run_speed" +var/run_speed/type = 3 +var/run_speed/value = 600.0 +var/run_speed/hint = 1 +var/run_speed/hint_string = "10,1000,10" [node name="AgentRanged" instance=ExtResource("1_oa4xm")] @@ -31,10 +36,6 @@ texture = ExtResource("2_37lvn") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_37lvn") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 6.0 diff --git a/demo/demo/agents/06_agent_melee_combo.tscn b/demo/demo/agents/06_agent_melee_combo.tscn index 5a20923..5316359 100644 --- a/demo/demo/agents/06_agent_melee_combo.tscn +++ b/demo/demo/agents/06_agent_melee_combo.tscn @@ -36,11 +36,6 @@ texture = ExtResource("2_4rqld") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_4rqld") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 -scale = Vector2(0.999983, 0.999976) - [node name="Health" parent="." index="3"] max_health = 6.0 diff --git a/demo/demo/agents/07_agent_melee_nuanced.tscn b/demo/demo/agents/07_agent_melee_nuanced.tscn index 87ee530..74d3193 100644 --- a/demo/demo/agents/07_agent_melee_nuanced.tscn +++ b/demo/demo/agents/07_agent_melee_nuanced.tscn @@ -36,10 +36,6 @@ texture = ExtResource("2_e51r0") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_e51r0") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 6.0 diff --git a/demo/demo/agents/08_agent_demon.tscn b/demo/demo/agents/08_agent_demon.tscn index 870b64e..8809dbe 100644 --- a/demo/demo/agents/08_agent_demon.tscn +++ b/demo/demo/agents/08_agent_demon.tscn @@ -31,10 +31,6 @@ texture = ExtResource("2_cb5f2") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_cb5f2") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 8.0 diff --git a/demo/demo/agents/09_agent_summoner.tscn b/demo/demo/agents/09_agent_summoner.tscn index 1f5ccd5..bfb89c6 100644 --- a/demo/demo/agents/09_agent_summoner.tscn +++ b/demo/demo/agents/09_agent_summoner.tscn @@ -36,10 +36,6 @@ texture = ExtResource("2_fcti4") [node name="HandR" parent="Root/Rig/Body" index="2"] texture = ExtResource("2_fcti4") -[node name="WeaponNinjaStar" parent="Root" index="1"] -position = Vector2(-55, -76) -rotation = 0.0 - [node name="Health" parent="." index="3"] max_health = 8.0 diff --git a/demo/demo/agents/agent_base.tscn b/demo/demo/agents/agent_base.tscn index 4848460..84650b5 100644 --- a/demo/demo/agents/agent_base.tscn +++ b/demo/demo/agents/agent_base.tscn @@ -378,7 +378,7 @@ tracks/24/keys = { tracks/25/type = "value" tracks/25/imported = false tracks/25/enabled = true -tracks/25/path = NodePath("Root/WeaponNinjaStar:visible") +tracks/25/path = NodePath("Root/Rig/Body/HandL/WeaponNinjaStar:visible") tracks/25/interp = 1 tracks/25/loop_wrap = true tracks/25/keys = { @@ -2321,7 +2321,7 @@ tracks/23/keys = { tracks/24/type = "value" tracks/24/imported = false tracks/24/enabled = true -tracks/24/path = NodePath("Root/WeaponNinjaStar:visible") +tracks/24/path = NodePath("Root/Rig/Body/HandL/WeaponNinjaStar:visible") tracks/24/interp = 1 tracks/24/loop_wrap = true tracks/24/keys = { @@ -2870,7 +2870,7 @@ tracks/20/keys = { tracks/21/type = "value" tracks/21/imported = false tracks/21/enabled = true -tracks/21/path = NodePath("Root/WeaponNinjaStar:visible") +tracks/21/path = NodePath("Root/Rig/Body/HandL/WeaponNinjaStar:visible") tracks/21/interp = 1 tracks/21/loop_wrap = true tracks/21/keys = { @@ -3835,7 +3835,7 @@ tracks/20/keys = { tracks/21/type = "value" tracks/21/imported = false tracks/21/enabled = true -tracks/21/path = NodePath("Root/WeaponNinjaStar:visible") +tracks/21/path = NodePath("Root/Rig/Body/HandL/WeaponNinjaStar:visible") tracks/21/interp = 1 tracks/21/loop_wrap = true tracks/21/keys = { @@ -4105,14 +4105,14 @@ tracks/20/keys = { tracks/21/type = "value" tracks/21/imported = false tracks/21/enabled = true -tracks/21/path = NodePath("Root/WeaponNinjaStar:visible") +tracks/21/path = NodePath("Root/Rig/Body/HandL/WeaponNinjaStar:visible") tracks/21/interp = 1 tracks/21/loop_wrap = true tracks/21/keys = { "times": PackedFloat32Array(0, 0.2), "transitions": PackedFloat32Array(1, 1), "update": 1, -"values": [true, false] +"values": [true, true] } [sub_resource type="Animation" id="Animation_fh06e"] @@ -4443,9 +4443,9 @@ texture = ExtResource("1_1u51b") region_enabled = true region_rect = Rect2(111.022, 6.27016, 27.6329, 27.1423) -[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Root/Rig/Body/HandL"] -remote_path = NodePath("../../../../WeaponNinjaStar") -update_scale = false +[node name="WeaponNinjaStar" type="Sprite2D" parent="Root/Rig/Body/HandL"] +visible = false +texture = ExtResource("4_1c5xq") [node name="HandR" type="Sprite2D" parent="Root/Rig/Body"] show_behind_parent = true @@ -4454,12 +4454,6 @@ texture = ExtResource("1_1u51b") region_enabled = true region_rect = Rect2(111, 34, 26.9272, 26.6298) -[node name="WeaponNinjaStar" type="Sprite2D" parent="Root"] -visible = false -position = Vector2(-55, -76) -scale = Vector2(0.999982, 0.999981) -texture = ExtResource("4_1c5xq") - [node name="Hitbox" type="Area2D" parent="Root"] position = Vector2(50, 0) collision_layer = 0 diff --git a/demo/demo/agents/player/player.tscn b/demo/demo/agents/player/player.tscn index 7821af3..eb1c4ad 100644 --- a/demo/demo/agents/player/player.tscn +++ b/demo/demo/agents/player/player.tscn @@ -16,16 +16,13 @@ collision_mask = 1 script = ExtResource("2_24nyi") dodge_cooldown = 0.4 -[node name="WeaponNinjaStar" parent="Root" index="1"] -scale = Vector2(0.999983, 0.999974) - -[node name="Hitbox" parent="Root" index="2"] +[node name="Hitbox" parent="Root" index="1"] collision_mask = 8 [node name="HitboxCollisionShape2D" parent="Root/Hitbox" index="0"] shape = SubResource("RectangleShape2D_8pofm") -[node name="Hurtbox" parent="Root" index="3"] +[node name="Hurtbox" parent="Root" index="2"] collision_layer = 4 [node name="Health" parent="." index="3"]