Swapped sprites

prefabs/combat_map.tscn

@@ -2,15 +2,14 @@
 
 [ext_resource type="Script" uid="uid://bks7uplgjjdg0" path="res://nodes/combat_map.gd" id="1_jyv1f"]
 [ext_resource type="Script" uid="uid://c6701vy8h5rfx" path="res://resources/resource_definitions/dl_tileset.gd" id="2_8rn0j"]
-[ext_resource type="TileSet" uid="uid://dm5wl6d4xkstu" path="res://resources/combat_tileset.tres" id="3_8rn0j"]
 [ext_resource type="Texture2D" uid="uid://sjsl8q7tkx8" path="res://assets/sprites/grid_highlight.png" id="3_vcj5e"]
 [ext_resource type="Script" uid="uid://cxl38x2m6sj3w" path="res://scripts/grid_overlay.gd" id="4_jelju"]
-[ext_resource type="Texture2D" uid="uid://h7nfrjxagqmc" path="res://assets/sprites/selector.png" id="5_muxvo"]
-[ext_resource type="Script" uid="uid://b31eyqov8w7bm" path="res://scripts/tile_highlight.gd" id="7_tileh"]
+[ext_resource type="Texture2D" uid="uid://b1ks72fiesfrm" path="res://assets/sprites/combat_map_ui.BMP" id="5_mycp7"]
+[ext_resource type="Texture2D" uid="uid://65rmoynep5hy" path="res://assets/sprites/MP000A.BMP" id="6_muxvo"]
 
 [sub_resource type="Resource" id="Resource_vcj5e"]
 script = ExtResource("2_8rn0j")
