FINISHED DAMN DROP SYSTEM

This commit is contained in:
Rendo 2025-11-28 18:03:30 +05:00
commit 100afe5e51
17 changed files with 151 additions and 25 deletions

View file

@ -256,9 +256,10 @@ script = ExtResource("12_fulsm")
player = NodePath("../..")
SPEED = 5.0
[node name="WeaponSystem" type="Node" parent="." node_paths=PackedStringArray("default_pistol", "animation_player", "camera", "player")]
[node name="WeaponSystem" type="Node" parent="." node_paths=PackedStringArray("default_pistol", "default_knife", "animation_player", "camera", "player")]
script = ExtResource("4_qlg0r")
default_pistol = NodePath("StartingPistol")
default_knife = NodePath("KnifePlaceholder")
animation_player = NodePath("../Camera3D/molikman_hands/AnimationPlayer")
camera = NodePath("../Camera3D")
player = NodePath("..")
@ -268,6 +269,11 @@ player = NodePath("..")
[node name="Shoot" parent="WeaponSystem/StartingPistol" index="1" node_paths=PackedStringArray("raycast")]
raycast = NodePath("../../../Camera3D/RayCast3D")
[node name="KnifePlaceholder" parent="WeaponSystem" instance=ExtResource("7_fjrip")]
[node name="Shoot" parent="WeaponSystem/KnifePlaceholder" index="1" node_paths=PackedStringArray("raycast")]
raycast = NodePath("../../../Camera3D/RayCast3D")
[node name="WeaponSpawner" type="MultiplayerSpawner" parent="WeaponSystem"]
spawn_path = NodePath("..")
@ -298,3 +304,4 @@ shape = SubResource("CapsuleShape3D_3xmak")
[editable path="Camera3D/molikman_hands"]
[editable path="WeaponSystem/StartingPistol"]
[editable path="WeaponSystem/KnifePlaceholder"]

View file

@ -1,16 +1,16 @@
[gd_scene load_steps=4 format=3 uid="uid://bxdatd1ilfgmc"]
[gd_scene load_steps=3 format=3 uid="uid://bxdatd1ilfgmc"]
[ext_resource type="Script" uid="uid://e6lqknfl4ngt" path="res://scripts/weapon_system/weapon_substate_machine.gd" id="1_krsgt"]
[ext_resource type="PackedScene" uid="uid://dftij0fdq3lbr" path="res://models/weapons/Bomb.glb" id="2_1x0so"]
[ext_resource type="Script" uid="uid://rx78vdadldm7" path="res://scripts/weapon_system/bomb/bomb_state.gd" id="2_870cc"]
[node name="Bomb" type="Node" node_paths=PackedStringArray("enter_state")]
script = ExtResource("1_krsgt")
animation_prefix = &"baked_bomb_"
model = ExtResource("2_1x0so")
droppable = &"uid://cxdgk74ln5xpn"
visibility_target = &"bomb"
max_ammo = 1
can_be_previous = false
destroy_when_empty = true
enter_state = NodePath("Main")
metadata/_custom_type_script = "uid://e6lqknfl4ngt"

View file

@ -0,0 +1,35 @@
[gd_scene load_steps=6 format=3 uid="uid://dgfqppi21c2u0"]
[ext_resource type="Script" uid="uid://cskgqgkr7pmb0" path="res://scripts/weapon_system/dropped_weapon.gd" id="1_jym52"]
[ext_resource type="PackedScene" uid="uid://djwjl8xll53vn" path="res://scenes/weapons/starting_pistol.tscn" id="2_jym52"]
[ext_resource type="PackedScene" uid="uid://d3sjs6efbshpk" path="res://models/weapons/starting_pistol.glb" id="3_jym52"]
[sub_resource type="BoxShape3D" id="BoxShape3D_hsebh"]
size = Vector3(0.07324219, 0.25274658, 0.46972656)
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_ddvbd"]
properties/0/path = NodePath(".:position")
properties/0/spawn = true
properties/0/replication_mode = 1
properties/1/path = NodePath(".:rotation")
properties/1/spawn = true
properties/1/replication_mode = 1
[node name="DroppableStartingPistol" type="RigidBody3D" node_paths=PackedStringArray("weapon")]
collision_layer = 8
collision_mask = 9
script = ExtResource("1_jym52")
slot = &"secondary"
weapon = NodePath("StartingPistol")
team = 3
[node name="StartingPistol" parent="." instance=ExtResource("2_jym52")]
[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -3.0517578e-05, 0.0010986328)
shape = SubResource("BoxShape3D_hsebh")
[node name="MultiplayerSynchronizer" type="MultiplayerSynchronizer" parent="."]
replication_config = SubResource("SceneReplicationConfig_ddvbd")
[node name="starting_pistol" parent="." instance=ExtResource("3_jym52")]

View file

@ -1,7 +1,6 @@
[gd_scene load_steps=9 format=3 uid="uid://djwjl8xll53vn"]
[gd_scene load_steps=8 format=3 uid="uid://djwjl8xll53vn"]
[ext_resource type="Script" uid="uid://e6lqknfl4ngt" path="res://scripts/weapon_system/weapon_substate_machine.gd" id="1_g7s1i"]
[ext_resource type="PackedScene" uid="uid://d3sjs6efbshpk" path="res://models/weapons/starting_pistol.glb" id="2_016ti"]
[ext_resource type="Script" uid="uid://ofv4e3dsfe8" path="res://scripts/weapon_system/gun/idle_state.gd" id="2_cmn6f"]
[ext_resource type="Script" uid="uid://vj13r83l3xyq" path="res://scripts/weapon_system/gun/semi_auto_shoot_state.gd" id="3_016ti"]
[ext_resource type="Script" uid="uid://hmekwp8444ao" path="res://scripts/weapon_system/gun/reload_state.gd" id="4_hoqxt"]
@ -22,7 +21,7 @@ point_count = 5
[node name="StartingPistol" type="Node" node_paths=PackedStringArray("enter_state")]
script = ExtResource("1_g7s1i")
animation_prefix = &"baked_sp_"
model = ExtResource("2_016ti")
droppable = &"uid://dgfqppi21c2u0"
visibility_target = &"sp"
max_ammo = 20
enter_state = NodePath("Intro")