diff --git a/Scenes/Actors/Turret360.tscn b/Scenes/Actors/Turret360.tscn index a191e995..ff031dae 100644 --- a/Scenes/Actors/Turret360.tscn +++ b/Scenes/Actors/Turret360.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=34 format=3 uid="uid://bjskkeb3ppcs8"] [ext_resource type="Script" uid="uid://c2mo5hc1qb6kf" path="res://Scripts/Components/Actors/Actor.cs" id="1_g7c56"] -[ext_resource type="Texture2D" uid="uid://ke3ialixybfn" path="res://Sprites/Actors/Turret360.png" id="2_g7c56"] +[ext_resource type="Texture2D" uid="uid://c2seclmhd5yt3" path="res://Sprites/Actors/Cannon3D.png" id="2_m663r"] [ext_resource type="Script" uid="uid://tk6ytw246ubg" path="res://Scripts/Components/Actors/EnemyPossessionMovement.cs" id="3_kuwnw"] [ext_resource type="Script" uid="uid://dq338w2lw5phl" path="res://Scripts/Components/Actors/KeyboardInputProvider.cs" id="4_m663r"] [ext_resource type="Script" uid="uid://daoxbq4sxy0br" path="res://Scripts/Components/Actors/TurretAnimationModule.cs" id="5_g7c56"] @@ -19,51 +19,42 @@ [ext_resource type="Script" uid="uid://b0qcrs74bdqhf" path="res://Scripts/Components/Actors/EnemyTurretRotationMovement.cs" id="15_g7c56"] [ext_resource type="Script" uid="uid://7g3luecewcp5" path="res://Scripts/Components/Actors/ActorDefeatScriptHandler.cs" id="15_n6k45"] -[sub_resource type="AtlasTexture" id="AtlasTexture_x4kwn"] -atlas = ExtResource("2_g7c56") -region = Rect2(0, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_kuwnw"] -atlas = ExtResource("2_g7c56") -region = Rect2(16, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_m663r"] -atlas = ExtResource("2_g7c56") -region = Rect2(32, 0, 16, 16) - [sub_resource type="AtlasTexture" id="AtlasTexture_84800"] -atlas = ExtResource("2_g7c56") -region = Rect2(48, 0, 16, 16) - -[sub_resource type="AtlasTexture" id="AtlasTexture_5eesc"] -atlas = ExtResource("2_g7c56") +atlas = ExtResource("2_m663r") region = Rect2(64, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_hjdpo"] -atlas = ExtResource("2_g7c56") +[sub_resource type="AtlasTexture" id="AtlasTexture_5eesc"] +atlas = ExtResource("2_m663r") region = Rect2(80, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_ktwe0"] -atlas = ExtResource("2_g7c56") +[sub_resource type="AtlasTexture" id="AtlasTexture_hjdpo"] +atlas = ExtResource("2_m663r") region = Rect2(96, 0, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_pyymf"] -atlas = ExtResource("2_g7c56") +[sub_resource type="AtlasTexture" id="AtlasTexture_ktwe0"] +atlas = ExtResource("2_m663r") region = Rect2(112, 0, 16, 16) +[sub_resource type="AtlasTexture" id="AtlasTexture_pyymf"] +atlas = ExtResource("2_m663r") +region = Rect2(0, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_k6dxy"] +atlas = ExtResource("2_m663r") +region = Rect2(16, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7jc33"] +atlas = ExtResource("2_m663r") +region = Rect2(32, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_04r4v"] +atlas = ExtResource("2_m663r") +region = Rect2(48, 0, 16, 16) + [sub_resource type="SpriteFrames" id="SpriteFrames_k6dxy"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_x4kwn") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_kuwnw") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_m663r") -}, { -"duration": 1.0, "texture": SubResource("AtlasTexture_84800") }, { "duration": 1.0, @@ -77,6 +68,15 @@ animations = [{ }, { "duration": 1.0, "texture": SubResource("AtlasTexture_pyymf") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_k6dxy") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7jc33") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_04r4v") }], "loop": true, "name": &"default", @@ -111,7 +111,7 @@ metadata/_custom_type_script = "uid://dslyrfcej3g2n" [sub_resource type="Resource" id="Resource_hjdpo"] script = ExtResource("12_84800") -Name = "" +Name = null BulletData = SubResource("Resource_5eesc") RateOfFire = 0.4 BulletCapacity = 20 @@ -121,8 +121,8 @@ InfiniteAmmo = true BulletsPerShot = 1 SpreadAngle = 0.0 RandomSpread = 0.0 -ItemKey = "" -AmmoKey = "" +ItemKey = null +AmmoKey = null _rotationOffset = 0.0 metadata/_custom_type_script = "uid://b6fmrnipv88bk" @@ -139,7 +139,7 @@ Health = 12.0 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] sprite_frames = SubResource("SpriteFrames_k6dxy") frame = 2 -frame_progress = 0.534265 +frame_progress = 0.33307 [node name="MovementProvider" type="Node2D" parent="." node_paths=PackedStringArray("DamageReceiver", "EquippedWeapon")] script = ExtResource("3_kuwnw") diff --git a/Sprites/Actors/Cannon3D.png b/Sprites/Actors/Cannon3D.png new file mode 100644 index 00000000..1bceafd5 --- /dev/null +++ b/Sprites/Actors/Cannon3D.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c4337def577a4ee64e935b4ba3fc02a28addef26d0dd70354e1643eba34990e +size 1006 diff --git a/Sprites/Actors/Cannon3D.png.import b/Sprites/Actors/Cannon3D.png.import new file mode 100644 index 00000000..c6098377 --- /dev/null +++ b/Sprites/Actors/Cannon3D.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c2seclmhd5yt3" +path="res://.godot/imported/Cannon3D.png-f53345ad3e4edf49faa54d2937a75608.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Actors/Cannon3D.png" +dest_files=["res://.godot/imported/Cannon3D.png-f53345ad3e4edf49faa54d2937a75608.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