diff --git a/game/entities/weapons/cannon/cannon_weapon.tscn b/game/entities/weapons/cannon/cannon_weapon.tscn index 45bb874..d69a567 100644 --- a/game/entities/weapons/cannon/cannon_weapon.tscn +++ b/game/entities/weapons/cannon/cannon_weapon.tscn @@ -11,6 +11,8 @@ resource_local_to_scene = true lifetime_randomness = 0.4 particle_flag_disable_z = true +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.2 spread = 30.0 initial_velocity_min = 10.0 @@ -21,6 +23,8 @@ gravity = Vector3(0, 0, 0) resource_local_to_scene = true lifetime_randomness = 0.1 particle_flag_disable_z = true +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.2 spread = 5.0 initial_velocity_min = 10.0 @@ -31,6 +35,8 @@ gravity = Vector3(0, 0, 0) resource_local_to_scene = true lifetime_randomness = 0.1 particle_flag_disable_z = true +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.2 spread = 5.0 initial_velocity_min = 10.0 @@ -182,6 +188,7 @@ sprite_frames = SubResource("SpriteFrames_kdf62") animation = &"player_idle" [node name="ShellParticles" type="GPUParticles2D" parent="." index="2"] +z_index = 1 emitting = false amount = 1 texture = SubResource("AtlasTexture_h76ev") diff --git a/game/entities/weapons/launcher/launcher_projectile.tscn b/game/entities/weapons/launcher/launcher_projectile.tscn index 2c94ef9..554475c 100644 --- a/game/entities/weapons/launcher/launcher_projectile.tscn +++ b/game/entities/weapons/launcher/launcher_projectile.tscn @@ -11,6 +11,8 @@ lifetime_randomness = 0.5 particle_flag_disable_z = true emission_shape = 1 emission_sphere_radius = 2.0 +angle_min = -179.99998 +angle_max = 180.00002 spread = 15.0 gravity = Vector3(0, 0, 0) @@ -68,7 +70,7 @@ speed = 300 [node name="GPUParticles2D" type="GPUParticles2D" parent="." index="0"] amount = 16 texture = ExtResource("3_kos01") -lifetime = 0.09999999999999999 +lifetime = 0.1 process_material = SubResource("ParticleProcessMaterial_kxgpk") [node name="Sprite2D_E" type="Sprite2D" parent="." index="1"] diff --git a/game/entities/weapons/launcher/launcher_weapon.tscn b/game/entities/weapons/launcher/launcher_weapon.tscn index 6e4c363..8cc77ea 100644 --- a/game/entities/weapons/launcher/launcher_weapon.tscn +++ b/game/entities/weapons/launcher/launcher_weapon.tscn @@ -12,6 +12,8 @@ particle_flag_disable_z = true emission_shape_offset = Vector3(-8, -3.5, 0) emission_shape = 1 emission_sphere_radius = 1.0 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 direction = Vector3(-1, 0, 0) spread = 15.0 @@ -25,6 +27,8 @@ particle_flag_disable_z = true emission_shape_offset = Vector3(-8, 3.5, 0) emission_shape = 1 emission_sphere_radius = 1.0 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 direction = Vector3(-1, 0, 0) spread = 15.0 @@ -38,6 +42,8 @@ particle_flag_disable_z = true emission_shape_offset = Vector3(8, -3.5, 0) emission_shape = 1 emission_sphere_radius = 1.0 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 spread = 15.0 initial_velocity_min = 30.0 @@ -50,6 +56,8 @@ particle_flag_disable_z = true emission_shape_offset = Vector3(8, 3.5, 0) emission_shape = 1 emission_sphere_radius = 1.0 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 spread = 15.0 initial_velocity_min = 30.0 diff --git a/game/entities/weapons/plasma/plasma_projectile.tscn b/game/entities/weapons/plasma/plasma_projectile.tscn index da7527d..a4ee5e9 100644 --- a/game/entities/weapons/plasma/plasma_projectile.tscn +++ b/game/entities/weapons/plasma/plasma_projectile.tscn @@ -1,21 +1,29 @@ -[gd_scene load_steps=7 format=3 uid="uid://cgvb0hjrl5h4s"] +[gd_scene load_steps=8 format=3 uid="uid://cgvb0hjrl5h4s"] [ext_resource type="PackedScene" uid="uid://cdv5n4t47hr8i" path="res://game/entities/weapons/direct_hit__projectile.tscn" id="1_x58hw"] [ext_resource type="Script" uid="uid://bu5sjoh4hwkhn" path="res://game/entities/weapons/plasma/plasma_projectile.gd" id="2_0deih"] [ext_resource type="Script" uid="uid://c27v705giygv4" path="res://game/health_system/damage/energy_damage.gd" id="3_dlvdm"] +[ext_resource type="Texture2D" uid="uid://dedca1d30igae" path="res://particle_textures/energy.tres" id="4_5enq5"] [sub_resource type="Resource" id="Resource_5enq5"] script = ExtResource("3_dlvdm") value = 20 metadata/_custom_type_script = "uid://c27v705giygv4" -[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dlvdm"] -size = Vector2(6, 4) - [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_5enq5"] radius = 1.0 height = 4.0 +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_etxcw"] +lifetime_randomness = 0.5 +particle_flag_disable_z = true +emission_shape = 1 +emission_sphere_radius = 2.0 +angle_min = -179.99998 +angle_max = 180.00002 +inherit_velocity_ratio = 0.5 +gravity = Vector3(0, 0, 0) + [node name="PlasmaProjectile" instance=ExtResource("1_x58hw")] collision_layer = 0 collision_mask = 0 @@ -23,8 +31,13 @@ script = ExtResource("2_0deih") damage = SubResource("Resource_5enq5") speed = 450 -[node name="Sprite2D" type="Sprite2D" parent="." index="0"] -texture = SubResource("PlaceholderTexture2D_dlvdm") - -[node name="CollisionShape2D" parent="." index="1"] +[node name="CollisionShape2D" parent="." index="0"] shape = SubResource("CapsuleShape2D_5enq5") +debug_color = Color(0.98039216, 0, 0.39215687, 1) + +[node name="GPUParticles2D" type="GPUParticles2D" parent="." index="2"] +amount = 64 +texture = ExtResource("4_5enq5") +lifetime = 0.2 +preprocess = 0.1 +process_material = SubResource("ParticleProcessMaterial_etxcw") diff --git a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn index 49fb944..34c1832 100644 --- a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn @@ -13,6 +13,8 @@ lifetime_randomness = 0.5 particle_flag_disable_z = true emission_shape = 1 emission_sphere_radius = 2.0 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 initial_velocity_min = 10.0 initial_velocity_max = 15.0 @@ -133,6 +135,7 @@ wait_time = 0.6 one_shot = true [node name="ShellParticles" type="GPUParticles2D" parent="." index="3"] +z_index = 1 emitting = false amount = 1 texture = SubResource("AtlasTexture_he4pe") diff --git a/game/entities/weapons/tesla/tesla_weapon.tscn b/game/entities/weapons/tesla/tesla_weapon.tscn index 6e39197..b72307e 100644 --- a/game/entities/weapons/tesla/tesla_weapon.tscn +++ b/game/entities/weapons/tesla/tesla_weapon.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=26 format=3 uid="uid://dyebeblayioji"] +[gd_scene load_steps=25 format=3 uid="uid://dyebeblayioji"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_rpud7"] [ext_resource type="PackedScene" uid="uid://bi64687wtxi4d" path="res://game/entities/weapons/tesla/tesla_projectile.tscn" id="2_1rrdy"] [ext_resource type="Script" uid="uid://ctv408wdwvttc" path="res://game/entities/weapons/tesla/tesla_weapon.gd" id="2_08si3"] +[ext_resource type="Texture2D" uid="uid://dedca1d30igae" path="res://particle_textures/energy.tres" id="5_dhfvk"] [ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="7_ub67s"] [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] @@ -133,18 +134,11 @@ animations = [{ "speed": 10.0 }] -[sub_resource type="Gradient" id="Gradient_ub67s"] -colors = PackedColorArray(0.4509804, 0.9372549, 0.96862745, 1, 0.25490198, 0.6509804, 0.9647059, 1) - -[sub_resource type="GradientTexture1D" id="GradientTexture1D_ucdpq"] -gradient = SubResource("Gradient_ub67s") -width = 2 - [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_ifsj2"] lifetime_randomness = 0.5 particle_flag_disable_z = true -angle_min = 1.0728835e-05 -angle_max = 360.00003 +angle_min = -179.99998 +angle_max = 180.00002 inherit_velocity_ratio = 0.5 spread = 180.0 initial_velocity_min = 15.0 @@ -165,7 +159,7 @@ animation = &"player_idle" [node name="GPUParticles2D" type="GPUParticles2D" parent="." index="2"] amount = 16 -texture = SubResource("GradientTexture1D_ucdpq") +texture = ExtResource("5_dhfvk") lifetime = 0.1 fixed_fps = 10 process_material = SubResource("ParticleProcessMaterial_ifsj2")