diff --git a/game/area_map/indicators/current_sector_indicator.tscn b/game/area_map/indicators/current_sector_indicator.tscn index fabc696..cd45171 100644 --- a/game/area_map/indicators/current_sector_indicator.tscn +++ b/game/area_map/indicators/current_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=12 format=3 uid="uid://b8qwok6v44la"] [ext_resource type="Script" uid="uid://yf2bef674enx" path="res://game/area_map/indicators/current_sector_indicator.gd" id="1_7irmv"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_l75qw"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_l75qw"] [sub_resource type="AtlasTexture" id="AtlasTexture_uvh02"] atlas = ExtResource("2_l75qw") diff --git a/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn b/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn index 0490ac9..acb845f 100644 --- a/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn +++ b/game/area_map/indicators/passages/minus_26_grad_passage_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://befadmr5b8mij"] [ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_6yx0l"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_ihw22"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_ihw22"] [sub_resource type="AtlasTexture" id="AtlasTexture_dencp"] atlas = ExtResource("2_ihw22") diff --git a/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn b/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn index c4bfef7..ccb5129 100644 --- a/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn +++ b/game/area_map/indicators/passages/minus_45_grad_passage_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://6wh5paopwa6m"] [ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_ejr0u"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_o52wh"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_o52wh"] [sub_resource type="AtlasTexture" id="AtlasTexture_auxhg"] atlas = ExtResource("2_o52wh") diff --git a/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn b/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn index 8803f47..cb09df4 100644 --- a/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn +++ b/game/area_map/indicators/passages/plus_26_grad_passage_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://chtid8advqc7c"] [ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_ke7h2"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_ugcaf"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_ugcaf"] [sub_resource type="AtlasTexture" id="AtlasTexture_o7a4k"] atlas = ExtResource("2_ugcaf") diff --git a/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn b/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn index 9b97106..d02ea15 100644 --- a/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn +++ b/game/area_map/indicators/passages/plus_45_grad_passage_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://dv68sytyj5bd3"] [ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_nk4h4"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_qtofm"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_qtofm"] [sub_resource type="AtlasTexture" id="AtlasTexture_1wcf5"] atlas = ExtResource("2_qtofm") diff --git a/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn b/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn index 6074584..8881ab7 100644 --- a/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn +++ b/game/area_map/indicators/passages/zero_grad_passage_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://d24hqpbq2yqfn"] [ext_resource type="PackedScene" uid="uid://b03vje74ld8ms" path="res://game/area_map/indicators/absctact_passage_indicator.tscn" id="1_q65pt"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_4t74o"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_4t74o"] [sub_resource type="AtlasTexture" id="AtlasTexture_f73ej"] atlas = ExtResource("2_4t74o") diff --git a/game/area_map/indicators/sectors/boss_sector_indicator.tscn b/game/area_map/indicators/sectors/boss_sector_indicator.tscn index 96c8554..cb828a5 100644 --- a/game/area_map/indicators/sectors/boss_sector_indicator.tscn +++ b/game/area_map/indicators/sectors/boss_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://cf5487fdaju3h"] [ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_qx624"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_t7m7p"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_t7m7p"] [sub_resource type="AtlasTexture" id="AtlasTexture_qx624"] atlas = ExtResource("2_t7m7p") diff --git a/game/area_map/indicators/sectors/debris_sector_indicator.tscn b/game/area_map/indicators/sectors/debris_sector_indicator.tscn index 25a41d1..5a2ee04 100644 --- a/game/area_map/indicators/sectors/debris_sector_indicator.tscn +++ b/game/area_map/indicators/sectors/debris_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://dysw7f3fxxdgg"] [ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_1il3o"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_yiddm"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_yiddm"] [sub_resource type="AtlasTexture" id="AtlasTexture_1il3o"] atlas = ExtResource("2_yiddm") diff --git a/game/area_map/indicators/sectors/repair_sector_indicator.tscn b/game/area_map/indicators/sectors/repair_sector_indicator.tscn index c054243..e0fd8aa 100644 --- a/game/area_map/indicators/sectors/repair_sector_indicator.tscn +++ b/game/area_map/indicators/sectors/repair_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://c7d6jylti6bea"] [ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_5phms"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_e1mcs"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_e1mcs"] [sub_resource type="AtlasTexture" id="AtlasTexture_5phms"] atlas = ExtResource("2_e1mcs") diff --git a/game/area_map/indicators/sectors/shop_sector_indicator.tscn b/game/area_map/indicators/sectors/shop_sector_indicator.tscn index e7253bb..5d9e668 100644 --- a/game/area_map/indicators/sectors/shop_sector_indicator.tscn +++ b/game/area_map/indicators/sectors/shop_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://webm7iahkjgh"] [ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_4uu3o"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_j10ah"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_j10ah"] [sub_resource type="AtlasTexture" id="AtlasTexture_4uu3o"] atlas = ExtResource("2_j10ah") diff --git a/game/area_map/indicators/sectors/start_sector_indicator.tscn b/game/area_map/indicators/sectors/start_sector_indicator.tscn index 4442fbc..e28a599 100644 --- a/game/area_map/indicators/sectors/start_sector_indicator.tscn +++ b/game/area_map/indicators/sectors/start_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://g05q5dxwktr8"] [ext_resource type="PackedScene" uid="uid://bofxdki5oelxe" path="res://game/area_map/indicators/abstract_sector_indicator.tscn" id="1_glpdm"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_37krw"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_37krw"] [sub_resource type="AtlasTexture" id="AtlasTexture_glpdm"] atlas = ExtResource("2_37krw") diff --git a/game/area_map/indicators/selected_sector_indicator.tscn b/game/area_map/indicators/selected_sector_indicator.tscn index 468cf84..ac2afbb 100644 --- a/game/area_map/indicators/selected_sector_indicator.tscn +++ b/game/area_map/indicators/selected_sector_indicator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=13 format=3 uid="uid://bwru7i7xetjth"] [ext_resource type="Script" uid="uid://d3eqb5341h7y0" path="res://game/area_map/indicators/selected_sector_indicator.gd" id="1_06a3o"] -[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/map.png" id="2_485wc"] +[ext_resource type="Texture2D" uid="uid://orutjsnhhruf" path="res://images/menu/map.png" id="2_485wc"] [sub_resource type="AtlasTexture" id="AtlasTexture_eud2k"] atlas = ExtResource("2_485wc") diff --git a/game/entities/health_system/heath_bar.tscn b/game/entities/health_system/heath_bar.tscn index 31d7544..b9f21ba 100644 --- a/game/entities/health_system/heath_bar.tscn +++ b/game/entities/health_system/heath_bar.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" uid="uid://be7k64p2kel8b" path="res://game/entities/health_system/heath_bar.gd" id="1_bx561"] [ext_resource type="PackedScene" uid="uid://xbfxsiumbgkp" path="res://game/entities/health_system/health_bar_part.tscn" id="2_wb6me"] -[ext_resource type="Texture2D" uid="uid://do586oblhwuc5" path="res://images/health.png" id="3_fogsl"] +[ext_resource type="Texture2D" uid="uid://do586oblhwuc5" path="res://images/ships/health.png" id="3_fogsl"] [sub_resource type="AtlasTexture" id="AtlasTexture_sgr4k"] atlas = ExtResource("3_fogsl") diff --git a/game/entities/weapons/abstract_projectile.gd b/game/entities/weapons/abstract_projectile.gd index 29c6551..9b288fd 100644 --- a/game/entities/weapons/abstract_projectile.gd +++ b/game/entities/weapons/abstract_projectile.gd @@ -8,11 +8,12 @@ const PLAYER_PROJECTILE_LAYER = 8 const ENEMY_PROJECTILE_LAYER = 16 -@export_range(0, 1000) var speed : int = 0 +@export_range(0, 2000) var speed : int = 0 @export var direction : Vector2 var ship_velocity: Vector2 +var weapon : AbstractWeapon var _velocity: Vector2 diff --git a/game/entities/weapons/abstract_weapon.gd b/game/entities/weapons/abstract_weapon.gd index 9dade92..7d8fe8b 100644 --- a/game/entities/weapons/abstract_weapon.gd +++ b/game/entities/weapons/abstract_weapon.gd @@ -44,6 +44,7 @@ func _create_projectile(ship_velocity: Vector2) -> AbstractProjectile: var projectile : AbstractProjectile = projectile_scene.instantiate() projectile.global_position = global_position projectile.ship_velocity = ship_velocity + projectile.weapon = self if sector_angle > 0: var sector_rad := deg_to_rad(sector_angle) diff --git a/game/entities/weapons/cannon/abstract_cannon_projectile.tscn b/game/entities/weapons/cannon/abstract_cannon_projectile.tscn index 71e60c8..e92494f 100644 --- a/game/entities/weapons/cannon/abstract_cannon_projectile.tscn +++ b/game/entities/weapons/cannon/abstract_cannon_projectile.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://betr5ry5tc75e" path="res://game/entities/weapons/abstract_blast_projectile.tscn" id="1_20qwt"] [ext_resource type="Script" uid="uid://dfdh0o88as054" path="res://game/entities/weapons/cannon/abstract_cannon_projectile.gd" id="2_x3axw"] [ext_resource type="Script" uid="uid://dftb7hg5f06b5" path="res://game/data/damage/explosion_damage.gd" id="3_lb11p"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="4_bb01p"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="4_bb01p"] [ext_resource type="PackedScene" uid="uid://bhxib2ltpkcbf" path="res://game/entities/explosions/explosion_particles.tscn" id="5_ugryq"] [sub_resource type="AtlasTexture" id="AtlasTexture_ugryq"] diff --git a/game/entities/weapons/cannon/enemy_cannon_weapon.tscn b/game/entities/weapons/cannon/enemy_cannon_weapon.tscn index 65585ba..1eadc36 100644 --- a/game/entities/weapons/cannon/enemy_cannon_weapon.tscn +++ b/game/entities/weapons/cannon/enemy_cannon_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://bccaoirwdkp7n" path="res://game/entities/weapons/cannon/abstract_cannon_weapon.tscn" id="1_pc5pg"] [ext_resource type="Script" uid="uid://ctyvmasefboee" path="res://game/entities/weapons/cannon/enemy_cannon_weapon.gd" id="2_1qc5g"] [ext_resource type="PackedScene" uid="uid://c78rvwvr3dg5l" path="res://game/entities/weapons/cannon/enemy_cannon_projectile.tscn" id="2_6eedr"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_tvj1r"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_tvj1r"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_tvj1r"] lifetime_randomness = 0.4 diff --git a/game/entities/weapons/cannon/player_cannon_weapon.tscn b/game/entities/weapons/cannon/player_cannon_weapon.tscn index 5238cc4..eef8016 100644 --- a/game/entities/weapons/cannon/player_cannon_weapon.tscn +++ b/game/entities/weapons/cannon/player_cannon_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://bccaoirwdkp7n" path="res://game/entities/weapons/cannon/abstract_cannon_weapon.tscn" id="1_5v7nv"] [ext_resource type="PackedScene" uid="uid://bswe1h1qw7e4x" path="res://game/entities/weapons/cannon/player_cannon_projectile.tscn" id="2_bgyjp"] [ext_resource type="Script" uid="uid://bvnecmmrk5e47" path="res://game/entities/weapons/cannon/player_cannon_weapon.gd" id="2_kkp2r"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_myt65"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_myt65"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_bgyjp"] lifetime_randomness = 0.4 diff --git a/game/entities/weapons/gatling/abstract_gatling_projectile.tscn b/game/entities/weapons/gatling/abstract_gatling_projectile.tscn index 4a341e0..6ccd5c7 100644 --- a/game/entities/weapons/gatling/abstract_gatling_projectile.tscn +++ b/game/entities/weapons/gatling/abstract_gatling_projectile.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cdv5n4t47hr8i" path="res://game/entities/weapons/abstract_direct_hit_projectile.tscn" id="1_3tgt7"] [ext_resource type="Script" uid="uid://rtsf1n0djorp" path="res://game/entities/weapons/gatling/abstract_gatling_projectile.gd" id="2_hbgoq"] [ext_resource type="Script" uid="uid://bhqvk5cnjg5mv" path="res://game/data/damage/kinetic_damage.gd" id="3_2tbeq"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="4_ndegg"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="4_ndegg"] [sub_resource type="Resource" id="Resource_ndegg"] script = ExtResource("3_2tbeq") diff --git a/game/entities/weapons/gatling/enemy_gatling_weapon.tscn b/game/entities/weapons/gatling/enemy_gatling_weapon.tscn index f7b821f..ce80500 100644 --- a/game/entities/weapons/gatling/enemy_gatling_weapon.tscn +++ b/game/entities/weapons/gatling/enemy_gatling_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://c4mlppn5i55bp" path="res://game/entities/weapons/gatling/abstract_gatling_weapon.tscn" id="1_dil8o"] [ext_resource type="Script" uid="uid://bj6mviyrgggty" path="res://game/entities/weapons/gatling/enemy_gatling_weapon.gd" id="2_v0vlv"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_2opsk"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_2opsk"] [ext_resource type="PackedScene" uid="uid://b5qcmktgysdw6" path="res://game/entities/weapons/gatling/enemy_gatling_projectile.tscn" id="3_nk3h5"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_2opsk"] diff --git a/game/entities/weapons/gatling/player_gatling_weapon.tscn b/game/entities/weapons/gatling/player_gatling_weapon.tscn index 95b1244..45fa1dc 100644 --- a/game/entities/weapons/gatling/player_gatling_weapon.tscn +++ b/game/entities/weapons/gatling/player_gatling_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://c4mlppn5i55bp" path="res://game/entities/weapons/gatling/abstract_gatling_weapon.tscn" id="1_y0rod"] [ext_resource type="Script" uid="uid://622qtvleceha" path="res://game/entities/weapons/gatling/player_gatling_weapon.gd" id="2_5q7qs"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_5q7qs"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_5q7qs"] [ext_resource type="PackedScene" uid="uid://c0dh3x5olsjtd" path="res://game/entities/weapons/gatling/player_gatling_projectile.tscn" id="3_gqtte"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gqtte"] diff --git a/game/entities/weapons/laser/enemy_laser_weapon.tscn b/game/entities/weapons/laser/enemy_laser_weapon.tscn index 9b47c66..df40fd6 100644 --- a/game/entities/weapons/laser/enemy_laser_weapon.tscn +++ b/game/entities/weapons/laser/enemy_laser_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://def1alrel4ioo" path="res://game/entities/weapons/laser/abstract_laser_weapon.tscn" id="1_wwqbk"] [ext_resource type="Script" uid="uid://bckua73myf5v7" path="res://game/entities/weapons/laser/enemy_laser_weapon.gd" id="2_preya"] [ext_resource type="PackedScene" uid="uid://cq8vnjrk70iby" path="res://game/entities/weapons/laser/enemy_laser_projectile.tscn" id="3_yr2si"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_a3m6t"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_a3m6t"] [sub_resource type="AtlasTexture" id="AtlasTexture_dggsl"] atlas = ExtResource("4_a3m6t") diff --git a/game/entities/weapons/laser/player_laser_weapon.tscn b/game/entities/weapons/laser/player_laser_weapon.tscn index 77d1227..5698256 100644 --- a/game/entities/weapons/laser/player_laser_weapon.tscn +++ b/game/entities/weapons/laser/player_laser_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://def1alrel4ioo" path="res://game/entities/weapons/laser/abstract_laser_weapon.tscn" id="1_nky8c"] [ext_resource type="Script" uid="uid://824ta0lbinkb" path="res://game/entities/weapons/laser/player_laser_weapon.gd" id="2_oqbns"] [ext_resource type="PackedScene" uid="uid://cyskk1kc88lgf" path="res://game/entities/weapons/laser/player_laser_projectile.tscn" id="3_62i0g"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_oaprh"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_oaprh"] [sub_resource type="AtlasTexture" id="AtlasTexture_5c4fv"] atlas = ExtResource("4_oaprh") diff --git a/game/entities/weapons/launcher/abstract_launcher_projectile.tscn b/game/entities/weapons/launcher/abstract_launcher_projectile.tscn index b55941b..364b2e3 100644 --- a/game/entities/weapons/launcher/abstract_launcher_projectile.tscn +++ b/game/entities/weapons/launcher/abstract_launcher_projectile.tscn @@ -5,7 +5,7 @@ [ext_resource type="PackedScene" uid="uid://bhxib2ltpkcbf" path="res://game/entities/explosions/explosion_particles.tscn" id="3_iqm85"] [ext_resource type="Texture2D" uid="uid://gh7mwehpqfco" path="res://particle_textures/flame_medium.tres" id="3_kos01"] [ext_resource type="Script" uid="uid://dftb7hg5f06b5" path="res://game/data/damage/explosion_damage.gd" id="3_ycnsk"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="4_kxgpk"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="4_kxgpk"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_kxgpk"] lifetime_randomness = 0.5 diff --git a/game/entities/weapons/launcher/enemy_launcher_weapon.tscn b/game/entities/weapons/launcher/enemy_launcher_weapon.tscn index 2bad170..d6ffdb4 100644 --- a/game/entities/weapons/launcher/enemy_launcher_weapon.tscn +++ b/game/entities/weapons/launcher/enemy_launcher_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://c3l866fdqt7pf" path="res://game/entities/weapons/launcher/abstract_launcher_weapon.tscn" id="1_co8ul"] [ext_resource type="Script" uid="uid://3b4ft0vrkvn1" path="res://game/entities/weapons/launcher/enemy_launcher_weapon.gd" id="2_qdxuw"] [ext_resource type="PackedScene" uid="uid://dpbighfm8o7ij" path="res://game/entities/weapons/launcher/enemy_launcher_projectile.tscn" id="3_qdxuw"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_xtc8h"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_xtc8h"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_xtc8h"] lifetime_randomness = 0.5 diff --git a/game/entities/weapons/launcher/player_launcher_weapon.tscn b/game/entities/weapons/launcher/player_launcher_weapon.tscn index d4d5a63..90cb6c8 100644 --- a/game/entities/weapons/launcher/player_launcher_weapon.tscn +++ b/game/entities/weapons/launcher/player_launcher_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://c3l866fdqt7pf" path="res://game/entities/weapons/launcher/abstract_launcher_weapon.tscn" id="1_d6r67"] [ext_resource type="Script" uid="uid://c3asrkguw01q2" path="res://game/entities/weapons/launcher/player_launcher_weapon.gd" id="2_10o3e"] [ext_resource type="PackedScene" uid="uid://ds0xsi84rp1kb" path="res://game/entities/weapons/launcher/player_launcher_projectile.tscn" id="3_10o3e"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_v6ybh"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_v6ybh"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_v6ybh"] lifetime_randomness = 0.5 diff --git a/game/entities/weapons/minelayer/abstract_minelayer_projectile.tscn b/game/entities/weapons/minelayer/abstract_minelayer_projectile.tscn index c1eaf97..0a47ade 100644 --- a/game/entities/weapons/minelayer/abstract_minelayer_projectile.tscn +++ b/game/entities/weapons/minelayer/abstract_minelayer_projectile.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://betr5ry5tc75e" path="res://game/entities/weapons/abstract_blast_projectile.tscn" id="1_ufc4r"] [ext_resource type="Script" uid="uid://76swcukelnii" path="res://game/entities/weapons/minelayer/abstract_minelayer_projectile.gd" id="2_hwwfa"] [ext_resource type="Script" uid="uid://dftb7hg5f06b5" path="res://game/data/damage/explosion_damage.gd" id="3_hll7s"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="4_px1i2"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="4_px1i2"] [ext_resource type="PackedScene" uid="uid://bhxib2ltpkcbf" path="res://game/entities/explosions/explosion_particles.tscn" id="5_ckqco"] [sub_resource type="AtlasTexture" id="AtlasTexture_ckqco"] diff --git a/game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn b/game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn index c64386b..d144ced 100644 --- a/game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn +++ b/game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_12l3k"] [ext_resource type="Script" uid="uid://c3ckkpjaef5jn" path="res://game/entities/weapons/minelayer/abstract_minelayer_weapon.gd" id="2_mmhtn"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="6_ais8e"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="6_ais8e"] [sub_resource type="AtlasTexture" id="AtlasTexture_ais8e"] atlas = ExtResource("6_ais8e") diff --git a/game/entities/weapons/minelayer/enemy_minelayer_weapon.tscn b/game/entities/weapons/minelayer/enemy_minelayer_weapon.tscn index 709cef8..069a650 100644 --- a/game/entities/weapons/minelayer/enemy_minelayer_weapon.tscn +++ b/game/entities/weapons/minelayer/enemy_minelayer_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://j3yht6q4ru4e" path="res://game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn" id="1_8qj2c"] [ext_resource type="Script" uid="uid://dmnqjbog6df2x" path="res://game/entities/weapons/minelayer/enemy_minelayer_weapon.gd" id="2_n3m0w"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_jx7o2"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_jx7o2"] [ext_resource type="PackedScene" uid="uid://bs3wo34es7q10" path="res://game/entities/weapons/minelayer/enemy_minelayer_projectile.tscn" id="3_nkog1"] [sub_resource type="AtlasTexture" id="AtlasTexture_ais8e"] diff --git a/game/entities/weapons/minelayer/player_minelayer_weapon.tscn b/game/entities/weapons/minelayer/player_minelayer_weapon.tscn index 2ab4725..2792c29 100644 --- a/game/entities/weapons/minelayer/player_minelayer_weapon.tscn +++ b/game/entities/weapons/minelayer/player_minelayer_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://j3yht6q4ru4e" path="res://game/entities/weapons/minelayer/abstract_minelayer_weapon.tscn" id="1_j3u5v"] [ext_resource type="Script" uid="uid://c5txlsof4wtk2" path="res://game/entities/weapons/minelayer/player_minelayer_weapon.gd" id="2_mvhh7"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_mvhh7"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_mvhh7"] [ext_resource type="PackedScene" uid="uid://dnculk5rcfxly" path="res://game/entities/weapons/minelayer/player_minelayer_projectile.tscn" id="3_u0als"] [sub_resource type="AtlasTexture" id="AtlasTexture_6718t"] diff --git a/game/entities/weapons/plasma/enemy_plasma_weapon.tscn b/game/entities/weapons/plasma/enemy_plasma_weapon.tscn index 08a98de..94c5508 100644 --- a/game/entities/weapons/plasma/enemy_plasma_weapon.tscn +++ b/game/entities/weapons/plasma/enemy_plasma_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cj1jclfterepm" path="res://game/entities/weapons/plasma/abstract_plasma_weapon.tscn" id="1_cuvu2"] [ext_resource type="Script" uid="uid://dliivclhsvxq8" path="res://game/entities/weapons/plasma/enemy_plasma_weapon.gd" id="2_82g15"] [ext_resource type="PackedScene" uid="uid://yr3sadet3ds1" path="res://game/entities/weapons/plasma/enemy_plasma_projectile.tscn" id="3_82g15"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_437d6"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_437d6"] [sub_resource type="AtlasTexture" id="AtlasTexture_vj3ee"] atlas = ExtResource("3_437d6") diff --git a/game/entities/weapons/plasma/player_plasma_weapon.tscn b/game/entities/weapons/plasma/player_plasma_weapon.tscn index 81b7cce..e1cb33c 100644 --- a/game/entities/weapons/plasma/player_plasma_weapon.tscn +++ b/game/entities/weapons/plasma/player_plasma_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cj1jclfterepm" path="res://game/entities/weapons/plasma/abstract_plasma_weapon.tscn" id="1_ee068"] [ext_resource type="Script" uid="uid://btp6bb7dvtxl6" path="res://game/entities/weapons/plasma/player_plasma_weapon.gd" id="2_hxkfe"] [ext_resource type="PackedScene" uid="uid://cnjka7edh3tlt" path="res://game/entities/weapons/plasma/player_plasma_projectile.tscn" id="3_hxkfe"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="3_l4q6k"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="3_l4q6k"] [sub_resource type="AtlasTexture" id="AtlasTexture_x71d5"] atlas = ExtResource("3_l4q6k") diff --git a/game/entities/weapons/railgun/enemy_railgun_projectile.tscn b/game/entities/weapons/railgun/enemy_railgun_projectile.tscn index 22c5893..a283ae1 100644 --- a/game/entities/weapons/railgun/enemy_railgun_projectile.tscn +++ b/game/entities/weapons/railgun/enemy_railgun_projectile.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bab3bopsw74cb" path="res://game/entities/weapons/railgun/abstract_railgun_projectile.tscn" id="1_gmlv2"] [ext_resource type="Script" uid="uid://c8m661bctu67t" path="res://game/entities/weapons/railgun/enemy_railgun_projectile.gd" id="2_m4kh0"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="3_p7y7c"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="3_p7y7c"] [sub_resource type="AtlasTexture" id="AtlasTexture_u82jm"] atlas = ExtResource("3_p7y7c") diff --git a/game/entities/weapons/railgun/enemy_railgun_weapon.tscn b/game/entities/weapons/railgun/enemy_railgun_weapon.tscn index 0de668a..cf6b0bf 100644 --- a/game/entities/weapons/railgun/enemy_railgun_weapon.tscn +++ b/game/entities/weapons/railgun/enemy_railgun_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://do6h77gmnreho" path="res://game/entities/weapons/railgun/abstract_railgun_weapon.tscn" id="1_rp2u5"] [ext_resource type="Script" uid="uid://b0eg0ye5mx8ao" path="res://game/entities/weapons/railgun/enemy_railgun_weapon.gd" id="2_0wswa"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="2_nfcq7"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="2_nfcq7"] [ext_resource type="PackedScene" uid="uid://cxcitgofg7nwm" path="res://game/entities/weapons/railgun/enemy_railgun_projectile.tscn" id="3_0wswa"] [sub_resource type="AtlasTexture" id="AtlasTexture_qxcog"] diff --git a/game/entities/weapons/railgun/player_railgun_projectile.tscn b/game/entities/weapons/railgun/player_railgun_projectile.tscn index 94b3ead..86777a9 100644 --- a/game/entities/weapons/railgun/player_railgun_projectile.tscn +++ b/game/entities/weapons/railgun/player_railgun_projectile.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://bab3bopsw74cb" path="res://game/entities/weapons/railgun/abstract_railgun_projectile.tscn" id="1_xytr4"] [ext_resource type="Script" uid="uid://51vaxrloo65r" path="res://game/entities/weapons/railgun/player_railgun_projectile.gd" id="2_sy2xa"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="3_xm7by"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="3_xm7by"] [sub_resource type="AtlasTexture" id="AtlasTexture_whmfh"] atlas = ExtResource("3_xm7by") diff --git a/game/entities/weapons/railgun/player_railgun_weapon.tscn b/game/entities/weapons/railgun/player_railgun_weapon.tscn index 4fa0893..9ea0ffb 100644 --- a/game/entities/weapons/railgun/player_railgun_weapon.tscn +++ b/game/entities/weapons/railgun/player_railgun_weapon.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://do6h77gmnreho" path="res://game/entities/weapons/railgun/abstract_railgun_weapon.tscn" id="1_1bsls"] [ext_resource type="Script" uid="uid://dixftp6f0w8ss" path="res://game/entities/weapons/railgun/player_railgun_weapon.gd" id="2_cw8e6"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="2_yykqk"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="2_yykqk"] [ext_resource type="PackedScene" uid="uid://cgq4yobd2bq5l" path="res://game/entities/weapons/railgun/player_railgun_projectile.tscn" id="3_cw8e6"] [sub_resource type="AtlasTexture" id="AtlasTexture_12cl3"] diff --git a/game/entities/weapons/shrapnel/abstract_shrapnel_projectile.tscn b/game/entities/weapons/shrapnel/abstract_shrapnel_projectile.tscn index c0a19b2..0a4c4cb 100644 --- a/game/entities/weapons/shrapnel/abstract_shrapnel_projectile.tscn +++ b/game/entities/weapons/shrapnel/abstract_shrapnel_projectile.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cdv5n4t47hr8i" path="res://game/entities/weapons/abstract_direct_hit_projectile.tscn" id="1_yu2c6"] [ext_resource type="Script" uid="uid://ctnje7pjanaws" path="res://game/entities/weapons/shrapnel/abstract_shrapnel_projectile.gd" id="2_2jiy6"] [ext_resource type="Script" uid="uid://bhqvk5cnjg5mv" path="res://game/data/damage/kinetic_damage.gd" id="3_kj16s"] -[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles.png" id="4_klguu"] +[ext_resource type="Texture2D" uid="uid://oj86smpsipw4" path="res://images/projectiles/projectiles.png" id="4_klguu"] [sub_resource type="Resource" id="Resource_klguu"] script = ExtResource("3_kj16s") diff --git a/game/entities/weapons/shrapnel/enemy_shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/enemy_shrapnel_weapon.tscn index 50b72e3..5875f0b 100644 --- a/game/entities/weapons/shrapnel/enemy_shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/enemy_shrapnel_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://r7wnk762jbfy" path="res://game/entities/weapons/shrapnel/abstract_shrapnel_weapon.tscn" id="1_1p630"] [ext_resource type="Script" uid="uid://d30syotjwdwlu" path="res://game/entities/weapons/shrapnel/enemy_shrapnel_weapon.gd" id="2_ttncl"] [ext_resource type="PackedScene" uid="uid://bmusx2hpk7m76" path="res://game/entities/weapons/shrapnel/enemy_shrapnel_projectile.tscn" id="3_p5apf"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_ctn2a"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_ctn2a"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ctn2a"] resource_local_to_scene = true diff --git a/game/entities/weapons/shrapnel/player_shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/player_shrapnel_weapon.tscn index ab6743f..b56e6a9 100644 --- a/game/entities/weapons/shrapnel/player_shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/player_shrapnel_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://r7wnk762jbfy" path="res://game/entities/weapons/shrapnel/abstract_shrapnel_weapon.tscn" id="1_fhgjq"] [ext_resource type="Script" uid="uid://b4nr6mwn11xx6" path="res://game/entities/weapons/shrapnel/player_shrapnel_weapon.gd" id="2_kcdeu"] [ext_resource type="PackedScene" uid="uid://cswhydwmia3fh" path="res://game/entities/weapons/shrapnel/player_shrapnel_projectile.tscn" id="3_kcdeu"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_kupqk"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_kupqk"] [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_kcdeu"] resource_local_to_scene = true diff --git a/game/entities/weapons/tesla/abstract_tesla_projectile.gd b/game/entities/weapons/tesla/abstract_tesla_projectile.gd index e690232..cb672de 100644 --- a/game/entities/weapons/tesla/abstract_tesla_projectile.gd +++ b/game/entities/weapons/tesla/abstract_tesla_projectile.gd @@ -2,11 +2,6 @@ class_name AbstractTeslaProjectile extends AbstractDirectHitProjectile -const SPIKE_WIDTH = 1 -const SPIKE_MIN_LENGTH = 10.0 -const SPIKE_MAX_LENGTH = 50.0 - - @export_range(0.01, 0.5) var jink_min_delay: float = 0.01 @export_range(0.01, 0.5) var jink_max_delay: float = 0.01 @export_range(0, 360) var deviation_angle: int = 0 @@ -15,22 +10,24 @@ const SPIKE_MAX_LENGTH = 50.0 var _collided_foes : Array[AbstractShip] = [] -var _is_dead := false -var _is_expanding := true -var _removed_point_count := 0 -var _spikes_by_point_count : Dictionary[int, Array] = {} +@onready var jink_timer : Timer = $JinkTimer +@onready var life_timer : Timer = $LifeTimer - -@onready var jinkTimer : Timer = $JinkTimer -@onready var lifeTimer : Timer = $LifeTimer - -@onready var line : Line2D = $Line2D +@onready var line_thin : Line2D = $LineThin +@onready var line_thick : Line2D = $LineThick func _ready() -> void: super._ready() _start_jink_timer() + + _prepare_line(line_thin) + _prepare_line(line_thick) + line_thin.hide() + + +func _prepare_line(line: Line2D) -> void: line.reparent(get_tree().current_scene) line.global_position = Vector2.ZERO line.add_point(position) @@ -38,21 +35,8 @@ func _ready() -> void: func _physics_process(delta: float) -> void: super._physics_process(delta) - - if _is_dead: - line.remove_point(0) - _removed_point_count += 1 - - if _removed_point_count in _spikes_by_point_count: - var lines := _spikes_by_point_count[_removed_point_count] - for l : Line2D in lines: - l.queue_free() - - if line.get_point_count() == 0: - delete() - - if _is_expanding: - line.add_point(position) + line_thin.add_point(position) + line_thick.add_point(position) func _process_hit_for_projectile(collided_body: Node2D) -> void: @@ -60,19 +44,22 @@ func _process_hit_for_projectile(collided_body: Node2D) -> void: _collided_foes.append(collided_body) damage.value = floor(damage.value/2.0) + if damage.value == 0: + _start_fading() _velocity = _apply_random_deviation(_velocity) _start_jink_timer() func delete() -> void: - line.queue_free() + line_thin.queue_free() + line_thick.queue_free() super.delete() func _start_jink_timer() -> void: var random_delay := randf_range(jink_min_delay, jink_max_delay) - jinkTimer.start(random_delay) + jink_timer.start(random_delay) func _on_jink_timer_timeout() -> void: @@ -84,33 +71,9 @@ func _on_jink_timer_timeout() -> void: else: _velocity = _apply_random_deviation(_velocity) - _create_spike() - _start_jink_timer() -func _create_spike() -> void: - if _is_dead: return - - var point_count := line.get_point_count() - if not point_count in _spikes_by_point_count: - _spikes_by_point_count[point_count] = [] - - var spike_direction := _apply_random_deviation(_velocity).normalized() - var spike_length := randf_range(SPIKE_MIN_LENGTH, SPIKE_MAX_LENGTH) - var second_point := position + spike_direction * spike_length - - var spike : Line2D = line.duplicate() - get_parent().add_child(spike) - spike.clear_points() - spike.add_point(position) - spike.add_point(second_point) - spike.width = SPIKE_WIDTH - spike.width_curve = null - - _spikes_by_point_count[point_count].append(spike) - - func _target_foe(foe: AbstractShip) -> void: var current_speed := _velocity.length() var foe_direction := position.direction_to(foe.position) @@ -119,13 +82,19 @@ func _target_foe(foe: AbstractShip) -> void: func _apply_random_deviation(vector: Vector2) -> Vector2: var deviation_rad := deg_to_rad(deviation_angle) - var random_angle := randfn(0.0, deviation_rad / 6.0) + var random_angle := randfn(0.0, deviation_rad) return vector.rotated(random_angle) +func _start_fading() -> void: + line_thick.hide() + line_thin.show() + life_timer.start() + + func _on_life_timer_timeout() -> void: - _is_dead = true + delete() func _on_out_of_screen_timer_timeout() -> void: - _is_expanding = false + _start_fading() diff --git a/game/entities/weapons/tesla/abstract_tesla_projectile.tscn b/game/entities/weapons/tesla/abstract_tesla_projectile.tscn index ebb1c6b..8c2442f 100644 --- a/game/entities/weapons/tesla/abstract_tesla_projectile.tscn +++ b/game/entities/weapons/tesla/abstract_tesla_projectile.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=7 format=3 uid="uid://bi64687wtxi4d"] +[gd_scene load_steps=8 format=3 uid="uid://bi64687wtxi4d"] [ext_resource type="PackedScene" uid="uid://cdv5n4t47hr8i" path="res://game/entities/weapons/abstract_direct_hit_projectile.tscn" id="1_1oexk"] [ext_resource type="Script" uid="uid://bxcoa2eps0tt1" path="res://game/entities/weapons/tesla/abstract_tesla_projectile.gd" id="2_q73is"] [ext_resource type="Script" uid="uid://c27v705giygv4" path="res://game/data/damage/energy_damage.gd" id="3_l65ib"] +[ext_resource type="Texture2D" uid="uid://ym37tueldx8w" path="res://images/projectiles/lightning_thick.png" id="4_63xdp"] +[ext_resource type="Texture2D" uid="uid://bw2k655gwkbec" path="res://images/projectiles/lightning_thin.png" id="5_5s0k0"] [sub_resource type="Resource" id="Resource_1121u"] resource_local_to_scene = true @@ -13,20 +15,16 @@ metadata/_custom_type_script = "uid://c27v705giygv4" [sub_resource type="CircleShape2D" id="CircleShape2D_l65ib"] radius = 5.0 -[sub_resource type="Curve" id="Curve_ptgbh"] -_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.10909091, 0.31467384), 0.0, 0.0, 0, 0, Vector2(0.2090909, 0.88342386), 0.0, 0.0, 0, 0, Vector2(0.3181818, 0.29701078), 0.0, 0.0, 0, 0, Vector2(0.4113636, 0.92934775), 0.0, 0.0, 0, 0, Vector2(0.53636366, 0.28943247), 0.0, 0.0, 0, 0, Vector2(0.7113636, 0.9399456), 0.0, 0.0, 0, 0, Vector2(0.8090909, 0.2792815), 0.0, 0.0, 0, 0, Vector2(0.9090909, 0.9399456), 0.0, 0.0, 0, 0, Vector2(1, 0.21837574), 0.0, 0.0, 0, 0] -point_count = 10 - [node name="AbstractTeslaProjectile" instance=ExtResource("1_1oexk")] collision_layer = 0 collision_mask = 0 script = ExtResource("2_q73is") jink_min_delay = 0.02 jink_max_delay = 0.05 -deviation_angle = 90 +deviation_angle = 30 no_deviation_distance = 50 damage = SubResource("Resource_1121u") -speed = 900 +speed = 1800 [node name="CollisionShape2D" parent="." index="0"] shape = SubResource("CircleShape2D_l65ib") @@ -34,16 +32,20 @@ shape = SubResource("CircleShape2D_l65ib") [node name="JinkTimer" type="Timer" parent="." index="2"] one_shot = true -[node name="Line2D" type="Line2D" parent="." index="4"] -z_index = 10 -width = 3.0 -width_curve = SubResource("Curve_ptgbh") -default_color = Color(0.25490198, 0.6509804, 0.9647059, 1) -joint_mode = 1 +[node name="LifeTimer" type="Timer" parent="." index="3"] +wait_time = 0.1 -[node name="LifeTimer" type="Timer" parent="." index="5"] -wait_time = 0.5 -autostart = true +[node name="LineThick" type="Line2D" parent="." index="5"] +z_index = 10 +width = 32.0 +texture = ExtResource("4_63xdp") +texture_mode = 1 + +[node name="LineThin" type="Line2D" parent="." index="6"] +z_index = 10 +width = 32.0 +texture = ExtResource("5_5s0k0") +texture_mode = 1 [connection signal="timeout" from="JinkTimer" to="." method="_on_jink_timer_timeout"] [connection signal="timeout" from="LifeTimer" to="." method="_on_life_timer_timeout"] diff --git a/game/entities/weapons/tesla/abstract_tesla_weapon.tscn b/game/entities/weapons/tesla/abstract_tesla_weapon.tscn index 6bd2b3e..33dceed 100644 --- a/game/entities/weapons/tesla/abstract_tesla_weapon.tscn +++ b/game/entities/weapons/tesla/abstract_tesla_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_rpud7"] [ext_resource type="Script" uid="uid://ctv408wdwvttc" path="res://game/entities/weapons/tesla/abstract_tesla_weapon.gd" id="2_08si3"] [ext_resource type="Texture2D" uid="uid://dk3t14mrgjmma" path="res://particle_textures/energy_medium.tres" id="4_2dxgo"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="7_ub67s"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="7_ub67s"] [sub_resource type="AtlasTexture" id="AtlasTexture_ucdpq"] atlas = ExtResource("7_ub67s") diff --git a/game/entities/weapons/tesla/enemy_tesla_weapon.tscn b/game/entities/weapons/tesla/enemy_tesla_weapon.tscn index 7d56804..92f923f 100644 --- a/game/entities/weapons/tesla/enemy_tesla_weapon.tscn +++ b/game/entities/weapons/tesla/enemy_tesla_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://dyebeblayioji" path="res://game/entities/weapons/tesla/abstract_tesla_weapon.tscn" id="1_k6lmk"] [ext_resource type="Script" uid="uid://ermhuy56qrok" path="res://game/entities/weapons/tesla/enemy_tesla_weapon.gd" id="2_cxr41"] [ext_resource type="PackedScene" uid="uid://cpqpc1h3egvid" path="res://game/entities/weapons/tesla/enemy_tesla_projectile.tscn" id="3_i0gkc"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_b2pb7"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_b2pb7"] [sub_resource type="AtlasTexture" id="AtlasTexture_ucdpq"] atlas = ExtResource("4_b2pb7") diff --git a/game/entities/weapons/tesla/player_tesla_weapon.tscn b/game/entities/weapons/tesla/player_tesla_weapon.tscn index d25fa1f..f0df86e 100644 --- a/game/entities/weapons/tesla/player_tesla_weapon.tscn +++ b/game/entities/weapons/tesla/player_tesla_weapon.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://dyebeblayioji" path="res://game/entities/weapons/tesla/abstract_tesla_weapon.tscn" id="1_0i0tl"] [ext_resource type="Script" uid="uid://d2qtsjtu56c21" path="res://game/entities/weapons/tesla/player_tesla_weapon.gd" id="2_ve1yj"] [ext_resource type="PackedScene" uid="uid://bvrsk14t6m061" path="res://game/entities/weapons/tesla/player_tesla_projectile.tscn" id="3_io2od"] -[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="4_mjxwr"] +[ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/ships/weapons.png" id="4_mjxwr"] [sub_resource type="AtlasTexture" id="AtlasTexture_7ksu7"] atlas = ExtResource("4_mjxwr") diff --git a/game/entities/world/passage.tscn b/game/entities/world/passage.tscn index 6a334e9..3f9d7f5 100644 --- a/game/entities/world/passage.tscn +++ b/game/entities/world/passage.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://cpn5x0ijgl7ei" path="res://game/controllers/enemy_swamp_controller.tscn" id="2_72vqi"] [ext_resource type="PackedScene" uid="uid://br074cqcnul3d" path="res://game/entities/ships/player/player_ship.tscn" id="3_r3x05"] [ext_resource type="PackedScene" uid="uid://chdrjc7c6bdpb" path="res://game/entities/world/background.tscn" id="4_cuj01"] -[ext_resource type="Texture2D" uid="uid://d1n7qejdcrpkf" path="res://images/passage_process.png" id="5_yetnv"] +[ext_resource type="Texture2D" uid="uid://d1n7qejdcrpkf" path="res://images/projectiles/passage_process.png" id="5_yetnv"] [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_ltkyg"] diff --git a/game/menu/common/credits.tscn b/game/menu/common/credits.tscn index 90410ca..faf09ed 100644 --- a/game/menu/common/credits.tscn +++ b/game/menu/common/credits.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=6 format=3 uid="uid://c3q3g2647qc27"] [ext_resource type="Script" uid="uid://dclkpithyykju" path="res://game/menu/common/credits.gd" id="1_wp78b"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_nidem"] -[ext_resource type="Theme" uid="uid://cigren10ijb75" path="res://images/label.tres" id="3_x2hwc"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_nidem"] +[ext_resource type="Theme" uid="uid://cigren10ijb75" path="res://images/menu/label.tres" id="3_x2hwc"] [sub_resource type="InputEventAction" id="InputEventAction_wp78b"] action = &"ui_cancel" diff --git a/game/menu/common/options.tscn b/game/menu/common/options.tscn index 04bbed0..e0c83fa 100644 --- a/game/menu/common/options.tscn +++ b/game/menu/common/options.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://btr60idiit4y7"] [ext_resource type="Script" uid="uid://ceng1u112aqg0" path="res://game/menu/common/options.gd" id="1_61pji"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_1tdpy"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_1tdpy"] [sub_resource type="InputEventAction" id="InputEventAction_61pji"] action = &"ui_cancel" diff --git a/game/menu/ingame/game_over_screen.tscn b/game/menu/ingame/game_over_screen.tscn index b554288..4d0ce0f 100644 --- a/game/menu/ingame/game_over_screen.tscn +++ b/game/menu/ingame/game_over_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://duxm8n62j2qt6"] [ext_resource type="Script" uid="uid://bkj8s7588e1ho" path="res://game/menu/ingame/game_over_screen.gd" id="1_rkkr6"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_uh3ar"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_uh3ar"] [node name="GameOverScreen" type="Control"] layout_mode = 3 diff --git a/game/menu/ingame/pause_menu.tscn b/game/menu/ingame/pause_menu.tscn index fc5bd0e..6a150a6 100644 --- a/game/menu/ingame/pause_menu.tscn +++ b/game/menu/ingame/pause_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=3 uid="uid://bclo2wl8ibrcg"] [ext_resource type="Script" uid="uid://npqs2m5g5bd6" path="res://game/menu/ingame/pause_menu.gd" id="1_inj1j"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_vy7sn"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_vy7sn"] [sub_resource type="Shortcut" id="Shortcut_lgp46"] diff --git a/game/menu/ingame/victory_screen.tscn b/game/menu/ingame/victory_screen.tscn index 4fa6043..001cbb5 100644 --- a/game/menu/ingame/victory_screen.tscn +++ b/game/menu/ingame/victory_screen.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bdcs2ff85qjs4"] [ext_resource type="Script" uid="uid://b0p1ewlw18ijg" path="res://game/menu/ingame/victory_screen.gd" id="1_asigk"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_wb4d8"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_wb4d8"] [node name="VictoryScreen" type="Control"] layout_mode = 3 diff --git a/game/menu/ingame/weapon_selector.tscn b/game/menu/ingame/weapon_selector.tscn index 3726f43..4b74aba 100644 --- a/game/menu/ingame/weapon_selector.tscn +++ b/game/menu/ingame/weapon_selector.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://1o3idp54lil2"] [ext_resource type="Script" uid="uid://beiydi6w6gqqc" path="res://game/menu/ingame/weapon_selector.gd" id="1_4acia"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_g83h6"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_g83h6"] [node name="WeaponSelector" type="MarginContainer"] anchors_preset = 15 diff --git a/game/menu/main/main_menu.tscn b/game/menu/main/main_menu.tscn index 12780a0..68a2a76 100644 --- a/game/menu/main/main_menu.tscn +++ b/game/menu/main/main_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bxlccevt52y70"] [ext_resource type="Script" uid="uid://dixdfabe2vfsj" path="res://game/menu/main/main_menu.gd" id="1_chmv6"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_f5okj"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_f5okj"] [node name="MainMenu" type="Control"] layout_mode = 3 diff --git a/game/menu/main/seed_selection_menu.tscn b/game/menu/main/seed_selection_menu.tscn index 1f99340..c03f2f0 100644 --- a/game/menu/main/seed_selection_menu.tscn +++ b/game/menu/main/seed_selection_menu.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://c36n317rhv8k7"] [ext_resource type="Script" uid="uid://dyynshvsgnepp" path="res://game/menu/main/seed_selection_menu.gd" id="1_g2smo"] -[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu_button.tres" id="2_s4s14"] +[ext_resource type="Theme" uid="uid://dtnd3tqllufey" path="res://images/menu/menu_button.tres" id="2_s4s14"] [sub_resource type="InputEventAction" id="InputEventAction_g2smo"] action = &"ui_cancel" diff --git a/images/label.tres b/images/menu/label.tres similarity index 80% rename from images/label.tres rename to images/menu/label.tres index 6836b1e..e8b2263 100644 --- a/images/label.tres +++ b/images/menu/label.tres @@ -1,6 +1,6 @@ [gd_resource type="Theme" load_steps=2 format=3 uid="uid://cigren10ijb75"] -[ext_resource type="FontFile" uid="uid://b3xawfjtsnm5b" path="res://images/main_font.png" id="1_h3mgl"] +[ext_resource type="FontFile" uid="uid://b3xawfjtsnm5b" path="res://images/menu/main_font.png" id="1_h3mgl"] [resource] default_font = ExtResource("1_h3mgl") diff --git a/images/main_font.png b/images/menu/main_font.png similarity index 100% rename from images/main_font.png rename to images/menu/main_font.png diff --git a/images/main_font.png.import b/images/menu/main_font.png.import similarity index 59% rename from images/main_font.png.import rename to images/menu/main_font.png.import index 670d9fe..266053c 100644 --- a/images/main_font.png.import +++ b/images/menu/main_font.png.import @@ -3,12 +3,12 @@ importer="font_data_image" type="FontFile" uid="uid://b3xawfjtsnm5b" -path="res://.godot/imported/main_font.png-43554ca2c4afb77b19a07c443766a2bf.fontdata" +path="res://.godot/imported/main_font.png-02d3bd1470dfa1b293e4d94784048edd.fontdata" [deps] -source_file="res://images/main_font.png" -dest_files=["res://.godot/imported/main_font.png-43554ca2c4afb77b19a07c443766a2bf.fontdata"] +source_file="res://images/menu/main_font.png" +dest_files=["res://.godot/imported/main_font.png-02d3bd1470dfa1b293e4d94784048edd.fontdata"] [params] diff --git a/images/map.png b/images/menu/map.png similarity index 100% rename from images/map.png rename to images/menu/map.png diff --git a/images/map.png.import b/images/menu/map.png.import similarity index 78% rename from images/map.png.import rename to images/menu/map.png.import index e8a8765..833df35 100644 --- a/images/map.png.import +++ b/images/menu/map.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://orutjsnhhruf" -path="res://.godot/imported/map.png-e82b9b01d47f4594f29b046de64de6f9.ctex" +path="res://.godot/imported/map.png-1047ada7de3f1f59fe22a822d46f2643.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/map.png" -dest_files=["res://.godot/imported/map.png-e82b9b01d47f4594f29b046de64de6f9.ctex"] +source_file="res://images/menu/map.png" +dest_files=["res://.godot/imported/map.png-1047ada7de3f1f59fe22a822d46f2643.ctex"] [params] diff --git a/images/menu_button.tres b/images/menu/menu_button.tres similarity index 97% rename from images/menu_button.tres rename to images/menu/menu_button.tres index 5ed3d6e..4cfc9f5 100644 --- a/images/menu_button.tres +++ b/images/menu/menu_button.tres @@ -1,7 +1,7 @@ [gd_resource type="Theme" load_steps=8 format=3 uid="uid://dtnd3tqllufey"] -[ext_resource type="Texture2D" uid="uid://dhmquapac0fco" path="res://images/menu_buttons.png" id="1_6mwof"] -[ext_resource type="FontFile" uid="uid://bw1vqxkgbaekh" path="res://images/menu_font.png" id="1_hwy2u"] +[ext_resource type="Texture2D" uid="uid://dhmquapac0fco" path="res://images/menu/menu_buttons.png" id="1_6mwof"] +[ext_resource type="FontFile" uid="uid://bw1vqxkgbaekh" path="res://images/menu/menu_font.png" id="1_hwy2u"] [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_6mwof"] content_margin_left = 10.0 diff --git a/images/menu_buttons.png b/images/menu/menu_buttons.png similarity index 100% rename from images/menu_buttons.png rename to images/menu/menu_buttons.png diff --git a/images/menu_buttons.png.import b/images/menu/menu_buttons.png.import similarity index 76% rename from images/menu_buttons.png.import rename to images/menu/menu_buttons.png.import index c9b6bec..043766b 100644 --- a/images/menu_buttons.png.import +++ b/images/menu/menu_buttons.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dhmquapac0fco" -path="res://.godot/imported/menu_buttons.png-d049f93a42f953259947caad99603724.ctex" +path="res://.godot/imported/menu_buttons.png-57be3916c3bbcc2912e1eb0a800254c2.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/menu_buttons.png" -dest_files=["res://.godot/imported/menu_buttons.png-d049f93a42f953259947caad99603724.ctex"] +source_file="res://images/menu/menu_buttons.png" +dest_files=["res://.godot/imported/menu_buttons.png-57be3916c3bbcc2912e1eb0a800254c2.ctex"] [params] diff --git a/images/menu_font.png b/images/menu/menu_font.png similarity index 100% rename from images/menu_font.png rename to images/menu/menu_font.png diff --git a/images/menu_font.png.import b/images/menu/menu_font.png.import similarity index 59% rename from images/menu_font.png.import rename to images/menu/menu_font.png.import index 412734c..c402235 100644 --- a/images/menu_font.png.import +++ b/images/menu/menu_font.png.import @@ -3,12 +3,12 @@ importer="font_data_image" type="FontFile" uid="uid://bw1vqxkgbaekh" -path="res://.godot/imported/menu_font.png-62b7b3d0ab3b90fe7d188ac03ff2af04.fontdata" +path="res://.godot/imported/menu_font.png-8e9d8dba3a97b30f71beb18676246365.fontdata" [deps] -source_file="res://images/menu_font.png" -dest_files=["res://.godot/imported/menu_font.png-62b7b3d0ab3b90fe7d188ac03ff2af04.fontdata"] +source_file="res://images/menu/menu_font.png" +dest_files=["res://.godot/imported/menu_font.png-8e9d8dba3a97b30f71beb18676246365.fontdata"] [params] diff --git a/images/particles.png b/images/particles/particles.png similarity index 100% rename from images/particles.png rename to images/particles/particles.png diff --git a/images/particles.png.import b/images/particles/particles.png.import similarity index 76% rename from images/particles.png.import rename to images/particles/particles.png.import index 2758a88..33581f1 100644 --- a/images/particles.png.import +++ b/images/particles/particles.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://3w0itm7k5fxq" -path="res://.godot/imported/particles.png-86cd4f67c316e2e36289f2646d498449.ctex" +path="res://.godot/imported/particles.png-7300246eb692fcd63cd44c7346ea22c3.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/particles.png" -dest_files=["res://.godot/imported/particles.png-86cd4f67c316e2e36289f2646d498449.ctex"] +source_file="res://images/particles/particles.png" +dest_files=["res://.godot/imported/particles.png-7300246eb692fcd63cd44c7346ea22c3.ctex"] [params] diff --git a/images/projectiles/lightning_thick.png b/images/projectiles/lightning_thick.png new file mode 100644 index 0000000..ae286be --- /dev/null +++ b/images/projectiles/lightning_thick.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33d4a9ec59bbcac84c51b302a3f8b8c496afe4ccc8e5b775de7175afc1d83c0d +size 685 diff --git a/images/projectiles/lightning_thick.png.import b/images/projectiles/lightning_thick.png.import new file mode 100644 index 0000000..bfb4475 --- /dev/null +++ b/images/projectiles/lightning_thick.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ym37tueldx8w" +path="res://.godot/imported/lightning_thick.png-50daf8cbe37c26ad666ef7a0f5a0cbd8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/projectiles/lightning_thick.png" +dest_files=["res://.godot/imported/lightning_thick.png-50daf8cbe37c26ad666ef7a0f5a0cbd8.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/projectiles/lightning_thin.png b/images/projectiles/lightning_thin.png new file mode 100644 index 0000000..62da071 --- /dev/null +++ b/images/projectiles/lightning_thin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd2c9a0a41a6a252b0d93cb21ed378547752e8a33bc40bee86b9c3a3c3e25bd5 +size 469 diff --git a/images/projectiles/lightning_thin.png.import b/images/projectiles/lightning_thin.png.import new file mode 100644 index 0000000..fc59a7a --- /dev/null +++ b/images/projectiles/lightning_thin.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bw2k655gwkbec" +path="res://.godot/imported/lightning_thin.png-be930e1174dd6a5e8ba776dc9d7e1ab8.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://images/projectiles/lightning_thin.png" +dest_files=["res://.godot/imported/lightning_thin.png-be930e1174dd6a5e8ba776dc9d7e1ab8.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/passage_process.png b/images/projectiles/passage_process.png similarity index 100% rename from images/passage_process.png rename to images/projectiles/passage_process.png diff --git a/images/passage_process.png.import b/images/projectiles/passage_process.png.import similarity index 75% rename from images/passage_process.png.import rename to images/projectiles/passage_process.png.import index 15846cf..9b6b1c9 100644 --- a/images/passage_process.png.import +++ b/images/projectiles/passage_process.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d1n7qejdcrpkf" -path="res://.godot/imported/passage_process.png-bff772a67d53dffb8cf9f2e6d1d84977.ctex" +path="res://.godot/imported/passage_process.png-82c02a488bcc4f13798fee82fd277b43.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/passage_process.png" -dest_files=["res://.godot/imported/passage_process.png-bff772a67d53dffb8cf9f2e6d1d84977.ctex"] +source_file="res://images/projectiles/passage_process.png" +dest_files=["res://.godot/imported/passage_process.png-82c02a488bcc4f13798fee82fd277b43.ctex"] [params] diff --git a/images/projectiles.png b/images/projectiles/projectiles.png similarity index 100% rename from images/projectiles.png rename to images/projectiles/projectiles.png diff --git a/images/projectiles.png.import b/images/projectiles/projectiles.png.import similarity index 76% rename from images/projectiles.png.import rename to images/projectiles/projectiles.png.import index a9f40ab..43ce1ee 100644 --- a/images/projectiles.png.import +++ b/images/projectiles/projectiles.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://oj86smpsipw4" -path="res://.godot/imported/projectiles.png-303f8da0aba26a97cc483f6d67ac865d.ctex" +path="res://.godot/imported/projectiles.png-bb2600a6a3707e82ad502972f6159715.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/projectiles.png" -dest_files=["res://.godot/imported/projectiles.png-303f8da0aba26a97cc483f6d67ac865d.ctex"] +source_file="res://images/projectiles/projectiles.png" +dest_files=["res://.godot/imported/projectiles.png-bb2600a6a3707e82ad502972f6159715.ctex"] [params] diff --git a/images/debris.png b/images/ships/debris.png similarity index 100% rename from images/debris.png rename to images/ships/debris.png diff --git a/images/debris.png.import b/images/ships/debris.png.import similarity index 77% rename from images/debris.png.import rename to images/ships/debris.png.import index 4cbdd9f..f77f66f 100644 --- a/images/debris.png.import +++ b/images/ships/debris.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://jnynidhnycpq" -path="res://.godot/imported/debris.png-af1566d09503649c4b5c51e25eb08d64.ctex" +path="res://.godot/imported/debris.png-3a1a309855c3eb32eec521c5f7cd39d1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/debris.png" -dest_files=["res://.godot/imported/debris.png-af1566d09503649c4b5c51e25eb08d64.ctex"] +source_file="res://images/ships/debris.png" +dest_files=["res://.godot/imported/debris.png-3a1a309855c3eb32eec521c5f7cd39d1.ctex"] [params] diff --git a/images/health.png b/images/ships/health.png similarity index 100% rename from images/health.png rename to images/ships/health.png diff --git a/images/health.png.import b/images/ships/health.png.import similarity index 77% rename from images/health.png.import rename to images/ships/health.png.import index f35201a..1e5e33c 100644 --- a/images/health.png.import +++ b/images/ships/health.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://do586oblhwuc5" -path="res://.godot/imported/health.png-825db86ed00488748bab7a5690a96891.ctex" +path="res://.godot/imported/health.png-86131f65b49d1d4ec62f30e1712fa07e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/health.png" -dest_files=["res://.godot/imported/health.png-825db86ed00488748bab7a5690a96891.ctex"] +source_file="res://images/ships/health.png" +dest_files=["res://.godot/imported/health.png-86131f65b49d1d4ec62f30e1712fa07e.ctex"] [params] diff --git a/images/weapons.png b/images/ships/weapons.png similarity index 100% rename from images/weapons.png rename to images/ships/weapons.png diff --git a/images/weapons.png.import b/images/ships/weapons.png.import similarity index 77% rename from images/weapons.png.import rename to images/ships/weapons.png.import index 7a18192..6819ab8 100644 --- a/images/weapons.png.import +++ b/images/ships/weapons.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://6hh66k8s4a1e" -path="res://.godot/imported/weapons.png-5e31f764c3152a25cc3ecb57f3bdccd0.ctex" +path="res://.godot/imported/weapons.png-dafe783d01b1ccf555d716f37722300d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/weapons.png" -dest_files=["res://.godot/imported/weapons.png-5e31f764c3152a25cc3ecb57f3bdccd0.ctex"] +source_file="res://images/ships/weapons.png" +dest_files=["res://.godot/imported/weapons.png-dafe783d01b1ccf555d716f37722300d.ctex"] [params] diff --git a/particle_textures/energy_huge.tres b/particle_textures/energy_huge.tres index edbc39f..02b2fec 100644 --- a/particle_textures/energy_huge.tres +++ b/particle_textures/energy_huge.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://d2k7bcwqr5v2q"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_1f6me"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_1f6me"] [resource] atlas = ExtResource("1_1f6me") diff --git a/particle_textures/energy_large.tres b/particle_textures/energy_large.tres index aea3fd0..db16201 100644 --- a/particle_textures/energy_large.tres +++ b/particle_textures/energy_large.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://cqdctagygc0c0"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_d8wt4"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_d8wt4"] [resource] atlas = ExtResource("1_d8wt4") diff --git a/particle_textures/energy_medium.tres b/particle_textures/energy_medium.tres index 566c41e..62f2b25 100644 --- a/particle_textures/energy_medium.tres +++ b/particle_textures/energy_medium.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dk3t14mrgjmma"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_nqbbv"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_nqbbv"] [resource] atlas = ExtResource("1_nqbbv") diff --git a/particle_textures/energy_small.tres b/particle_textures/energy_small.tres index baa3f58..ad7e49f 100644 --- a/particle_textures/energy_small.tres +++ b/particle_textures/energy_small.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://c6aixtu6lbfud"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_vaa1w"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_vaa1w"] [resource] atlas = ExtResource("1_vaa1w") diff --git a/particle_textures/flame_huge.tres b/particle_textures/flame_huge.tres index d1876f0..4495713 100644 --- a/particle_textures/flame_huge.tres +++ b/particle_textures/flame_huge.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://blp4o1c7y66wv"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_57uvc"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_57uvc"] [resource] atlas = ExtResource("1_57uvc") diff --git a/particle_textures/flame_large.tres b/particle_textures/flame_large.tres index a1bdd2a..6916937 100644 --- a/particle_textures/flame_large.tres +++ b/particle_textures/flame_large.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://b13al44e8ofsx"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_1qw66"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_1qw66"] [resource] atlas = ExtResource("1_1qw66") diff --git a/particle_textures/flame_medium.tres b/particle_textures/flame_medium.tres index 13ecbc3..909bb12 100644 --- a/particle_textures/flame_medium.tres +++ b/particle_textures/flame_medium.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://gh7mwehpqfco"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_na56a"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_na56a"] [resource] atlas = ExtResource("1_na56a") diff --git a/particle_textures/flame_small.tres b/particle_textures/flame_small.tres index 5376209..6392a3d 100644 --- a/particle_textures/flame_small.tres +++ b/particle_textures/flame_small.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://b2tpy3y2bpuat"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_tnay8"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_tnay8"] [resource] atlas = ExtResource("1_tnay8") diff --git a/particle_textures/shell_huge.tres b/particle_textures/shell_huge.tres index 7230fd4..dd229dd 100644 --- a/particle_textures/shell_huge.tres +++ b/particle_textures/shell_huge.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://pxprk0gjivyw"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_36odh"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_36odh"] [resource] atlas = ExtResource("1_36odh") diff --git a/particle_textures/shell_large.tres b/particle_textures/shell_large.tres index 18710ae..c20d92e 100644 --- a/particle_textures/shell_large.tres +++ b/particle_textures/shell_large.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://bi1s5xrnunw3c"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_6rm8e"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_6rm8e"] [resource] atlas = ExtResource("1_6rm8e") diff --git a/particle_textures/shell_medium.tres b/particle_textures/shell_medium.tres index 6833c53..ae2fbcb 100644 --- a/particle_textures/shell_medium.tres +++ b/particle_textures/shell_medium.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://dxcxybr27kkra"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_ss0dd"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_ss0dd"] [resource] atlas = ExtResource("1_ss0dd") diff --git a/particle_textures/shell_small.tres b/particle_textures/shell_small.tres index b3fdec4..0f2815b 100644 --- a/particle_textures/shell_small.tres +++ b/particle_textures/shell_small.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" load_steps=2 format=3 uid="uid://bib4q76bmnajw"] -[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles.png" id="1_7mk6j"] +[ext_resource type="Texture2D" uid="uid://3w0itm7k5fxq" path="res://images/particles/particles.png" id="1_7mk6j"] [resource] atlas = ExtResource("1_7mk6j") diff --git a/project.godot b/project.godot index 52b29e3..2b20cbb 100644 --- a/project.godot +++ b/project.godot @@ -333,5 +333,6 @@ previous_reactor_scheme={ [rendering] textures/canvas_textures/default_texture_filter=0 +textures/canvas_textures/default_texture_repeat=1 renderer/rendering_method="mobile" 2d/snap/snap_2d_transforms_to_pixel=true