From 17f4e116516512bdb8319efe6ce34dca9ee3e4f6 Mon Sep 17 00:00:00 2001 From: Marco Date: Sun, 23 Feb 2025 16:19:15 +0100 Subject: [PATCH] Fairy Guard --- Scenes/Actors/Fairy.tscn | 162 +++++++++++++++++++++++ Scenes/Actors/FairyGuard.tscn | 190 +++++++++++++++++++++++++++ Scenes/Actors/RoamingSusan.tscn | 1 - Scenes/Enemy.tscn | 1 - Scenes/player.tscn | 4 +- Scenes/test.tscn | 42 +++--- Sprites/Actors/Fairy.aseprite | 3 + Sprites/Actors/Fairy.png | 3 + Sprites/Actors/Fairy.png.import | 34 +++++ Sprites/Actors/FairyGuard.aseprite | 3 + Sprites/Actors/FairyGuard.png | 3 + Sprites/Actors/FairyGuard.png.import | 34 +++++ Tilesets/Beams.aseprite | 3 + Tilesets/factory.aseprite | 4 +- Tilesets/factory.png | 4 +- Tilesets/factory_tileset.tres | 41 ++++-- 16 files changed, 492 insertions(+), 40 deletions(-) create mode 100644 Scenes/Actors/Fairy.tscn create mode 100644 Scenes/Actors/FairyGuard.tscn create mode 100644 Sprites/Actors/Fairy.aseprite create mode 100644 Sprites/Actors/Fairy.png create mode 100644 Sprites/Actors/Fairy.png.import create mode 100644 Sprites/Actors/FairyGuard.aseprite create mode 100644 Sprites/Actors/FairyGuard.png create mode 100644 Sprites/Actors/FairyGuard.png.import create mode 100644 Tilesets/Beams.aseprite diff --git a/Scenes/Actors/Fairy.tscn b/Scenes/Actors/Fairy.tscn new file mode 100644 index 00000000..d8cf2756 --- /dev/null +++ b/Scenes/Actors/Fairy.tscn @@ -0,0 +1,162 @@ +[gd_scene load_steps=20 format=3 uid="uid://drfkerulftqxc"] + +[ext_resource type="Script" path="res://Scripts/Enemy.cs" id="1_k0hjx"] +[ext_resource type="Texture2D" uid="uid://xgxxdq37pykh" path="res://Sprites/Actors/Fairy.png" id="2_okmhl"] +[ext_resource type="Script" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="3_7igo2"] +[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="4_a8ksw"] +[ext_resource type="Resource" uid="uid://cdfmedtgp2rcn" path="res://Resources/Weapons/EnemyWeapon.tres" id="5_2gy2u"] +[ext_resource type="PackedScene" uid="uid://cuixq5ex0j40h" path="res://Scenes/enemyBullet.tscn" id="6_8fe6c"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_13sn2"] +atlas = ExtResource("2_okmhl") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_qs3gm"] +atlas = ExtResource("2_okmhl") +region = Rect2(16, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_fppxn"] +atlas = ExtResource("2_okmhl") +region = Rect2(0, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_b01sl"] +atlas = ExtResource("2_okmhl") +region = Rect2(16, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_jgccb"] +atlas = ExtResource("2_okmhl") +region = Rect2(0, 16, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_v7nm4"] +atlas = ExtResource("2_okmhl") +region = Rect2(16, 16, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_cciyq"] +atlas = ExtResource("2_okmhl") +region = Rect2(0, 48, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_c2w8n"] +atlas = ExtResource("2_okmhl") +region = Rect2(16, 48, 16, 16) + +[sub_resource type="SpriteFrames" id="SpriteFrames_6lmxq"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_13sn2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_qs3gm") +}], +"loop": true, +"name": &"down", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_fppxn") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_b01sl") +}], +"loop": true, +"name": &"left", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_jgccb") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_v7nm4") +}], +"loop": true, +"name": &"right", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_cciyq") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_c2w8n") +}], +"loop": true, +"name": &"up", +"speed": 5.0 +}] + +[sub_resource type="CircleShape2D" id="CircleShape2D_8gtts"] +radius = 7.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_cacb5"] +radius = 4.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_v711r"] +radius = 85.0529 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_m1rsg"] +size = Vector2(8, 12) + +[node name="Enemy" type="CharacterBody2D" node_paths=PackedStringArray("EquippedWeapon", "_playerDetection") groups=["Destroyable"]] +collision_layer = 16 +collision_mask = 9 +script = ExtResource("1_k0hjx") +Health = 2.0 +EquippedWeapon = NodePath("Weapon") +_playerDetection = NodePath("PlayerDetection") +_navigationEnabled = true +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_6lmxq") +animation = &"down" +autoplay = "down" + +[node name="Damage_HitBox" type="CollisionShape2D" parent="."] +visible = false +shape = SubResource("CircleShape2D_8gtts") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 16 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false +position = Vector2(0, 5) +shape = SubResource("CircleShape2D_cacb5") + +[node name="PlayerDetection" type="Area2D" parent="."] +visible = false +collision_layer = 16 +collision_mask = 2 +script = ExtResource("3_7igo2") + +[node name="PlayerDetectionArea" type="CollisionShape2D" parent="PlayerDetection"] +shape = SubResource("CircleShape2D_v711r") + +[node name="ShootTimer" type="Timer" parent="."] +wait_time = 0.4 +one_shot = true + +[node name="Weapon" parent="." instance=ExtResource("4_a8ksw")] +WeaponData = ExtResource("5_2gy2u") +BulletScene = ExtResource("6_8fe6c") + +[node name="NavigationAgent2D" type="NavigationAgent2D" parent="."] +target_desired_distance = 64.0 +path_max_distance = 800.0 +path_postprocessing = 1 +avoidance_enabled = true +debug_path_custom_color = Color(1, 0, 0, 1) + +[node name="DamageHitbox" type="Area2D" parent="."] +collision_layer = 16 +collision_mask = 9 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="DamageHitbox"] +shape = SubResource("RectangleShape2D_m1rsg") + +[connection signal="area_entered" from="PlayerDetection" to="PlayerDetection" method="_on_area_entered"] +[connection signal="area_exited" from="PlayerDetection" to="PlayerDetection" method="_on_area_exited"] +[connection signal="velocity_computed" from="NavigationAgent2D" to="." method="_on_navigation_agent_2d_velocity_computed"] +[connection signal="area_entered" from="DamageHitbox" to="." method="_on_damage_hitbox_area_entered"] diff --git a/Scenes/Actors/FairyGuard.tscn b/Scenes/Actors/FairyGuard.tscn new file mode 100644 index 00000000..eb059175 --- /dev/null +++ b/Scenes/Actors/FairyGuard.tscn @@ -0,0 +1,190 @@ +[gd_scene load_steps=24 format=3 uid="uid://clxx2ytg3qkcr"] + +[ext_resource type="Script" path="res://Scripts/Enemy.cs" id="1_d31cy"] +[ext_resource type="Texture2D" uid="uid://xhwfgbv0fjbr" path="res://Sprites/Actors/FairyGuard.png" id="2_dhwsn"] +[ext_resource type="Script" path="res://Scripts/Components/ProximityPlayerDetection.cs" id="3_i7ey1"] +[ext_resource type="PackedScene" uid="uid://crry0rgk7a8sm" path="res://Scenes/Weapons/BaseWeapon.tscn" id="4_p0lt3"] +[ext_resource type="Resource" uid="uid://cdfmedtgp2rcn" path="res://Resources/Weapons/EnemyWeapon.tres" id="5_s8k35"] +[ext_resource type="PackedScene" uid="uid://cuixq5ex0j40h" path="res://Scenes/enemyBullet.tscn" id="6_vxjxr"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_42a57"] +atlas = ExtResource("2_dhwsn") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gl2o5"] +atlas = ExtResource("2_dhwsn") +region = Rect2(16, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ad5n8"] +atlas = ExtResource("2_dhwsn") +region = Rect2(32, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_hfqok"] +atlas = ExtResource("2_dhwsn") +region = Rect2(0, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_47idc"] +atlas = ExtResource("2_dhwsn") +region = Rect2(32, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gquu4"] +atlas = ExtResource("2_dhwsn") +region = Rect2(16, 32, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2ftnw"] +atlas = ExtResource("2_dhwsn") +region = Rect2(0, 48, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_o4btr"] +atlas = ExtResource("2_dhwsn") +region = Rect2(16, 48, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_ue8y7"] +atlas = ExtResource("2_dhwsn") +region = Rect2(32, 48, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_n8dp2"] +atlas = ExtResource("2_dhwsn") +region = Rect2(0, 16, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_6p57w"] +atlas = ExtResource("2_dhwsn") +region = Rect2(16, 16, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_gpakj"] +atlas = ExtResource("2_dhwsn") +region = Rect2(32, 16, 16, 16) + +[sub_resource type="SpriteFrames" id="SpriteFrames_0g5m3"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_42a57") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gl2o5") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ad5n8") +}], +"loop": true, +"name": &"down", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_hfqok") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_47idc") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gquu4") +}], +"loop": true, +"name": &"left", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_2ftnw") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_o4btr") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_ue8y7") +}], +"loop": true, +"name": &"right", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_n8dp2") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_6p57w") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_gpakj") +}], +"loop": true, +"name": &"up", +"speed": 5.0 +}] + +[sub_resource type="CircleShape2D" id="CircleShape2D_8gtts"] +radius = 7.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_cacb5"] +radius = 4.0 + +[sub_resource type="CircleShape2D" id="CircleShape2D_v711r"] +radius = 85.0529 + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_m1rsg"] +size = Vector2(8, 12) + +[node name="Enemy" type="CharacterBody2D" node_paths=PackedStringArray("EquippedWeapon", "_playerDetection") groups=["Destroyable"]] +collision_layer = 16 +collision_mask = 9 +script = ExtResource("1_d31cy") +EquippedWeapon = NodePath("Weapon") +_playerDetection = NodePath("PlayerDetection") +_navigationEnabled = true +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_0g5m3") +animation = &"left" +frame = 2 +frame_progress = 0.309308 + +[node name="Damage_HitBox" type="CollisionShape2D" parent="."] +visible = false +shape = SubResource("CircleShape2D_8gtts") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 16 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false +position = Vector2(0, 5) +shape = SubResource("CircleShape2D_cacb5") + +[node name="PlayerDetection" type="Area2D" parent="."] +visible = false +collision_layer = 16 +collision_mask = 2 +script = ExtResource("3_i7ey1") + +[node name="PlayerDetectionArea" type="CollisionShape2D" parent="PlayerDetection"] +shape = SubResource("CircleShape2D_v711r") + +[node name="ShootTimer" type="Timer" parent="."] +wait_time = 0.4 +one_shot = true + +[node name="Weapon" parent="." instance=ExtResource("4_p0lt3")] +WeaponData = ExtResource("5_s8k35") +BulletScene = ExtResource("6_vxjxr") + +[node name="NavigationAgent2D" type="NavigationAgent2D" parent="."] +target_desired_distance = 64.0 +path_max_distance = 800.0 +path_postprocessing = 1 +avoidance_enabled = true +debug_path_custom_color = Color(1, 0, 0, 1) + +[node name="DamageHitbox" type="Area2D" parent="."] +collision_layer = 16 +collision_mask = 9 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="DamageHitbox"] +shape = SubResource("RectangleShape2D_m1rsg") + +[connection signal="area_entered" from="PlayerDetection" to="PlayerDetection" method="_on_area_entered"] +[connection signal="area_exited" from="PlayerDetection" to="PlayerDetection" method="_on_area_exited"] +[connection signal="velocity_computed" from="NavigationAgent2D" to="." method="_on_navigation_agent_2d_velocity_computed"] +[connection signal="area_entered" from="DamageHitbox" to="." method="_on_damage_hitbox_area_entered"] diff --git a/Scenes/Actors/RoamingSusan.tscn b/Scenes/Actors/RoamingSusan.tscn index 507c16fc..e6a2001d 100644 --- a/Scenes/Actors/RoamingSusan.tscn +++ b/Scenes/Actors/RoamingSusan.tscn @@ -90,7 +90,6 @@ target_desired_distance = 64.0 path_max_distance = 800.0 path_postprocessing = 1 avoidance_enabled = true -debug_enabled = true debug_path_custom_color = Color(1, 0, 0, 1) [node name="DamageHitbox" type="Area2D" parent="."] diff --git a/Scenes/Enemy.tscn b/Scenes/Enemy.tscn index 192d036d..8dc90093 100644 --- a/Scenes/Enemy.tscn +++ b/Scenes/Enemy.tscn @@ -89,7 +89,6 @@ target_desired_distance = 64.0 path_max_distance = 800.0 path_postprocessing = 1 avoidance_enabled = true -debug_enabled = true debug_path_custom_color = Color(1, 0, 0, 1) [node name="DamageHitbox" type="Area2D" parent="."] diff --git a/Scenes/player.tscn b/Scenes/player.tscn index 36aba30e..7306f74d 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -222,9 +222,9 @@ frame = 1 y_sort_enabled = true material = SubResource("ShaderMaterial_s7co1") sprite_frames = SubResource("SpriteFrames_q0rt3") -animation = &"walk_up" +animation = &"walk_left" frame = 1 -frame_progress = 0.984651 +frame_progress = 0.47396 [node name="Crosshair" parent="Smoothing2D" instance=ExtResource("6_l43rf")] z_index = 100 diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 667c4c68..0c6b123c 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=86 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=88 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://bghghp5ep4w2j" path="res://Scenes/player.tscn" id="2_8mh54"] @@ -71,6 +71,8 @@ [ext_resource type="Script" path="res://Scripts/Resources/Events/ControlEnemyEvent.cs" id="52_5m7td"] [ext_resource type="PackedScene" uid="uid://bqjcwxene73l2" path="res://Scenes/Actors/ActorEnemyTest.tscn" id="55_chha6"] [ext_resource type="PackedScene" uid="uid://b0gpbkxdfbnjh" path="res://Scenes/Actors/ForceField_Horizontal.tscn" id="66_nxn3h"] +[ext_resource type="PackedScene" uid="uid://drfkerulftqxc" path="res://Scenes/Actors/Fairy.tscn" id="72_eg6qk"] +[ext_resource type="PackedScene" uid="uid://clxx2ytg3qkcr" path="res://Scenes/Actors/FairyGuard.tscn" id="73_2st3s"] [sub_resource type="Resource" id="Resource_6sau4"] script = ExtResource("7_l32kg") @@ -140,7 +142,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_8ehtp"] +[sub_resource type="Resource" id="Resource_oorlt"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -378,7 +380,7 @@ position = Vector2(-713, -153) Events = Array[Object]([SubResource("Resource_hppa0")]) [node name="Turret" parent="Factory Tilemaps" instance=ExtResource("18_6y85f")] -position = Vector2(-1076, 125) +position = Vector2(-1123, 44) [node name="Turret2" parent="Factory Tilemaps" instance=ExtResource("18_6y85f")] position = Vector2(-1913, -736) @@ -540,18 +542,6 @@ polygon = PackedVector2Array(95, 57, 46, 58, -83, 61, -91, -37, 88, -37, 114, -1 [node name="Fragola" parent="." instance=ExtResource("4_s7wq6")] position = Vector2(-743, -117) -[node name="Enemy" parent="." instance=ExtResource("18_ixcwn")] -position = Vector2(-687, -10) - -[node name="Enemy2" parent="." instance=ExtResource("18_ixcwn")] -position = Vector2(-646, 179) - -[node name="Enemy3" parent="." instance=ExtResource("18_ixcwn")] -position = Vector2(-801, 81) - -[node name="Enemy4" parent="." instance=ExtResource("18_ixcwn")] -position = Vector2(-936, 192) - [node name="Enemy5" parent="." instance=ExtResource("18_ixcwn")] position = Vector2(-1239.5, 10.9699) @@ -688,13 +678,10 @@ Events = Array[Object]([SubResource("Resource_068l7"), SubResource("Resource_l3n [node name="BossBattleStartScript" parent="." instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_8ehtp")]) +Events = Array[Object]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_oorlt")]) [node name="Enemy8" parent="." instance=ExtResource("47_u1ve6")] -position = Vector2(-968, 206) - -[node name="Enemy9" parent="." instance=ExtResource("47_u1ve6")] -position = Vector2(-787, 189) +position = Vector2(-1117, 184) [node name="Enemy10" parent="." instance=ExtResource("47_u1ve6")] position = Vector2(-895, 106) @@ -708,9 +695,6 @@ position = Vector2(-1652, -211) [node name="Enemy13" parent="." instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) -[node name="Enemy14" parent="." instance=ExtResource("47_u1ve6")] -position = Vector2(-707, 53) - [node name="Valve" parent="." node_paths=PackedStringArray("Target") instance=ExtResource("48_8usll")] position = Vector2(-697, 25) Target = NodePath("../BulletEmitter") @@ -726,3 +710,15 @@ position = Vector2(-1404, -647) [node name="VerticalDoor2" parent="." instance=ExtResource("15_mgtvp")] position = Vector2(-1572, -632) + +[node name="Enemy16" parent="." instance=ExtResource("72_eg6qk")] +position = Vector2(-708, 57) + +[node name="Enemy17" parent="." instance=ExtResource("72_eg6qk")] +position = Vector2(-951, 200) + +[node name="Enemy2" parent="." instance=ExtResource("73_2st3s")] +position = Vector2(-677, -22) + +[node name="Enemy9" parent="." instance=ExtResource("73_2st3s")] +position = Vector2(-791, 79) diff --git a/Sprites/Actors/Fairy.aseprite b/Sprites/Actors/Fairy.aseprite new file mode 100644 index 00000000..3b106f65 --- /dev/null +++ b/Sprites/Actors/Fairy.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4176c9589e3156dca116ddac7771d7dc34acbd20094ec3a2c61119d1dd293b3 +size 2116 diff --git a/Sprites/Actors/Fairy.png b/Sprites/Actors/Fairy.png new file mode 100644 index 00000000..b715f682 --- /dev/null +++ b/Sprites/Actors/Fairy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af51f6310d0be5dfa173da09351c77065ba8482a98dc6a69440b2c0979644fa5 +size 546 diff --git a/Sprites/Actors/Fairy.png.import b/Sprites/Actors/Fairy.png.import new file mode 100644 index 00000000..86a68245 --- /dev/null +++ b/Sprites/Actors/Fairy.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xgxxdq37pykh" +path="res://.godot/imported/Fairy.png-9c311fb3b635cb0378274ba39e7e42ca.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/Fairy.png" +dest_files=["res://.godot/imported/Fairy.png-9c311fb3b635cb0378274ba39e7e42ca.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/Actors/FairyGuard.aseprite b/Sprites/Actors/FairyGuard.aseprite new file mode 100644 index 00000000..4e4709bc --- /dev/null +++ b/Sprites/Actors/FairyGuard.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5f18cd185fb5c51c034beb644504d8ca2a6e4644e6c86c8e51f9bef2331dfce +size 3977 diff --git a/Sprites/Actors/FairyGuard.png b/Sprites/Actors/FairyGuard.png new file mode 100644 index 00000000..a982b7bb --- /dev/null +++ b/Sprites/Actors/FairyGuard.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74ba9bcda97b3c98a51d3ddd07671ef38db19598034a991c1e3611bacfebe2e1 +size 1046 diff --git a/Sprites/Actors/FairyGuard.png.import b/Sprites/Actors/FairyGuard.png.import new file mode 100644 index 00000000..99db8ae6 --- /dev/null +++ b/Sprites/Actors/FairyGuard.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xhwfgbv0fjbr" +path="res://.godot/imported/FairyGuard.png-c13f7bb7cfab625be756e4c8ce727661.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/FairyGuard.png" +dest_files=["res://.godot/imported/FairyGuard.png-c13f7bb7cfab625be756e4c8ce727661.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Tilesets/Beams.aseprite b/Tilesets/Beams.aseprite new file mode 100644 index 00000000..2e9df16f --- /dev/null +++ b/Tilesets/Beams.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0cab6c750a596937e2cbf64ee327d2d69136717145aa705949f241f96bd3ea1 +size 1951 diff --git a/Tilesets/factory.aseprite b/Tilesets/factory.aseprite index 196238da..4e54afbd 100644 --- a/Tilesets/factory.aseprite +++ b/Tilesets/factory.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec1e7e06c429e5d33aa5b22fbfd3b63abc87251ff43683bbfb095710a7f6012f -size 6389 +oid sha256:16ef42202126b8c967a0fb766df897929302542f9aa64ec9d5d957dcd6ddc98c +size 6809 diff --git a/Tilesets/factory.png b/Tilesets/factory.png index 31dda6ec..b66bf406 100644 --- a/Tilesets/factory.png +++ b/Tilesets/factory.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d73fec2caba5d95f3690740df177b31d741c241f66b2064f8df46ab9692d9ff1 -size 8855 +oid sha256:5407178aa3a7298e2865afff9b50dccef66825c9c21b2bc6bb77081688174e6e +size 8840 diff --git a/Tilesets/factory_tileset.tres b/Tilesets/factory_tileset.tres index 84325683..821b46a3 100644 --- a/Tilesets/factory_tileset.tres +++ b/Tilesets/factory_tileset.tres @@ -1,4 +1,4 @@ -[gd_resource type="TileSet" load_steps=35 format=3 uid="uid://6k28roiljylj"] +[gd_resource type="TileSet" load_steps=38 format=3 uid="uid://6k28roiljylj"] [ext_resource type="Texture2D" uid="uid://tphqodqyere1" path="res://Tilesets/factory.png" id="1_70kxh"] [ext_resource type="PackedScene" uid="uid://bj28qiai2x2ar" path="res://Scenes/Props/Barrel.tscn" id="2_cxg4b"] @@ -50,7 +50,7 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 -[sub_resource type="NavigationPolygon" id="NavigationPolygon_31wwl"] +[sub_resource type="NavigationPolygon" id="NavigationPolygon_pk0d2"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) @@ -62,19 +62,31 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 -[sub_resource type="NavigationPolygon" id="NavigationPolygon_upy4h"] +[sub_resource type="NavigationPolygon" id="NavigationPolygon_m1mpj"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 -[sub_resource type="NavigationPolygon" id="NavigationPolygon_4iri0"] +[sub_resource type="NavigationPolygon" id="NavigationPolygon_46h6y"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 -[sub_resource type="NavigationPolygon" id="NavigationPolygon_uanwu"] +[sub_resource type="NavigationPolygon" id="NavigationPolygon_s74fl"] +vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) +agent_radius = 0.0 + +[sub_resource type="NavigationPolygon" id="NavigationPolygon_nvcpm"] +vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) +agent_radius = 0.0 + +[sub_resource type="NavigationPolygon" id="NavigationPolygon_bwsto"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) @@ -86,6 +98,12 @@ polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) agent_radius = 0.0 +[sub_resource type="NavigationPolygon" id="NavigationPolygon_8lv53"] +vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) +polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) +outlines = Array[PackedVector2Array]([PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)]) +agent_radius = 0.0 + [sub_resource type="NavigationPolygon" id="NavigationPolygon_ajuv4"] vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8) polygons = Array[PackedInt32Array]([PackedInt32Array(0, 1, 2, 3)]) @@ -131,7 +149,9 @@ texture = ExtResource("1_70kxh") 3:0/0 = 0 3:0/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 4:0/0 = 0 +4:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_m1mpj") 5:0/0 = 0 +5:0/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_s74fl") 6:0/0 = 0 6:0/0/physics_layer_1/polygon_0/points = PackedVector2Array(-6, -6, -6, 2, 8, 2, 8, -6) 7:0/0 = 0 @@ -154,7 +174,7 @@ texture = ExtResource("1_70kxh") 5:1/0 = 0 5:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8) 6:1/0 = 0 -6:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_uanwu") +6:1/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_bwsto") 7:1/0 = 0 8:1/0 = 0 8:1/0/physics_layer_1/polygon_0/points = PackedVector2Array(-4, -8, -4, 2, 4, 2, 4, -8) @@ -167,11 +187,11 @@ texture = ExtResource("1_70kxh") 2:2/0 = 0 2:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_x7tqo") 3:2/0 = 0 -3:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_31wwl") +3:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_pk0d2") 4:2/0 = 0 -4:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_upy4h") +4:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_46h6y") 5:2/0 = 0 -5:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_4iri0") +5:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_nvcpm") 6:2/0 = 0 6:2/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_6t4b1") 7:2/0 = 0 @@ -231,8 +251,11 @@ texture = ExtResource("1_70kxh") 5:4/0/terrain = 2 5:4/0/terrains_peering_bit/bottom_side = 2 6:4/0 = 0 +6:4/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_8lv53") 7:4/0 = 0 +7:4/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_8lv53") 8:4/0 = 0 +8:4/0/navigation_layer_0/polygon = SubResource("NavigationPolygon_8lv53") 9:4/next_alternative_id = 2 9:4/0 = 0 9:4/1 = 1