derekdz/fps_project_1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

starting to fix guns under new script workflow

Browse Source
This commit is contained in:
derek
2025-03-03 16:58:10 -06:00
parent 15f32eff61
commit 6283c6f22f
19 changed files with 309 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
assets/machete.tscn
View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=26 format=4 uid="uid://bshuvj6xeaiiq"]
[ext_resource type="Script" path="res://scripts/melee_weapon.gd" id="1_afuhq"]
[ext_resource type="Script" path="res://scripts/weapon_uberscript.gd" id="1_3j502"]
[ext_resource type="Texture2D" uid="uid://dtjnn8f8165dg" path="res://assets/Models/SubstancePainterTest/machete.blade_BaseColor.png" id="1_n1eld"]
[ext_resource type="Texture2D" uid="uid://1upy05l2sd3o" path="res://assets/Textures/ObjectTextures/Machete.png" id="2_0vbjw"]
[ext_resource type="Texture2D" uid="uid://rglx87b6ctrf" path="res://assets/Models/SubstancePainterTest/machete.blade_Metallic.png" id="2_ktp8c"]
[ext_resource type="Resource" uid="uid://cn6axgvd75xt7" path="res://assets/weaponresources/machete.tres" id="2_vu874"]
[ext_resource type="Shader" path="res://assets/viewmodel_shader.gdshader" id="3_8w0n7"]
[ext_resource type="Texture2D" uid="uid://mcronh7q6ba3" path="res://assets/Models/SubstancePainterTest/machete.blade_Normal.png" id="3_lthmb"]
[ext_resource type="Texture2D" uid="uid://b42jj71wsavpb" path="res://assets/Models/SubstancePainterTest/machete.blade_Roughness.png" id="4_nqv4m"]
@@ -112,7 +112,7 @@ shadow_mesh = SubResource("ArrayMesh_g3fr5")
[sub_resource type="BoxShape3D" id="BoxShape3D_idjup"]
margin = 0.0
size = Vector3(0.15332, 0.0371094, 0.991211)
size = Vector3(0.153, 0.142, 1.336)
[sub_resource type="Animation" id="Animation_bmneo"]
length = 0.001
@@ -178,14 +178,14 @@ tracks/2/path = NodePath(".")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0.1, 0.266667),
"times": PackedFloat32Array(0, 0.8),
"transitions": PackedFloat32Array(1, 1),
"values": [{
"args": [],
"method": &"collider_enable"
"method": &"melee_collider_enable"
}, {
"args": [],
"method": &"collider_disable"
"method": &"melee_collider_disable"
}]
}
tracks/3/type = "audio"
@@ -263,15 +263,12 @@ _data = {
"swap_out": SubResource("Animation_u7d31")
}
[node name="Machete" type="Node3D" node_paths=PackedStringArray("collision_shape", "anim_player", "audio_fire")]
script = ExtResource("1_afuhq")
gun_name = "Machete"
gun_icon = ExtResource("2_0vbjw")
ammo_type = 5
collision_shape = NodePath("MacheteHandle/Area3D/CollisionShape3D")
bullet_damage = 5
[node name="Machete" type="Node3D" node_paths=PackedStringArray("anim_player", "audio_fire", "melee_collision_shape")]
script = ExtResource("1_3j502")
weapon_info = ExtResource("2_vu874")
anim_player = NodePath("AnimationPlayer")
audio_fire = NodePath("Audio/Swing")
melee_collision_shape = NodePath("MacheteHandle/Area3D/CollisionShape3D")
[node name="MacheteHandle" type="Node3D" parent="."]
@@ -285,6 +282,7 @@ skeleton = NodePath("")
transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0.314307, -5.5235e-08, -0.949321, 0.949321, -2.77573e-08, 0.314307, 0, 0.415, -0.0427188)
collision_layer = 128
collision_mask = 232
gravity_scale = 0.0
script = ExtResource("12_u0mbp")
[node name="CollisionShape3D" type="CollisionShape3D" parent="MacheteHandle/Area3D"]