src/assets/global_theme.tres

@@ -0,0 +1,10 @@
+[gd_resource type="Theme" load_steps=3 format=2]
+
+[ext_resource path="res://src/assets/title-font.ttf" type="DynamicFontData" id=1]
+
+[sub_resource type="DynamicFont" id=1]
+size = 30
+font_data = ExtResource( 1 )
+
+[resource]
+default_font = SubResource( 1 )

src/classes/Unit.gd

@@ -76,8 +76,6 @@ 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):

src/nodes/UI/UnitPopup.tscn

@@ -1,13 +0,0 @@
-[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 ]

src/nodes/units/Friend.tscn

@@ -1,6 +1,5 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=9 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]
 
@@ -38,23 +37,6 @@ tracks/0/keys = {
 "values": [ 8, 9, 10, 11, 10, 9 ]
 }
 
-[sub_resource type="Animation" id=4]
-resource_name = "Attacked back"
-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": [ 20, 21, 22, 23, 22, 21 ]
-}
-
 [sub_resource type="Animation" id=3]
 resource_name = "Attacked front"
 length = 0.8
@@ -72,6 +54,23 @@ tracks/0/keys = {
 "values": [ 16, 17, 18, 19, 18, 17 ]
 }
 
+[sub_resource type="Animation" id=4]
+resource_name = "Attacked back"
+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": [ 20, 21, 22, 23, 22, 21 ]
+}
+
 [sub_resource type="Animation" id=5]
 length = 0.8
 loop = true
@@ -107,7 +106,9 @@ 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"
@@ -126,9 +127,7 @@ vframes = 6
 autoplay = "Idle"
 "anims/Attack back" = SubResource( 1 )
 "anims/Attack front" = SubResource( 2 )
-"anims/Attacked back" = SubResource( 4 )
 "anims/Attacked front" = SubResource( 3 )
+"anims/Attacked back" = SubResource( 4 )
 anims/Idle = SubResource( 5 )
 "anims/Idle back" = SubResource( 6 )
-
-[node name="UnitPopup" parent="." instance=ExtResource( 1 )]

src/nodes/world/LoadingScreen.tscn

@@ -0,0 +1,87 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://src/assets/global_theme.tres" type="Theme" id=1]
+
+[sub_resource type="Animation" id=1]
+resource_name = "Loading"
+length = 2.0
+step = 0.5
+tracks/0/type = "value"
+tracks/0/path = NodePath("Label:text")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.5, 1, 1.5 ),
+"transitions": PoolRealArray( 1, 1, 1, 1 ),
+"update": 1,
+"values": [ "Loading", "Loading.", "Loading..", "Loading..." ]
+}
+tracks/1/type = "method"
+tracks/1/path = NodePath(".")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 2 ),
+"transitions": PoolRealArray( 1 ),
+"values": [ {
+"args": [  ],
+"method": "queue_free"
+} ]
+}
+
+[node name="LoadingScreen" type="CanvasLayer"]
+
+[node name="ColorRect" type="ColorRect" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+theme = ExtResource( 1 )
+color = Color( 0.258824, 0.643137, 0.34902, 1 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Label" type="Label" parent="."]
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+margin_left = -240.0
+margin_top = -52.0
+margin_right = 240.0
+margin_bottom = -19.0
+theme = ExtResource( 1 )
+text = "Loading"
+align = 1
+valign = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+autoplay = "Loading"
+anims/Loading = SubResource( 1 )
+
+[node name="Timers" type="Node" parent="."]
+
+[node name="Timer" type="Timer" parent="Timers"]
+wait_time = 0.5
+one_shot = true
+autostart = true
+
+[node name="Timer2" type="Timer" parent="Timers"]
+one_shot = true
+autostart = true
+
+[node name="Timer3" type="Timer" parent="Timers"]
+wait_time = 1.5
+one_shot = true
+autostart = true
+
+[node name="Timer4" type="Timer" parent="Timers"]
+wait_time = 2.0
+one_shot = true
+autostart = true

src/scenes/battles/TestingBattle.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://src/assets/isometric_tileset/isometric_tileset.tres" type="TileSet" id=1]
 [ext_resource path="res://src/nodes/units/Friend.tscn" type="PackedScene" id=2]
 [ext_resource path="res://src/nodes/world/Cursor.tscn" type="PackedScene" id=3]
 [ext_resource path="res://src/nodes/world/Grid.tscn" type="PackedScene" id=4]
+[ext_resource path="res://src/nodes/world/LoadingScreen.tscn" type="PackedScene" id=5]
 [ext_resource path="res://src/assets/TEST-ANIMATION.png" type="Texture" id=6]
 [ext_resource path="res://icon.png" type="Texture" id=7]
 [ext_resource path="res://src/nodes/world/BattleController.tscn" type="PackedScene" id=8]
@@ -73,3 +74,7 @@ sprite = ExtResource( 7 )
 [node name="Grid" parent="." instance=ExtResource( 4 )]
 
 [node name="BattleController" parent="." instance=ExtResource( 8 )]
+
+[node name="LoadingScreen" parent="." instance=ExtResource( 5 )]
+scale = Vector2( 0.001, 0.001 )
+transform = Transform2D( 0.001, 0, 0, 0.001, 0, 0 )