Fixed weapons scenes inheritance

This commit is contained in:
2025-11-08 02:23:42 +03:00
parent 32fa3dca57
commit 8f7e7aa78f
40 changed files with 277 additions and 412 deletions
@@ -1,12 +1 @@
extends AbstractWeapon
@onready var sprite := $Sprite2D
func _ready() -> void:
var texture := PlaceholderTexture2D.new()
texture.size = Vector2(10, 7)
sprite.texture = texture
super._ready()
+9 -11
View File
@@ -1,28 +1,26 @@
[gd_scene load_steps=8 format=3 uid="uid://cy7g35uoq3ts"]
[gd_scene load_steps=9 format=3 uid="uid://r7wnk762jbfy"]
[ext_resource type="Script" uid="uid://gxwbsiicuqh5" path="res://game/entities/weapons/shrapnel/shrapnel.gd" id="1_xk300"]
[ext_resource type="PackedScene" uid="uid://7pe0un48uedn" path="res://game/entities/weapons/shrapnel/shrapnel_projectile.tscn" id="2_xvd4y"]
[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.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_8lwl1"]
[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_xcpx0"]
[sub_resource type="Resource" id="Resource_nfmol"]
script = ExtResource("5_mw83u")
magazine_size = 35
reload_time = 5
metadata/_custom_type_script = "uid://d2gfhnlbqxsoq"
[node name="Shrapnel" type="Node2D"]
script = ExtResource("1_xk300")
[node name="Shrapnel" instance=ExtResource("1_xk300")]
script = ExtResource("2_1bd18")
bullet_per_shot = 20
sector_angle = 30
Projectile = ExtResource("2_xvd4y")
reloaders = Array[ExtResource("3_tyrw7")]([SubResource("Resource_8lwl1"), SubResource("Resource_xcpx0")])
metadata/_custom_type_script = "uid://dpqxs8hlql2o0"
[node name="Sprite2D" type="Sprite2D" parent="."]
reloaders = Array[ExtResource("3_tyrw7")]([SubResource("Resource_tyrw7"), SubResource("Resource_nfmol")])
@@ -1 +1,18 @@
extends AbstractProjectile
@export var max_distance : int
var _traveled_distance: float
func _physics_process(delta: float) -> void:
super._physics_process(delta)
_process_distance(delta)
func _process_distance(delta: float) -> void:
_traveled_distance += _velocity.length() * delta
if max_distance > 0 and _traveled_distance > max_distance:
queue_free()
@@ -1,23 +1,22 @@
[gd_scene load_steps=4 format=3 uid="uid://7pe0un48uedn"]
[gd_scene load_steps=5 format=3 uid="uid://bsx23u3a2obbj"]
[ext_resource type="Script" uid="uid://ctnje7pjanaws" path="res://game/entities/weapons/shrapnel/shrapnel_projectile.gd" id="1_yu2c6"]
[ext_resource type="PackedScene" uid="uid://ybkqaynvpcjm" path="res://game/entities/weapons/abstract_projectile.tscn" id="1_yu2c6"]
[ext_resource type="Script" uid="uid://ctnje7pjanaws" path="res://game/entities/weapons/shrapnel/shrapnel_projectile.gd" id="2_2jiy6"]
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_yu2c6"]
[sub_resource type="PlaceholderTexture2D" id="PlaceholderTexture2D_2jiy6"]
size = Vector2(4, 4)
[sub_resource type="CircleShape2D" id="CircleShape2D_yu2c6"]
[sub_resource type="CircleShape2D" id="CircleShape2D_2jiy6"]
radius = 1.0
[node name="ShrapnelProjectile" type="CharacterBody2D"]
motion_mode = 1
script = ExtResource("1_yu2c6")
[node name="ShrapnelProjectile" instance=ExtResource("1_yu2c6")]
script = ExtResource("2_2jiy6")
max_distance = 350
damage = 2
speed = 500
max_distance = 120
metadata/_custom_type_script = "uid://ctmjb3nkxrepu"
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = SubResource("PlaceholderTexture2D_yu2c6")
[node name="Sprite2D" parent="." index="0"]
texture = SubResource("PlaceholderTexture2D_2jiy6")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_yu2c6")
[node name="CollisionShape2D" parent="." index="1"]
shape = SubResource("CircleShape2D_2jiy6")