From 8a0bda06662b731ca540cb9d2d9359b3b3e0c44f Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Sun, 16 Nov 2025 18:46:37 +0300 Subject: [PATCH] Updated railgun and cannon projectiles. Fixed weapon names --- game/entities/weapons/cannon/cannon_weapon.tscn | 2 +- game/entities/weapons/gatling/gatling_weapon.tscn | 2 +- game/entities/weapons/laser/laser_weapon.tscn | 2 +- game/entities/weapons/launcher/launcher_weapon.tscn | 2 +- game/entities/weapons/minelayer/minelayer_weapon.tscn | 2 +- game/entities/weapons/plasma/plasma_weapon.tscn | 2 +- game/entities/weapons/railgun/railgun_projectile.tscn | 2 +- game/entities/weapons/railgun/railgun_weapon.tscn | 2 +- game/entities/weapons/shrapnel/shrapnel_weapon.tscn | 2 +- game/entities/weapons/tesla/tesla_weapon.tscn | 2 +- images/projectiles.png | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/game/entities/weapons/cannon/cannon_weapon.tscn b/game/entities/weapons/cannon/cannon_weapon.tscn index bfca469..76ca2a7 100644 --- a/game/entities/weapons/cannon/cannon_weapon.tscn +++ b/game/entities/weapons/cannon/cannon_weapon.tscn @@ -11,7 +11,7 @@ script = ExtResource("4_bv8g1") firerate = 50 metadata/_custom_type_script = "uid://b255rb32vc6co" -[node name="Cannon" instance=ExtResource("1_xnbws")] +[node name="CannonWeapon" instance=ExtResource("1_xnbws")] script = ExtResource("2_ew5um") sector_angle = 1 Projectile = ExtResource("2_2bjeu") diff --git a/game/entities/weapons/gatling/gatling_weapon.tscn b/game/entities/weapons/gatling/gatling_weapon.tscn index 7a5fb45..32b7777 100644 --- a/game/entities/weapons/gatling/gatling_weapon.tscn +++ b/game/entities/weapons/gatling/gatling_weapon.tscn @@ -19,7 +19,7 @@ magazine_size = 150 reload_time = 2 metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" -[node name="Gatling" instance=ExtResource("1_gblx7")] +[node name="GatlingWeapon" instance=ExtResource("1_gblx7")] script = ExtResource("1_kg6du") sector_angle = 5 Projectile = ExtResource("2_ylc0n") diff --git a/game/entities/weapons/laser/laser_weapon.tscn b/game/entities/weapons/laser/laser_weapon.tscn index ae5403b..351e775 100644 --- a/game/entities/weapons/laser/laser_weapon.tscn +++ b/game/entities/weapons/laser/laser_weapon.tscn @@ -19,7 +19,7 @@ heat_capacity = 1000 cooling_down_rate = 2500 metadata/_custom_type_script = "uid://dxk56xdihfw4m" -[node name="Laser" instance=ExtResource("1_pki4x")] +[node name="LaserWeapon" instance=ExtResource("1_pki4x")] script = ExtResource("2_lbdvb") bullet_per_shot = 2 Projectile = ExtResource("2_fecho") diff --git a/game/entities/weapons/launcher/launcher_weapon.tscn b/game/entities/weapons/launcher/launcher_weapon.tscn index 128507a..ae182fa 100644 --- a/game/entities/weapons/launcher/launcher_weapon.tscn +++ b/game/entities/weapons/launcher/launcher_weapon.tscn @@ -11,7 +11,7 @@ script = ExtResource("4_fsoo2") firerate = 120 metadata/_custom_type_script = "uid://b255rb32vc6co" -[node name="Launcher" instance=ExtResource("1_sk5u1")] +[node name="LauncherWeapon" instance=ExtResource("1_sk5u1")] script = ExtResource("2_mxjpe") sector_angle = 5 Projectile = ExtResource("3_fsoo2") diff --git a/game/entities/weapons/minelayer/minelayer_weapon.tscn b/game/entities/weapons/minelayer/minelayer_weapon.tscn index f237ef8..4df3d2a 100644 --- a/game/entities/weapons/minelayer/minelayer_weapon.tscn +++ b/game/entities/weapons/minelayer/minelayer_weapon.tscn @@ -11,7 +11,7 @@ script = ExtResource("4_fbmxv") firerate = 40 metadata/_custom_type_script = "uid://b255rb32vc6co" -[node name="Minelayer" instance=ExtResource("1_12l3k")] +[node name="MinelayerWeapon" instance=ExtResource("1_12l3k")] script = ExtResource("2_mmhtn") sector_angle = 10 Projectile = ExtResource("2_7y446") diff --git a/game/entities/weapons/plasma/plasma_weapon.tscn b/game/entities/weapons/plasma/plasma_weapon.tscn index 92e77fb..8695356 100644 --- a/game/entities/weapons/plasma/plasma_weapon.tscn +++ b/game/entities/weapons/plasma/plasma_weapon.tscn @@ -19,7 +19,7 @@ heat_capacity = 1000 cooling_down_rate = 1000 metadata/_custom_type_script = "uid://dxk56xdihfw4m" -[node name="Plasma" instance=ExtResource("1_pkk8e")] +[node name="PlasmaWeapon" instance=ExtResource("1_pkk8e")] script = ExtResource("2_fnsb7") sector_angle = 2 Projectile = ExtResource("2_yluvp") diff --git a/game/entities/weapons/railgun/railgun_projectile.tscn b/game/entities/weapons/railgun/railgun_projectile.tscn index 75bf2d7..54b80ae 100644 --- a/game/entities/weapons/railgun/railgun_projectile.tscn +++ b/game/entities/weapons/railgun/railgun_projectile.tscn @@ -20,7 +20,7 @@ region = Rect2(16, 0, 16, 16) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_u82jm"] radius = 1.0 -height = 4.0 +height = 8.0 [node name="RailgunProjectile" instance=ExtResource("1_rfd1j")] collision_layer = 0 diff --git a/game/entities/weapons/railgun/railgun_weapon.tscn b/game/entities/weapons/railgun/railgun_weapon.tscn index ce7e6d1..f1ea07e 100644 --- a/game/entities/weapons/railgun/railgun_weapon.tscn +++ b/game/entities/weapons/railgun/railgun_weapon.tscn @@ -18,7 +18,7 @@ magazine_size = 30 reload_time = 7 metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" -[node name="Railgun" instance=ExtResource("1_0nxvu")] +[node name="RailgunWeapon" instance=ExtResource("1_0nxvu")] script = ExtResource("1_5nhwg") Projectile = ExtResource("2_cbsia") reloaders = Array[ExtResource("3_qxka8")]([SubResource("Resource_5nhwg"), SubResource("Resource_cbsia")]) diff --git a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn index e5b7a0d..86c9f9e 100644 --- a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn @@ -18,7 +18,7 @@ magazine_size = 35 reload_time = 5 metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" -[node name="Shrapnel" instance=ExtResource("1_xk300")] +[node name="ShrapnelWeapon" instance=ExtResource("1_xk300")] script = ExtResource("2_1bd18") bullet_per_shot = 20 sector_angle = 30 diff --git a/game/entities/weapons/tesla/tesla_weapon.tscn b/game/entities/weapons/tesla/tesla_weapon.tscn index 7538906..94a99f9 100644 --- a/game/entities/weapons/tesla/tesla_weapon.tscn +++ b/game/entities/weapons/tesla/tesla_weapon.tscn @@ -19,7 +19,7 @@ heat_capacity = 1000 cooling_down_rate = 2500 metadata/_custom_type_script = "uid://dxk56xdihfw4m" -[node name="Tesla" instance=ExtResource("1_rpud7")] +[node name="TeslaWeapon" instance=ExtResource("1_rpud7")] script = ExtResource("2_08si3") sector_angle = 10 Projectile = ExtResource("2_1rrdy") diff --git a/images/projectiles.png b/images/projectiles.png index 9845f1c..76878f4 100644 --- a/images/projectiles.png +++ b/images/projectiles.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f2dc29daf6e2aaba3b0065b668df0d3e99b8300ea198ba5cc4cbd6d9017808e +oid sha256:44eb98b6ecd395632d6fe31785c316d0ec4c108841f06dadda243400aa3cbc6a size 513