From 419e4db23167f71661b6627ad5c4b912e0067660 Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Thu, 27 Nov 2025 14:59:16 +0300 Subject: [PATCH] Added enemy sprites --- game/entities/ships/abstract_ship.gd | 1 - game/entities/ships/abstract_ship.tscn | 7 +--- .../ships/enemies/heavy/heavy_enemy_ship.tscn | 22 ++++------ .../enemies/medium/medium_enemy_ship.tscn | 20 ++++------ .../ships/enemies/small/small_enemy_ship.tscn | 18 +++------ game/entities/ships/player/player_ship.tscn | 12 ++---- images/ships/enemies/heavy.png | 3 ++ images/ships/enemies/heavy.png.import | 40 +++++++++++++++++++ images/ships/enemies/medium.png | 3 ++ images/ships/enemies/medium.png.import | 40 +++++++++++++++++++ images/ships/enemies/small.png | 3 ++ images/ships/enemies/small.png.import | 40 +++++++++++++++++++ images/ships/player.png | 4 +- images/weapons.png | 4 +- 14 files changed, 159 insertions(+), 58 deletions(-) create mode 100644 images/ships/enemies/heavy.png create mode 100644 images/ships/enemies/heavy.png.import create mode 100644 images/ships/enemies/medium.png create mode 100644 images/ships/enemies/medium.png.import create mode 100644 images/ships/enemies/small.png create mode 100644 images/ships/enemies/small.png.import diff --git a/game/entities/ships/abstract_ship.gd b/game/entities/ships/abstract_ship.gd index e8a35eb..b764cc8 100644 --- a/game/entities/ships/abstract_ship.gd +++ b/game/entities/ships/abstract_ship.gd @@ -23,7 +23,6 @@ signal destroyed @onready var sprite := $Sprite2D -@onready var collision := $CollisionShape2D @export_range(0, 250) var acceleration : int = 0 diff --git a/game/entities/ships/abstract_ship.tscn b/game/entities/ships/abstract_ship.tscn index 7dc2891..fe0c824 100644 --- a/game/entities/ships/abstract_ship.tscn +++ b/game/entities/ships/abstract_ship.tscn @@ -1,11 +1,9 @@ -[gd_scene load_steps=5 format=3 uid="uid://jvyagshykmgb"] +[gd_scene load_steps=4 format=3 uid="uid://jvyagshykmgb"] [ext_resource type="Script" uid="uid://cesibaqtrgotl" path="res://game/entities/ships/abstract_ship.gd" id="1_6isjb"] [ext_resource type="PackedScene" uid="uid://clkymhkv3cevm" path="res://game/health_system/health.tscn" id="2_xxtvk"] [ext_resource type="PackedScene" uid="uid://d2snum2pxc2ui" path="res://game/health_system/health_bar/heath_bar.tscn" id="3_l62e5"] -[sub_resource type="CircleShape2D" id="CircleShape2D_xxtvk"] - [node name="AbstractShip" type="CharacterBody2D"] disable_mode = 1 motion_mode = 1 @@ -14,8 +12,7 @@ script = ExtResource("1_6isjb") [node name="Sprite2D" type="Sprite2D" parent="."] -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] -shape = SubResource("CircleShape2D_xxtvk") +[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] [node name="Health" parent="." instance=ExtResource("2_xxtvk")] diff --git a/game/entities/ships/enemies/heavy/heavy_enemy_ship.tscn b/game/entities/ships/enemies/heavy/heavy_enemy_ship.tscn index ade8f60..6691118 100644 --- a/game/entities/ships/enemies/heavy/heavy_enemy_ship.tscn +++ b/game/entities/ships/enemies/heavy/heavy_enemy_ship.tscn @@ -1,14 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://d3epy8w15qmjm"] +[gd_scene load_steps=4 format=3 uid="uid://d3epy8w15qmjm"] [ext_resource type="PackedScene" uid="uid://dwsn0lf1e3578" path="res://game/entities/ships/enemies/abstract_enemy_ship.tscn" id="1_wvvpj"] [ext_resource type="Script" uid="uid://cxomr1oojcrcl" path="res://game/entities/ships/enemies/heavy/heavy_enemy_ship.gd" id="2_3umer"] - -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_cuapu"] -size = Vector2(64, 48) - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_cuapu"] -radius = 23.0 -height = 62.0 +[ext_resource type="Texture2D" uid="uid://5cgq8o5oqunq" path="res://images/ships/enemies/heavy.png" id="3_xqe8d"] [node name="HeavyEnemyShip" instance=ExtResource("1_wvvpj")] script = ExtResource("2_3umer") @@ -18,11 +12,10 @@ max_speed = 60 mass = 600 [node name="Sprite2D" parent="." index="0"] -texture = SubResource("PlaceholderTexture2D_cuapu") +texture = ExtResource("3_xqe8d") -[node name="CollisionShape2D" parent="." index="1"] -rotation = 1.5707964 -shape = SubResource("CapsuleShape2D_cuapu") +[node name="CollisionPolygon2D" parent="." index="1"] +polygon = PackedVector2Array(-31, 2, -31, -2, -17, -19, -11, -22, 8, -23, 30, -23, 30, 23, 8, 23, -11, 22, -17, 19) [node name="Health" parent="." index="2"] max_hull = 200 @@ -35,9 +28,10 @@ offset_bottom = 30.0 rect = Rect2(-29, -21, 58, 42) [node name="First" type="Node2D" parent="WeaponSlots" index="0"] -position = Vector2(0, -13) +position = Vector2(-8, 0) [node name="Second" type="Node2D" parent="WeaponSlots" index="1"] +position = Vector2(8, -16) [node name="Third" type="Node2D" parent="WeaponSlots" index="2"] -position = Vector2(0, 13) +position = Vector2(8, 16) diff --git a/game/entities/ships/enemies/medium/medium_enemy_ship.tscn b/game/entities/ships/enemies/medium/medium_enemy_ship.tscn index 232826c..6830c1e 100644 --- a/game/entities/ships/enemies/medium/medium_enemy_ship.tscn +++ b/game/entities/ships/enemies/medium/medium_enemy_ship.tscn @@ -1,14 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://cye5ndbh0ht7w"] +[gd_scene load_steps=4 format=3 uid="uid://cye5ndbh0ht7w"] [ext_resource type="PackedScene" uid="uid://dwsn0lf1e3578" path="res://game/entities/ships/enemies/abstract_enemy_ship.tscn" id="1_16owb"] [ext_resource type="Script" uid="uid://dcpqrdvp4nk82" path="res://game/entities/ships/enemies/medium/medium_enemy_ship.gd" id="2_dgwiy"] - -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_4jmkv"] -size = Vector2(32, 48) - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_4jmkv"] -radius = 15.0 -height = 46.0 +[ext_resource type="Texture2D" uid="uid://dkwvm246s0wnd" path="res://images/ships/enemies/medium.png" id="3_d2xji"] [node name="MediumEnemyShip" instance=ExtResource("1_16owb")] script = ExtResource("2_dgwiy") @@ -18,10 +12,10 @@ max_speed = 92 mass = 250 [node name="Sprite2D" parent="." index="0"] -texture = SubResource("PlaceholderTexture2D_4jmkv") +texture = ExtResource("3_d2xji") -[node name="CollisionShape2D" parent="." index="1"] -shape = SubResource("CapsuleShape2D_4jmkv") +[node name="CollisionPolygon2D" parent="." index="1"] +polygon = PackedVector2Array(-23, -2, -12, -13, -6, -15, 22, -15, 23, -14, 23, 14, 22, 15, -6, 15, -12, 13, -23, 2) [node name="Health" parent="." index="2"] max_hull = 100 @@ -34,7 +28,7 @@ offset_bottom = 30.0 rect = Rect2(-13, -21, 26, 42) [node name="First" type="Node2D" parent="WeaponSlots" index="0"] -position = Vector2(0, -10) +position = Vector2(4, -8) [node name="Second" type="Node2D" parent="WeaponSlots" index="1"] -position = Vector2(0, 10) +position = Vector2(4, 8) diff --git a/game/entities/ships/enemies/small/small_enemy_ship.tscn b/game/entities/ships/enemies/small/small_enemy_ship.tscn index e5cda83..e5b020c 100644 --- a/game/entities/ships/enemies/small/small_enemy_ship.tscn +++ b/game/entities/ships/enemies/small/small_enemy_ship.tscn @@ -1,13 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://cbf3kumeoqpba"] +[gd_scene load_steps=4 format=3 uid="uid://cbf3kumeoqpba"] [ext_resource type="PackedScene" uid="uid://dwsn0lf1e3578" path="res://game/entities/ships/enemies/abstract_enemy_ship.tscn" id="1_lt1av"] [ext_resource type="Script" uid="uid://btcce3nflycrs" path="res://game/entities/ships/enemies/small/small_enemy_ship.gd" id="2_bw04d"] - -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_bw04d"] -size = Vector2(32, 16) - -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_lopve"] -radius = 7.0 +[ext_resource type="Texture2D" uid="uid://5xn5jkmtbn6v" path="res://images/ships/enemies/small.png" id="3_tb2nn"] [node name="SmallEnemyShip" instance=ExtResource("1_lt1av")] script = ExtResource("2_bw04d") @@ -17,11 +12,10 @@ max_speed = 120 mass = 100 [node name="Sprite2D" parent="." index="0"] -texture = SubResource("PlaceholderTexture2D_bw04d") +texture = ExtResource("3_tb2nn") -[node name="CollisionShape2D" parent="." index="1"] -rotation = 1.5707964 -shape = SubResource("CapsuleShape2D_lopve") +[node name="CollisionPolygon2D" parent="." index="1"] +polygon = PackedVector2Array(-3, -7, 12, -7, 15, -4, 15, 4, 12, 7, -3, 7, -15, 1, -15, -1) [node name="Health" parent="." index="2"] max_hull = 50 @@ -34,4 +28,4 @@ offset_bottom = 14.0 rect = Rect2(-13, -5, 26, 10) [node name="First" type="Node2D" parent="WeaponSlots" index="0"] -position = Vector2(6, 0) +position = Vector2(5, 0) diff --git a/game/entities/ships/player/player_ship.tscn b/game/entities/ships/player/player_ship.tscn index 6c4d672..a960c1f 100644 --- a/game/entities/ships/player/player_ship.tscn +++ b/game/entities/ships/player/player_ship.tscn @@ -1,14 +1,10 @@ -[gd_scene load_steps=6 format=3 uid="uid://br074cqcnul3d"] +[gd_scene load_steps=5 format=3 uid="uid://br074cqcnul3d"] [ext_resource type="PackedScene" uid="uid://jvyagshykmgb" path="res://game/entities/ships/abstract_ship.tscn" id="1_6otxb"] [ext_resource type="Script" uid="uid://ruxw1n03iq4i" path="res://game/entities/ships/player/player_ship.gd" id="2_625ti"] [ext_resource type="PackedScene" uid="uid://dh1oj1w5wx4je" path="res://game/controllers/player_controller.tscn" id="3_4mjo1"] [ext_resource type="Texture2D" uid="uid://y2yfli24n51v" path="res://images/ships/player.png" id="3_uf2n1"] -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_dj8f1"] -radius = 15.0 -height = 46.0 - [node name="PlayerShip" groups=["players"] instance=ExtResource("1_6otxb")] collision_layer = 3 collision_mask = 5 @@ -17,14 +13,12 @@ acceleration = 92 deceleration = 46 max_speed = 92 mass = 250 -weapon_rotation = null [node name="Sprite2D" parent="." index="0"] texture = ExtResource("3_uf2n1") -[node name="CollisionShape2D" parent="." index="1"] -rotation = 1.5707964 -shape = SubResource("CapsuleShape2D_dj8f1") +[node name="CollisionPolygon2D" parent="." index="1"] +polygon = PackedVector2Array(-23, -10, -17, -14, -3, -15, 21, -13, 22, -12, 22, 12, 21, 13, -3, 15, -17, 14, -23, 10) [node name="Health" parent="." index="2"] max_hull = 1000 diff --git a/images/ships/enemies/heavy.png b/images/ships/enemies/heavy.png new file mode 100644 index 0000000..43063a3 --- /dev/null +++ b/images/ships/enemies/heavy.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75a8bac50a08b552b9d0878c737e942bf32211cede333bcb97b8d4558379070a +size 730 diff --git a/images/ships/enemies/heavy.png.import b/images/ships/enemies/heavy.png.import new file mode 100644 index 0000000..b421cbe --- /dev/null +++ b/images/ships/enemies/heavy.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5cgq8o5oqunq" +path="res://.godot/imported/heavy.png-b0175c145ba80943e42d134c15fc0c59.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/ships/enemies/heavy.png" +dest_files=["res://.godot/imported/heavy.png-b0175c145ba80943e42d134c15fc0c59.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/images/ships/enemies/medium.png b/images/ships/enemies/medium.png new file mode 100644 index 0000000..89fbe49 --- /dev/null +++ b/images/ships/enemies/medium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17fd2c0128a92000ff49097b2402541832c95dbac02f7f17d96e9bf0efd12760 +size 535 diff --git a/images/ships/enemies/medium.png.import b/images/ships/enemies/medium.png.import new file mode 100644 index 0000000..93148d5 --- /dev/null +++ b/images/ships/enemies/medium.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dkwvm246s0wnd" +path="res://.godot/imported/medium.png-d837bd9638a38b7f12041eca8ac1c7de.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/ships/enemies/medium.png" +dest_files=["res://.godot/imported/medium.png-d837bd9638a38b7f12041eca8ac1c7de.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/images/ships/enemies/small.png b/images/ships/enemies/small.png new file mode 100644 index 0000000..2fda5b8 --- /dev/null +++ b/images/ships/enemies/small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6875141029642671222a6559881f0f98846ed3c8f8fe975db605c0b67b8229c +size 315 diff --git a/images/ships/enemies/small.png.import b/images/ships/enemies/small.png.import new file mode 100644 index 0000000..ef52a71 --- /dev/null +++ b/images/ships/enemies/small.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://5xn5jkmtbn6v" +path="res://.godot/imported/small.png-db1d308abce12a143e21fc9997c962d0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/ships/enemies/small.png" +dest_files=["res://.godot/imported/small.png-db1d308abce12a143e21fc9997c962d0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/images/ships/player.png b/images/ships/player.png index 35801fd..c4b5b8e 100644 --- a/images/ships/player.png +++ b/images/ships/player.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5ef2ca4a04e5b909389f5c77e209f32ef46b6a44bb2e051dc42b0a6fc5c2ba0c -size 512 +oid sha256:d60419f26223e8cd09b75c4be15ee64553cb38cec53cf429f2cfccd1f8ded5d2 +size 516 diff --git a/images/weapons.png b/images/weapons.png index bb57571..06fc900 100644 --- a/images/weapons.png +++ b/images/weapons.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f242f4866c432885ec09db8d8234ab8e3af5620904f416591a890aeac3cbf505 -size 4225 +oid sha256:b827c89fb4db265e3ba9aeab8d1a3fc1b2fe38eec887010f35ea28f4b8ed8703 +size 4248