badhouseplants/open-strike-2
4
0
Fork 0
Code Issues 11 Pull Requests 4 Actions Packages Projects 2 Releases Activity

Fix the aiming and bullet creation

Browse Source
This commit is contained in:
Nikolai Rodionov
2025-02-01 18:03:00 +01:00
parent 33f1d57a50
commit bd91818682
19 changed files with 334 additions and 8089 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scenes/weapon/bullet.gd
View File

@ -24,8 +24,7 @@ func _process(delta):
if ray.is_colliding():
var collider = ray.get_collider()
if collider != null and collider.is_in_group("target"):
ray.get_collider().take_damage()
if collider != null and collider.is_in_group("body"):
print(";ala")
ray.get_collider().hit(damage)
rigid_body_3d.visible = false
particles.emitting = true

8
scenes/weapon/bullet.tscn
View File

@ -33,16 +33,17 @@ size = Vector3(0.05, 0.05, 0.05)
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_b8q4c"]
properties/0/path = NodePath(".:position")
properties/0/spawn = true
properties/0/replication_mode = 0
properties/0/replication_mode = 2
properties/1/path = NodePath(".:rotation")
properties/1/spawn = true
properties/1/replication_mode = 0
properties/1/replication_mode = 2
[node name="Bullet" type="Node3D"]
transform = Transform3D(20, 0, 0, 0, 20, 0, 0, 0, 20, 0, 0, 0)
script = ExtResource("1_th28m")
[node name="RigidBody3D" type="RigidBody3D" parent="."]
collision_layer = 8
collision_mask = 9
mass = 0.01
continuous_cd = true
@ -55,6 +56,7 @@ surface_material_override/0 = SubResource("StandardMaterial3D_p8o05")
[node name="RayCast3D" type="RayCast3D" parent="RigidBody3D" groups=["body"]]
exclude_parent = false
target_position = Vector3(0, 0, 2)
collision_mask = 9
hit_back_faces = false
collide_with_areas = true

10
scenes/weapon/guns/ak/gun.tscn
View File

