From c65dfcaaf8edcac83e2a4ccc1bce8a248884e17c Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Fri, 21 Nov 2025 00:29:41 +0300 Subject: [PATCH] Removed magazine and energy reloaders --- .../weapons/gatling/gatling_weapon.tscn | 11 +--- game/entities/weapons/laser/laser_weapon.tscn | 12 +--- .../weapons/plasma/plasma_weapon.tscn | 12 +--- .../weapons/railgun/railgun_weapon.tscn | 11 +--- .../weapons/shrapnel/shrapnel_weapon.tscn | 11 +--- game/entities/weapons/tesla/tesla_weapon.tscn | 12 +--- game/reloaders/energy_reloader.gd | 65 ------------------- game/reloaders/energy_reloader.gd.uid | 1 - game/reloaders/magazine_reloader.gd | 60 ----------------- game/reloaders/magazine_reloader.gd.uid | 1 - 10 files changed, 12 insertions(+), 184 deletions(-) delete mode 100644 game/reloaders/energy_reloader.gd delete mode 100644 game/reloaders/energy_reloader.gd.uid delete mode 100644 game/reloaders/magazine_reloader.gd delete mode 100644 game/reloaders/magazine_reloader.gd.uid diff --git a/game/entities/weapons/gatling/gatling_weapon.tscn b/game/entities/weapons/gatling/gatling_weapon.tscn index 415e992..c3ae4bb 100644 --- a/game/entities/weapons/gatling/gatling_weapon.tscn +++ b/game/entities/weapons/gatling/gatling_weapon.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=10 format=3 uid="uid://c4mlppn5i55bp"] +[gd_scene load_steps=8 format=3 uid="uid://c4mlppn5i55bp"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_gblx7"] [ext_resource type="Script" uid="uid://c1bsvmj7xhnxe" path="res://game/entities/weapons/gatling/gatling_weapon.gd" id="1_kg6du"] [ext_resource type="PackedScene" uid="uid://yfvluap3uy1r" path="res://game/entities/weapons/gatling/gatling_projectile.tscn" id="2_ylc0n"] [ext_resource type="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_uucc4"] [ext_resource type="Script" uid="uid://oslebeau3f4b" path="res://game/reloaders/gatling_reloader.gd" id="4_g81jq"] -[ext_resource type="Script" uid="uid://d2gfhnlbqxsoq" path="res://game/reloaders/magazine_reloader.gd" id="5_tjfs0"] [sub_resource type="Resource" id="Resource_kg6du"] script = ExtResource("4_g81jq") @@ -13,12 +12,6 @@ firerate = 600 spin_out_time = 3 metadata/_custom_type_script = "uid://oslebeau3f4b" -[sub_resource type="Resource" id="Resource_ylc0n"] -script = ExtResource("5_tjfs0") -magazine_size = 150 -reload_time = 2 -metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) @@ -26,7 +19,7 @@ size = Vector2(10, 7) script = ExtResource("1_kg6du") sector_angle = 5 Projectile = ExtResource("2_ylc0n") -reloaders = Array[ExtResource("3_uucc4")]([SubResource("Resource_kg6du"), SubResource("Resource_ylc0n")]) +reloaders = Array[ExtResource("3_uucc4")]([SubResource("Resource_kg6du")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/laser/laser_weapon.tscn b/game/entities/weapons/laser/laser_weapon.tscn index d0c8da1..e839db2 100644 --- a/game/entities/weapons/laser/laser_weapon.tscn +++ b/game/entities/weapons/laser/laser_weapon.tscn @@ -1,24 +1,16 @@ -[gd_scene load_steps=10 format=3 uid="uid://def1alrel4ioo"] +[gd_scene load_steps=8 format=3 uid="uid://def1alrel4ioo"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_pki4x"] [ext_resource type="PackedScene" uid="uid://cmni0xrbbfcy5" path="res://game/entities/weapons/laser/laser_projectile.tscn" id="2_fecho"] [ext_resource type="Script" uid="uid://bxr150at8ul2a" path="res://game/entities/weapons/laser/laser_weapon.gd" id="2_lbdvb"] [ext_resource type="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_c1wcw"] [ext_resource type="Script" uid="uid://b255rb32vc6co" path="res://game/reloaders/firerate_reloader.gd" id="4_cl0br"] -[ext_resource type="Script" uid="uid://dxk56xdihfw4m" path="res://game/reloaders/energy_reloader.gd" id="5_l3tgo"] [sub_resource type="Resource" id="Resource_fecho"] script = ExtResource("4_cl0br") firerate = 1500 metadata/_custom_type_script = "uid://b255rb32vc6co" -[sub_resource type="Resource" id="Resource_c1wcw"] -script = ExtResource("5_l3tgo") -heat_per_shot = 4 -heat_capacity = 1000 -cooling_down_rate = 2500 -metadata/_custom_type_script = "uid://dxk56xdihfw4m" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) @@ -26,7 +18,7 @@ size = Vector2(10, 7) script = ExtResource("2_lbdvb") bullet_per_shot = 2 Projectile = ExtResource("2_fecho") -reloaders = Array[ExtResource("3_c1wcw")]([SubResource("Resource_fecho"), SubResource("Resource_c1wcw")]) +reloaders = Array[ExtResource("3_c1wcw")]([SubResource("Resource_fecho")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/plasma/plasma_weapon.tscn b/game/entities/weapons/plasma/plasma_weapon.tscn index 7b35ef8..14ca13a 100644 --- a/game/entities/weapons/plasma/plasma_weapon.tscn +++ b/game/entities/weapons/plasma/plasma_weapon.tscn @@ -1,24 +1,16 @@ -[gd_scene load_steps=10 format=3 uid="uid://cj1jclfterepm"] +[gd_scene load_steps=8 format=3 uid="uid://cj1jclfterepm"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_pkk8e"] [ext_resource type="Script" uid="uid://cu6ck2oqqdem8" path="res://game/entities/weapons/plasma/plasma_weapon.gd" id="2_fnsb7"] [ext_resource type="PackedScene" uid="uid://cgvb0hjrl5h4s" path="res://game/entities/weapons/plasma/plasma_projectile.tscn" id="2_yluvp"] [ext_resource type="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_fnsb7"] [ext_resource type="Script" uid="uid://b255rb32vc6co" path="res://game/reloaders/firerate_reloader.gd" id="4_gpth1"] -[ext_resource type="Script" uid="uid://dxk56xdihfw4m" path="res://game/reloaders/energy_reloader.gd" id="5_daaq0"] [sub_resource type="Resource" id="Resource_yluvp"] script = ExtResource("4_gpth1") firerate = 150 metadata/_custom_type_script = "uid://b255rb32vc6co" -[sub_resource type="Resource" id="Resource_fnsb7"] -script = ExtResource("5_daaq0") -heat_per_shot = 35 -heat_capacity = 1000 -cooling_down_rate = 1000 -metadata/_custom_type_script = "uid://dxk56xdihfw4m" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) @@ -26,7 +18,7 @@ size = Vector2(10, 7) script = ExtResource("2_fnsb7") sector_angle = 2 Projectile = ExtResource("2_yluvp") -reloaders = Array[ExtResource("3_fnsb7")]([SubResource("Resource_yluvp"), SubResource("Resource_fnsb7")]) +reloaders = Array[ExtResource("3_fnsb7")]([SubResource("Resource_yluvp")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/railgun/railgun_weapon.tscn b/game/entities/weapons/railgun/railgun_weapon.tscn index c1597f0..6197c50 100644 --- a/game/entities/weapons/railgun/railgun_weapon.tscn +++ b/game/entities/weapons/railgun/railgun_weapon.tscn @@ -1,30 +1,23 @@ -[gd_scene load_steps=10 format=3 uid="uid://do6h77gmnreho"] +[gd_scene load_steps=8 format=3 uid="uid://do6h77gmnreho"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_0nxvu"] [ext_resource type="Script" uid="uid://drnofu4ium56e" path="res://game/entities/weapons/railgun/railgun_weapon.gd" id="1_5nhwg"] [ext_resource type="PackedScene" uid="uid://bab3bopsw74cb" path="res://game/entities/weapons/railgun/railgun_projectile.tscn" id="2_cbsia"] [ext_resource type="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_qxka8"] [ext_resource type="Script" uid="uid://b255rb32vc6co" path="res://game/reloaders/firerate_reloader.gd" id="4_igknv"] -[ext_resource type="Script" uid="uid://d2gfhnlbqxsoq" path="res://game/reloaders/magazine_reloader.gd" id="5_buejq"] [sub_resource type="Resource" id="Resource_5nhwg"] script = ExtResource("4_igknv") firerate = 60 metadata/_custom_type_script = "uid://b255rb32vc6co" -[sub_resource type="Resource" id="Resource_cbsia"] -script = ExtResource("5_buejq") -magazine_size = 30 -reload_time = 7 -metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) [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")]) +reloaders = Array[ExtResource("3_qxka8")]([SubResource("Resource_5nhwg")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn index 7f015b7..ac845e0 100644 --- a/game/entities/weapons/shrapnel/shrapnel_weapon.tscn +++ b/game/entities/weapons/shrapnel/shrapnel_weapon.tscn @@ -1,23 +1,16 @@ -[gd_scene load_steps=10 format=3 uid="uid://r7wnk762jbfy"] +[gd_scene load_steps=8 format=3 uid="uid://r7wnk762jbfy"] [ext_resource type="PackedScene" uid="uid://1o2ta17yc5bp" path="res://game/entities/weapons/abstract_weapon.tscn" id="1_xk300"] [ext_resource type="Script" uid="uid://gxwbsiicuqh5" path="res://game/entities/weapons/shrapnel/shrapnel_weapon.gd" id="2_1bd18"] [ext_resource type="PackedScene" uid="uid://bsx23u3a2obbj" path="res://game/entities/weapons/shrapnel/shrapnel_projectile.tscn" id="2_xvd4y"] [ext_resource type="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_tyrw7"] [ext_resource type="Script" uid="uid://b255rb32vc6co" path="res://game/reloaders/firerate_reloader.gd" id="4_nfmol"] -[ext_resource type="Script" uid="uid://d2gfhnlbqxsoq" path="res://game/reloaders/magazine_reloader.gd" id="5_mw83u"] [sub_resource type="Resource" id="Resource_tyrw7"] script = ExtResource("4_nfmol") firerate = 100 metadata/_custom_type_script = "uid://b255rb32vc6co" -[sub_resource type="Resource" id="Resource_nfmol"] -script = ExtResource("5_mw83u") -magazine_size = 35 -reload_time = 5 -metadata/_custom_type_script = "uid://d2gfhnlbqxsoq" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) @@ -26,7 +19,7 @@ script = ExtResource("2_1bd18") bullet_per_shot = 20 sector_angle = 30 Projectile = ExtResource("2_xvd4y") -reloaders = Array[ExtResource("3_tyrw7")]([SubResource("Resource_tyrw7"), SubResource("Resource_nfmol")]) +reloaders = Array[ExtResource("3_tyrw7")]([SubResource("Resource_tyrw7")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/entities/weapons/tesla/tesla_weapon.tscn b/game/entities/weapons/tesla/tesla_weapon.tscn index d0305bb..8e997b4 100644 --- a/game/entities/weapons/tesla/tesla_weapon.tscn +++ b/game/entities/weapons/tesla/tesla_weapon.tscn @@ -1,11 +1,10 @@ -[gd_scene load_steps=31 format=3 uid="uid://dyebeblayioji"] +[gd_scene load_steps=29 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="Script" uid="uid://ccpriilfr3kme" path="res://game/reloaders/abstract_reloader.gd" id="3_08si3"] [ext_resource type="Script" uid="uid://b255rb32vc6co" path="res://game/reloaders/firerate_reloader.gd" id="4_rqarv"] -[ext_resource type="Script" uid="uid://dxk56xdihfw4m" path="res://game/reloaders/energy_reloader.gd" id="5_j5i31"] [ext_resource type="Texture2D" uid="uid://6hh66k8s4a1e" path="res://images/weapons.png" id="7_ub67s"] [sub_resource type="Resource" id="Resource_1rrdy"] @@ -13,13 +12,6 @@ script = ExtResource("4_rqarv") firerate = 45 metadata/_custom_type_script = "uid://b255rb32vc6co" -[sub_resource type="Resource" id="Resource_08si3"] -script = ExtResource("5_j5i31") -heat_per_shot = 150 -heat_capacity = 1000 -cooling_down_rate = 2500 -metadata/_custom_type_script = "uid://dxk56xdihfw4m" - [sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_dra6h"] size = Vector2(10, 7) @@ -170,7 +162,7 @@ gravity = Vector3(0, 0, 0) script = ExtResource("2_08si3") sector_angle = 10 Projectile = ExtResource("2_1rrdy") -reloaders = Array[ExtResource("3_08si3")]([SubResource("Resource_1rrdy"), SubResource("Resource_08si3")]) +reloaders = Array[ExtResource("3_08si3")]([SubResource("Resource_1rrdy")]) [node name="Sprite2D" type="Sprite2D" parent="." index="0"] texture = SubResource("PlaceholderTexture2D_dra6h") diff --git a/game/reloaders/energy_reloader.gd b/game/reloaders/energy_reloader.gd deleted file mode 100644 index 63adeed..0000000 --- a/game/reloaders/energy_reloader.gd +++ /dev/null @@ -1,65 +0,0 @@ -extends AbstractReloader -class_name EnergyReloader - - -@export_range(1, 250) var heat_per_shot : int = 1: - set(value): - heat_per_shot = value - _calculate_critical_heat() - - -@export_range(1, 2500) var heat_capacity : int = 1: - set(value): - heat_capacity = value - _calculate_critical_heat() - - -@export_range(1, 5000) var cooling_down_rate : int = 1: - set(value): - cooling_down_rate = value - _calculate_cool() - - -var _cool_per_sec : float -var _cool_per_sec_tenth : float - - -var _heat : float -var _critical_heat : int - - -func _ready() -> void: - _calculate_critical_heat() - _calculate_cool() - - -func process(delta: float) -> void: - if _heat > 0: - _heat -= _cool_per_sec * delta - if _heat < 0: - _heat = 0 - - -func can_shoot() -> bool: - return _heat <= _critical_heat - - -func shoot() -> void: - _heat += heat_per_shot - - -func reload() -> void: - pass - - -func get_process_percent() -> int: - return 100 - int(_heat * 100 / heat_capacity) - - -func _calculate_critical_heat() -> void: - _critical_heat = heat_capacity - heat_per_shot - - -func _calculate_cool() -> void: - _cool_per_sec = cooling_down_rate / 60.0 - _cool_per_sec_tenth = _cool_per_sec / 10 diff --git a/game/reloaders/energy_reloader.gd.uid b/game/reloaders/energy_reloader.gd.uid deleted file mode 100644 index 9505021..0000000 --- a/game/reloaders/energy_reloader.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://dxk56xdihfw4m diff --git a/game/reloaders/magazine_reloader.gd b/game/reloaders/magazine_reloader.gd deleted file mode 100644 index 16f1080..0000000 --- a/game/reloaders/magazine_reloader.gd +++ /dev/null @@ -1,60 +0,0 @@ -extends AbstractReloader -class_name MagazineReloader - - -@export_range(1, 500) var magazine_size : int = 1: - set(value): - magazine_size = value - _calculate_bullets_in_magazine() - - -@export_range(1, 60) var reload_time : int = 1: - set(value): - reload_time = value - _calculate_reload_time_tenth() - - -var _bullets_in_magazine : int -var _reload_time_tenth : float -var _countdown : float - - -func _ready() -> void: - _calculate_bullets_in_magazine() - _calculate_reload_time_tenth() - - -func process(delta: float) -> void: - if _countdown > 0: - _countdown -= delta - if _countdown <= 0: - _bullets_in_magazine = magazine_size - - -func can_shoot() -> bool: - return _countdown <= 0 - - -func shoot() -> void: - if _bullets_in_magazine > 0: - _bullets_in_magazine -= 1 - - if _bullets_in_magazine == 0: - reload() - - -func reload() -> void: - if _countdown > 0 or _bullets_in_magazine == magazine_size: return - _countdown = reload_time - - -func get_process_percent() -> int: - return 100 - int(_countdown * 100 / reload_time) - - -func _calculate_bullets_in_magazine() -> void: - _bullets_in_magazine = magazine_size - - -func _calculate_reload_time_tenth() -> void: - _reload_time_tenth = reload_time / 10.0 diff --git a/game/reloaders/magazine_reloader.gd.uid b/game/reloaders/magazine_reloader.gd.uid deleted file mode 100644 index 08637e6..0000000 --- a/game/reloaders/magazine_reloader.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://d2gfhnlbqxsoq