-wall_tile_coords = Vector2i(2, 15)
+wall_tile_coords = Vector2i(0, 1)
 metadata/_custom_type_script = "uid://c6701vy8h5rfx"
 
 [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_jelju"]
@@ -26,9 +25,46 @@ texture_region_size = Vector2i(48, 48)
 0:0/0 = 0
 
 [sub_resource type="TileSet" id="TileSet_muxvo"]
-tile_size = Vector2i(48, 48)
+tile_size = Vector2i(100, 100)
 sources/0 = SubResource("TileSetAtlasSource_jelju")
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_e2u25"]
+atlas = ExtResource("5_mycp7")
+region = Rect2(0, 428, 100, 100)
+
+[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_mycp7"]
+texture = ExtResource("6_muxvo")
+texture_region_size = Vector2i(100, 100)
+0:0/0 = 0
+1:0/0 = 0
+2:0/0 = 0
+3:0/0 = 0
+4:0/0 = 0
+0:1/0 = 0
+1:1/0 = 0
+2:1/0 = 0
+3:1/0 = 0
+4:1/0 = 0
+0:2/0 = 0
+1:2/0 = 0
+2:2/0 = 0
+3:2/0 = 0
+4:2/0 = 0
+0:3/0 = 0
+1:3/0 = 0
+2:3/0 = 0
+3:3/0 = 0
+4:3/0 = 0
+0:4/0 = 0
+1:4/0 = 0
+2:4/0 = 0
+3:4/0 = 0
+4:4/0 = 0
+
+[sub_resource type="TileSet" id="TileSet_e2u25"]
+tile_size = Vector2i(100, 100)
+sources/0 = SubResource("TileSetAtlasSource_mycp7")
+
 [node name="CombatMap" type="Node2D" unique_id=546780706]
 script = ExtResource("1_jyv1f")
 tile_set = SubResource("Resource_vcj5e")
@@ -41,12 +77,9 @@ script = ExtResource("4_jelju")
 [node name="TargetingIndicator" type="Sprite2D" parent="OverlayLayer" unique_id=1836328987]
 visible = false
 z_index = 3
-texture = ExtResource("5_muxvo")
-offset = Vector2(24, 24)
+texture = SubResource("AtlasTexture_e2u25")
+offset = Vector2(50, 50)
 
 [node name="TerrainLayer" type="TileMapLayer" parent="." unique_id=1201875024]
 unique_name_in_owner = true
-tile_set = ExtResource("3_8rn0j")
-
-[node name="TileHighlight" type="ColorRect" parent="." unique_id=211433569]
-script = ExtResource("7_tileh")
+tile_set = SubResource("TileSet_e2u25")

prefabs/dialogue.tscn

@@ -0,0 +1,9 @@
+[gd_scene format=3 uid="uid://c6fnawy2wtqii"]
+
+[node name="Control" type="Control" unique_id=1778107518]
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2

prefabs/unit.tscn

@@ -2,8 +2,8 @@
 
 [ext_resource type="Script" uid="uid://c016mxgatcpse" path="res://nodes/unit.gd" id="1_cq4v0"]
 [ext_resource type="Texture2D" uid="uid://cw5su6lignryo" path="res://assets/sprites/flag.png" id="2_fhs1y"]
-[ext_resource type="Texture2D" uid="uid://c2se5wyly6gr6" path="res://assets/sprites/character.bmp" id="2_on614"]
 [ext_resource type="Shader" uid="uid://bd8ki8xwym5nc" path="res://shaders/chroma_key.gdshader" id="3_fhs1y"]
+[ext_resource type="Texture2D" uid="uid://dyutp4m5d53gd" path="res://assets/sprites/CP002AA.BMP" id="3_on614"]
 
 [sub_resource type="GDScript" id="GDScript_fhs1y"]
 resource_name = "AllegianceIndicatorManager"
@@ -14,13 +14,46 @@ func _on_unit_unit_allegiance_changed(unit: Unit, allegiance: UnitAllegiance) ->
 	self_modulate = allegiance.color
 "
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_4j20j"]
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_fhs1y"]
 shader = ExtResource("3_fhs1y")
+shader_parameter/key_color = Color(0, 1, 0, 1)
 shader_parameter/threshold = 0.01
 
-[sub_resource type="AtlasTexture" id="AtlasTexture_on614"]
-atlas = ExtResource("2_on614")
-region = Rect2(144, 240, 48, 48)
+[sub_resource type="AtlasTexture" id="AtlasTexture_fhs1y"]
+atlas = ExtResource("3_on614")
+region = Rect2(0, 0, 40, 50)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_4j20j"]
+atlas = ExtResource("3_on614")
+region = Rect2(40, 0, 40, 50)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_v0xod"]
+atlas = ExtResource("3_on614")
+region = Rect2(0, 50, 40, 50)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_50p1h"]
+atlas = ExtResource("3_on614")
+region = Rect2(40, 50, 40, 50)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_7jqdg"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_fhs1y")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_4j20j")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_v0xod")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_50p1h")
+}],
+"loop": true,
+"name": &"idle",
+"speed": 5.0
+}]
 
 [sub_resource type="GDScript" id="GDScript_on614"]
 resource_name = "UnitSelectorHandler"
@@ -40,16 +73,17 @@ texture = ExtResource("2_fhs1y")
 offset = Vector2(24, 24)
 script = SubResource("GDScript_fhs1y")
 
-[node name="UnitSprite" type="Sprite2D" parent="." unique_id=350615297]
-z_index = 1
-material = SubResource("ShaderMaterial_4j20j")
-texture = SubResource("AtlasTexture_on614")
-offset = Vector2(24, 24)
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." unique_id=1796991032]
+material = SubResource("ShaderMaterial_fhs1y")
+position = Vector2(50, 50)
+sprite_frames = SubResource("SpriteFrames_7jqdg")
+animation = &"idle"
+autoplay = "idle"
 
 [node name="ColorRect" type="ColorRect" parent="." unique_id=1313394023]
 visible = false
-offset_right = 48.0
-offset_bottom = 48.0
+offset_right = 100.0
+offset_bottom = 100.0
 color = Color(1, 1, 0.3019608, 0.36078432)
 script = SubResource("GDScript_on614")