diff --git a/Scenes/Entities/Enemy.png b/Scenes/Entities/Enemy.png new file mode 100644 index 0000000..cbdd7b5 Binary files /dev/null and b/Scenes/Entities/Enemy.png differ diff --git a/Scenes/Entities/Enemy.jpg.import b/Scenes/Entities/Enemy.png.import similarity index 69% rename from Scenes/Entities/Enemy.jpg.import rename to Scenes/Entities/Enemy.png.import index ed25537..a0b5193 100644 --- a/Scenes/Entities/Enemy.jpg.import +++ b/Scenes/Entities/Enemy.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dlhpiyxtmp707" -path="res://.godot/imported/Enemy.jpg-862b79047d7834ee48aa6bbd7e126824.ctex" +uid="uid://x4u6oatvsm8y" +path="res://.godot/imported/Enemy.png-7a121c0bc2e7a40a7fe012e488d00452.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Scenes/Entities/Enemy.jpg" -dest_files=["res://.godot/imported/Enemy.jpg-862b79047d7834ee48aa6bbd7e126824.ctex"] +source_file="res://Scenes/Entities/Enemy.png" +dest_files=["res://.godot/imported/Enemy.png-7a121c0bc2e7a40a7fe012e488d00452.ctex"] [params] diff --git a/Scenes/Entities/Enemy.tscn b/Scenes/Entities/Enemy.tscn index 995af85..4006627 100644 --- a/Scenes/Entities/Enemy.tscn +++ b/Scenes/Entities/Enemy.tscn @@ -1,27 +1,21 @@ -[gd_scene load_steps=5 format=3 uid="uid://b3ffcucytwmk"] +[gd_scene load_steps=3 format=3 uid="uid://b3ffcucytwmk"] -[ext_resource type="Texture2D" uid="uid://dlhpiyxtmp707" path="res://Scenes/Entities/Enemy.jpg" id="1_8q37v"] [ext_resource type="Script" uid="uid://cvsmy820b8dwl" path="res://Scripts/Entities/Enemy.cs" id="1_jajit"] - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_jajit"] -size = Vector2(60, 74) - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_wmvnc"] -size = Vector2(70, 84) +[ext_resource type="Texture2D" uid="uid://x4u6oatvsm8y" path="res://Scenes/Entities/Enemy.png" id="2_jajit"] [node name="Enemy" type="CharacterBody2D"] collision_layer = 2 collision_mask = 3 script = ExtResource("1_jajit") -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("RectangleShape2D_jajit") +[node name="CollisionShape2D" type="CollisionPolygon2D" parent="."] +polygon = PackedVector2Array(-2, -21, 3, -21, 24, 6, 24, 10, 20, 14, -21, 14, -24, 11, -24, 7) [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.1, 0.1) -texture = ExtResource("1_8q37v") +scale = Vector2(0.05, 0.05) +texture = ExtResource("2_jajit") [node name="AttackArea" type="Area2D" parent="."] -[node name="CollisionShape2D" type="CollisionShape2D" parent="AttackArea"] -shape = SubResource("RectangleShape2D_wmvnc") +[node name="CollisionShape2D" type="CollisionPolygon2D" parent="AttackArea"] +polygon = PackedVector2Array(-3, -24, 4, -24, 27, 5, 27, 14, 20, 19, -21, 19, -27, 14, -27, 5) diff --git a/Scenes/Tiles/EnemyPortalTile.tscn b/Scenes/Tiles/EnemyPortalTile.tscn index 2aefdfd..4a7f086 100644 --- a/Scenes/Tiles/EnemyPortalTile.tscn +++ b/Scenes/Tiles/EnemyPortalTile.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://dup2su0s3ybcy"] +[gd_scene load_steps=5 format=3 uid="uid://dup2su0s3ybcy"] [ext_resource type="Script" uid="uid://26hl5mk4mqur" path="res://Scripts/Tiles/EnemyPortalTile.cs" id="1_o543x"] +[ext_resource type="PackedScene" uid="uid://b3ffcucytwmk" path="res://Scenes/Entities/Enemy.tscn" id="2_nh7ff"] [ext_resource type="Texture2D" uid="uid://dv2xwfyshxdtp" path="res://Scenes/Tiles/EnemyPortalTile.png" id="3_i4us4"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_id484"] @@ -10,6 +11,7 @@ size = Vector2(54, 79) collision_layer = 0 collision_mask = 0 script = ExtResource("1_o543x") +EnemyScene = ExtResource("2_nh7ff") TileId = "enemy_portal" [node name="Sprite2D" type="Sprite2D" parent="."]