From cffc7769ba3713c3c27b316809af1a47c245b8b8 Mon Sep 17 00:00:00 2001 From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com> Date: Thu, 17 Mar 2022 14:10:26 +0000 Subject: [PATCH] Add UnitPopup to foe --- src/nodes/units/Foe.tscn | 45 ++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/nodes/units/Foe.tscn b/src/nodes/units/Foe.tscn index 96dea2b..a7bf158 100644 --- a/src/nodes/units/Foe.tscn +++ b/src/nodes/units/Foe.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://src/assets/shadow.png" type="Texture" id=1] [ext_resource path="res://src/nodes/units/Foe.gd" type="Script" id=2] +[ext_resource path="res://src/nodes/UI/UnitPopup.tscn" type="PackedScene" id=3] [sub_resource type="Animation" id=1] resource_name = "Attack back" @@ -37,23 +38,6 @@ tracks/0/keys = { "values": [ 8, 9, 10, 11, 10, 9 ] } -[sub_resource type="Animation" id=3] -resource_name = "Attacked front" -length = 0.8 -step = 0.05 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/keys = { -"times": PoolRealArray( 0, 0.15, 0.3, 0.45, 0.6, 0.75 ), -"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), -"update": 1, -"values": [ 16, 17, 18, 19, 18, 17 ] -} - [sub_resource type="Animation" id=4] resource_name = "Attacked back" length = 0.8 @@ -71,6 +55,23 @@ tracks/0/keys = { "values": [ 20, 21, 22, 23, 22, 21 ] } +[sub_resource type="Animation" id=3] +resource_name = "Attacked front" +length = 0.8 +step = 0.05 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.15, 0.3, 0.45, 0.6, 0.75 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 16, 17, 18, 19, 18, 17 ] +} + [sub_resource type="Animation" id=5] length = 0.8 loop = true @@ -106,9 +107,7 @@ tracks/0/keys = { "values": [ 4, 5, 6, 7, 6, 5 ] } -[node name="Foe" type="Node2D" groups=[ -"foes", -]] +[node name="Foe" type="Node2D" groups=["foes"]] script = ExtResource( 2 ) unit_type = "Foe" movement_distance = 0 @@ -128,7 +127,9 @@ frame = 12 autoplay = "Idle" "anims/Attack back" = SubResource( 1 ) "anims/Attack front" = SubResource( 2 ) -"anims/Attacked front" = SubResource( 3 ) "anims/Attacked back" = SubResource( 4 ) +"anims/Attacked front" = SubResource( 3 ) anims/Idle = SubResource( 5 ) "anims/Idle back" = SubResource( 6 ) + +[node name="UnitPopup" parent="." instance=ExtResource( 3 )]