@ -376,6 +376,7 @@ transform = Transform3D(1, 0, 0, 0, 2.22045e-16, -1, 0, 1, 2.22045e-16, 0, 0, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.357561, -0.95657, 0)
[node name="Object_8" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/7_62x39 ak47 mag empty 30rnd (steel)_1"]
layers = 524289
mesh = SubResource("ArrayMesh_profl")
skeleton = NodePath("")
@ -383,6 +384,7 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.29818, 0.183817, 0)
[node name="Object_12" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 muzzle brake_3"]
layers = 524289
mesh = SubResource("ArrayMesh_ipt8e")
skeleton = NodePath("")
@ -390,10 +392,12 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.172215, 0.322283, 0)
[node name="Object_14" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 bolt carrier_4"]
layers = 524289
mesh = SubResource("ArrayMesh_8jual")
skeleton = NodePath("")
[node name="Object_15" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 bolt carrier_4"]
layers = 524289
mesh = SubResource("ArrayMesh_i82ui")
skeleton = NodePath("")
@ -401,16 +405,19 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.41883, 0.422283, 0)
[node name="Object_17" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 back spring_5"]
layers = 524289
mesh = SubResource("ArrayMesh_mrb8o")
skeleton = NodePath("")
[node name="ak-47_6" type="Node3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode"]
[node name="Object_19" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak-47_6"]
layers = 524289
mesh = SubResource("ArrayMesh_lmas3")
skeleton = NodePath("")
[node name="Object_20" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak-47_6"]
layers = 524289
mesh = SubResource("ArrayMesh_pm8es")
skeleton = NodePath("")
@ -418,6 +425,7 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.924381, -0.0946205, 0)
[node name="Object_22" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 trigga_7"]
layers = 524289
mesh = SubResource("ArrayMesh_f3au2")
skeleton = NodePath("")
@ -425,6 +433,7 @@ skeleton = NodePath("")
transform = Transform3D(0.960364, 0.278749, 0, -0.278749, 0.960364, 0, 0, 0, 1, -1.14961, 0.0940101, 0)
[node name="Object_24" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 selector_8"]
layers = 524289
mesh = SubResource("ArrayMesh_d4npm")
skeleton = NodePath("")
@ -432,5 +441,6 @@ skeleton = NodePath("")
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.424757, -0.317383, 0)
[node name="Object_26" type="MeshInstance3D" parent="AK/Sketchfab_model/root/GLTF_SceneRootNode/ak47 mag release_9"]
layers = 524289
mesh = SubResource("ArrayMesh_2fjfa")
skeleton = NodePath("")

112
scenes/weapon/guns/ak/with_hands.tscn
View File

@ -552,6 +552,45 @@ _surfaces = [{
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_he3sr")
[sub_resource type="Animation" id="Animation_plxf0"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Gun:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(1.66932, -0.0888077, -1.97802)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("HandsMount/RightHand:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0.408733, -0.544357, 1.64689)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("HandsMount/LeftHand:position")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(-0.0862075, -0.344845, -1.49729)]
}
[sub_resource type="Animation" id="Animation_7sa0w"]
resource_name = "shot"
length = 0.2
@ -592,45 +631,6 @@ tracks/2/keys = {
"values": [Vector3(-0.0862075, -0.344845, -1.49729), Vector3(-0.086, -0.345, -1.297), Vector3(-0.0862075, -0.344845, -1.49729)]
}
[sub_resource type="Animation" id="Animation_plxf0"]
length = 0.001
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("Gun:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(1.66932, -0.0888077, -1.97802)]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("HandsMount/RightHand:position")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0.408733, -0.544357, 1.64689)]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("HandsMount/LeftHand:position")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(-0.0862075, -0.344845, -1.49729)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_g403t"]
_data = {
"RESET": SubResource("Animation_plxf0"),
@ -650,86 +650,103 @@ transform = Transform3D(-0.0937107, -0.388868, 0, 0.388868, -0.0937107, 0, 0, 0,
[node name="hand" type="MeshInstance3D" parent="HandsMount/RightHand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.121467, -1.86265e-09, 0.916718)
layers = 524289
mesh = SubResource("ArrayMesh_10vpp")
skeleton = NodePath("")
[node name="arm_lower" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.118854, 0.00119257)
layers = 524289
mesh = SubResource("ArrayMesh_6kcxh")
skeleton = NodePath("")
[node name="index_0" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(1, 0, 0, 0, 0.861576, -0.507629, 0, 0.507629, 0.861576, 0.635515, 0, -1.8433)
layers = 524289
mesh = SubResource("ArrayMesh_3xdyo")
skeleton = NodePath("")
[node name="index_1" type="MeshInstance3D" parent="HandsMount/RightHand/hand/index_0"]
transform = Transform3D(1, 0, 0, 0, 0.906566, -0.422065, 0, 0.422065, 0.906566, 0, 0, -0.520542)
layers = 524289
mesh = SubResource("ArrayMesh_jwmbr")
skeleton = NodePath("")
[node name="index_2" type="MeshInstance3D" parent="HandsMount/RightHand/hand/index_0/index_1"]
transform = Transform3D(1, 0, 0, 0, 0.750019, -0.661417, 0, 0.661417, 0.750019, 0.052901, 8.73137e-11, -0.496836)
layers = 524289
mesh = SubResource("ArrayMesh_nx17n")
skeleton = NodePath("")
[node name="middle_0" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.219422, 0, -1.96367)
layers = 524289
mesh = SubResource("ArrayMesh_j4m22")
skeleton = NodePath("")
[node name="middle_1" type="MeshInstance3D" parent="HandsMount/RightHand/hand/middle_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.595449)
layers = 524289
mesh = SubResource("ArrayMesh_p7r5c")
skeleton = NodePath("")
[node name="middle_2" type="MeshInstance3D" parent="HandsMount/RightHand/hand/middle_0/middle_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.576577)
layers = 524289
mesh = SubResource("ArrayMesh_nyf20")
skeleton = NodePath("")
[node name="pinky_0" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.636916, 0, -1.87594)
layers = 524289
mesh = SubResource("ArrayMesh_hv0ce")
skeleton = NodePath("")
[node name="pinky_1" type="MeshInstance3D" parent="HandsMount/RightHand/hand/pinky_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.508631)
layers = 524289
mesh = SubResource("ArrayMesh_c5ym1")
skeleton = NodePath("")
[node name="pinky_2" type="MeshInstance3D" parent="HandsMount/RightHand/hand/pinky_0/pinky_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.484157)
layers = 524289
mesh = SubResource("ArrayMesh_nbpkv")
skeleton = NodePath("")
[node name="ring_0" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.22161, 0, -1.94957)
layers = 524289
mesh = SubResource("ArrayMesh_1xp3n")
skeleton = NodePath("")
[node name="ring_1" type="MeshInstance3D" parent="HandsMount/RightHand/hand/ring_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.578411)
layers = 524289
mesh = SubResource("ArrayMesh_pb3jm")
skeleton = NodePath("")
[node name="ring_2" type="MeshInstance3D" parent="HandsMount/RightHand/hand/ring_0/ring_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.558439)
layers = 524289
mesh = SubResource("ArrayMesh_a0fke")
skeleton = NodePath("")
[node name="thumb_0" type="MeshInstance3D" parent="HandsMount/RightHand/hand"]
transform = Transform3D(-0.555855, -0.801665, -0.69654, 0.994684, -0.11756, -0.658478, 0.372074, -0.883359, 0.719756, 0.490087, 0.180478, -0.34376)
layers = 524289
mesh = SubResource("ArrayMesh_f34xf")
skeleton = NodePath("")
[node name="thumb_1" type="MeshInstance3D" parent="HandsMount/RightHand/hand/thumb_0"]
transform = Transform3D(0.944646, 0, 0.328092, 0, 1, 0, -0.328092, 0, 0.944646, 0.418848, 0, -0.541475)
layers = 524289
mesh = SubResource("ArrayMesh_nwsdf")
skeleton = NodePath("")
[node name="thumb_2" type="MeshInstance3D" parent="HandsMount/RightHand/hand/thumb_0/thumb_1"]
transform = Transform3D(0.566325, -0.514515, 0.643855, 0.815653, 0.461981, -0.348259, -0.118264, 0.72239, 0.681297, 0.286444, 0, -0.397435)
layers = 524289
mesh = SubResource("ArrayMesh_kj4i3")
skeleton = NodePath("")
@ -738,86 +755,103 @@ transform = Transform3D(-0.293062, -0.141858, -0.232359, 0.152991, -0.368212, 0.
[node name="hand" type="MeshInstance3D" parent="HandsMount/LeftHand"]
transform = Transform3D(0.937392, -0.347, -0.0298069, 0.343986, 0.909048, 0.235173, -0.0545093, -0.230702, 0.971497, 0, 0, 0.916718)
layers = 524289
mesh = SubResource("ArrayMesh_10vpp")
skeleton = NodePath("")
[node name="arm_lower" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(0.908992, 0.219435, -0.354375, -0.195894, 0.97536, 0.101481, 0.367911, -0.0228259, 0.92958, 9.53674e-07, -0.118854, 0.00119209)
layers = 524289
mesh = SubResource("ArrayMesh_6kcxh")
skeleton = NodePath("")
[node name="index_0" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.635515, 0, -1.8433)
layers = 524289
mesh = SubResource("ArrayMesh_3xdyo")
skeleton = NodePath("")
[node name="index_1" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/index_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.520542)
layers = 524289
mesh = SubResource("ArrayMesh_jwmbr")
skeleton = NodePath("")
[node name="index_2" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/index_0/index_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.496836)
layers = 524289
mesh = SubResource("ArrayMesh_nx17n")
skeleton = NodePath("")
[node name="middle_0" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.219422, 0, -1.96367)
layers = 524289
mesh = SubResource("ArrayMesh_j4m22")
skeleton = NodePath("")
[node name="middle_1" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/middle_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.595449)
layers = 524289
mesh = SubResource("ArrayMesh_p7r5c")
skeleton = NodePath("")
[node name="middle_2" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/middle_0/middle_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.576577)
layers = 524289
mesh = SubResource("ArrayMesh_nyf20")
skeleton = NodePath("")
[node name="pinky_0" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.636916, 0, -1.87594)
layers = 524289
mesh = SubResource("ArrayMesh_hv0ce")
skeleton = NodePath("")
[node name="pinky_1" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/pinky_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.508631)
layers = 524289
mesh = SubResource("ArrayMesh_c5ym1")
skeleton = NodePath("")
[node name="pinky_2" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/pinky_0/pinky_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.484157)
layers = 524289
mesh = SubResource("ArrayMesh_nbpkv")
skeleton = NodePath("")
[node name="ring_0" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.22161, 0, -1.94957)
layers = 524289
mesh = SubResource("ArrayMesh_1xp3n")
skeleton = NodePath("")
[node name="ring_1" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/ring_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.578411)
layers = 524289
mesh = SubResource("ArrayMesh_pb3jm")
skeleton = NodePath("")
[node name="ring_2" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/ring_0/ring_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.558439)
layers = 524289
mesh = SubResource("ArrayMesh_a0fke")
skeleton = NodePath("")
[node name="thumb_0" type="MeshInstance3D" parent="HandsMount/LeftHand/hand"]
transform = Transform3D(0.456952, 1.05435, -0.341133, -1.08959, 0.360202, -0.346234, -0.202034, 0.442078, 1.09571, 0.624359, -0.289327, -0.480306)
layers = 524289
mesh = SubResource("ArrayMesh_f34xf")
skeleton = NodePath("")
[node name="thumb_1" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/thumb_0"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.418848, 0, -0.541475)
layers = 524289
mesh = SubResource("ArrayMesh_nwsdf")
skeleton = NodePath("")
[node name="thumb_2" type="MeshInstance3D" parent="HandsMount/LeftHand/hand/thumb_0/thumb_1"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.286444, 0, -0.397435)
layers = 524289
mesh = SubResource("ArrayMesh_kj4i3")
skeleton = NodePath("")