diff --git a/src/assets/PoppkornRegular.ttf b/src/assets/PoppkornRegular.ttf new file mode 100644 index 0000000..b3ae21e Binary files /dev/null and b/src/assets/PoppkornRegular.ttf differ diff --git a/src/assets/theme.theme b/src/assets/theme.theme new file mode 100644 index 0000000..828099e Binary files /dev/null and b/src/assets/theme.theme differ diff --git a/src/classes/Unit.gd b/src/classes/Unit.gd index dbeb87e..f994104 100644 --- a/src/classes/Unit.gd +++ b/src/classes/Unit.gd @@ -76,6 +76,8 @@ func move(movement : Vector2): z_index = height if (potential_movement[2] == false): #not behind z_index = 100 + + $UnitPopup.get_node("PopupMenu").popup() func attack(damage : int, points : int, pattern : PoolVector2Array): diff --git a/src/nodes/UI/UnitPopup.tscn b/src/nodes/UI/UnitPopup.tscn new file mode 100644 index 0000000..97380b8 --- /dev/null +++ b/src/nodes/UI/UnitPopup.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://src/assets/theme.theme" type="Theme" id=1] + +[node name="UnitPopup" type="Control"] +margin_right = 20.0 +margin_bottom = 20.0 +theme = ExtResource( 1 ) + +[node name="PopupMenu" type="PopupMenu" parent="."] +margin_right = 20.0 +margin_bottom = 20.0 +items = [ "Move 1", null, 0, false, false, 0, 0, null, "", false, "Move 2", null, 0, false, false, 1, 0, null, "", false, "Move 3", null, 0, false, false, 2, 0, null, "", false, "Move 4", null, 0, false, false, 3, 0, null, "", false, "Move 5", null, 0, false, false, 4, 0, null, "", false ] diff --git a/src/nodes/units/Friend.tscn b/src/nodes/units/Friend.tscn index e9aa191..11c96c0 100644 --- a/src/nodes/units/Friend.tscn +++ b/src/nodes/units/Friend.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] +[ext_resource path="res://src/nodes/UI/UnitPopup.tscn" type="PackedScene" id=1] [ext_resource path="res://src/assets/shadow.png" type="Texture" id=2] [ext_resource path="res://src/nodes/units/Friend.gd" type="Script" id=3] @@ -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="Friend" type="Node2D" groups=[ -"friends", -]] +[node name="Friend" type="Node2D" groups=["friends"]] z_index = 100 script = ExtResource( 3 ) unit_type = "Friend" @@ -127,7 +126,9 @@ vframes = 6 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( 1 )]