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

revolver tweaks

Browse Source
This commit is contained in:
Derek
2024-07-15 23:14:22 -05:00
parent fcd54563a2
commit fe32a00140
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
assets/revolver_1.tscn
View File

@@ -41,7 +41,7 @@ tracks/1/keys = {
[sub_resource type="Animation" id="Animation_21rul"] [sub_resource type="Animation" id="Animation_21rul"]
resource_name = "inspect" resource_name = "inspect"
length = 2.25 length = 3.0
step = 0.01 step = 0.01
tracks/0/type = "value" tracks/0/type = "value"
tracks/0/imported = false tracks/0/imported = false
@@ -50,10 +50,10 @@ tracks/0/path = NodePath("revolver1:position")
tracks/0/interp = 2 tracks/0/interp = 2
tracks/0/loop_wrap = true tracks/0/loop_wrap = true
tracks/0/keys = { tracks/0/keys = {
"times": PackedFloat32Array(0, 0.3, 0.82, 1.12, 1.52, 1.86, 2.25), "times": PackedFloat32Array(0, 0.51, 0.99, 1.4, 1.9, 2.4, 3),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
"update": 0, "update": 0,
"values": [Vector3(0, 0, -0.073), Vector3(-0.573651, 0.207907, -0.190018), Vector3(-0.573651, 0.366341, -0.190018), Vector3(-0.573651, 0.302831, -0.190018), Vector3(-0.386223, 0.302831, -0.185913), Vector3(-0.386223, 0.302831, -0.185913), Vector3(0, 0, -0.073)] "values": [Vector3(0, 0, -0.073), Vector3(-0.574, 0.208, 0.4), Vector3(-0.574, 0.366, 0.4), Vector3(-0.573651, 0.302831, -0.190018), Vector3(-0.386, 0.303, 0.4), Vector3(-0.386, 0.303, 0.4), Vector3(0, 0, -0.073)]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
@@ -62,7 +62,7 @@ tracks/1/path = NodePath("revolver1:rotation")
tracks/1/interp = 2 tracks/1/interp = 2
tracks/1/loop_wrap = true tracks/1/loop_wrap = true
tracks/1/keys = { tracks/1/keys = {
"times": PackedFloat32Array(0, 0.3, 0.82, 1.12, 1.52, 1.86, 2.25), "times": PackedFloat32Array(0, 0.51, 0.99, 1.4, 1.9, 2.4, 3),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1),
"update": 0, "update": 0,
"values": [Vector3(0, 0, -1.5708), Vector3(0.14619, 0.995226, -2.05295), Vector3(0.14619, 0.812874, -2.05295), Vector3(0.14619, 1.0641, -2.05295), Vector3(0.54766, -0.269512, -0.540009), Vector3(0.54766, -0.269512, -0.540009), Vector3(0, 0, -1.5708)] "values": [Vector3(0, 0, -1.5708), Vector3(0.14619, 0.995226, -2.05295), Vector3(0.14619, 0.812874, -2.05295), Vector3(0.14619, 1.0641, -2.05295), Vector3(0.54766, -0.269512, -0.540009), Vector3(0.54766, -0.269512, -0.540009), Vector3(0, 0, -1.5708)]
@@ -82,7 +82,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0, 0.22, 0.4, 0.6, 1.07, 1.33, 1.5, 1.66, 1.82, 1.89, 2.5), "times": PackedFloat32Array(0, 0.22, 0.4, 0.6, 1.07, 1.33, 1.5, 1.66, 1.82, 1.89, 2.5),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
"update": 0, "update": 0,
"values": [Vector3(0, 0, -0.073), Vector3(-1.03159, 1.43363, -0.174336), Vector3(-1.03159, 0.984345, -0.174336), Vector3(-1.27312, 1.15341, -0.515495), Vector3(-1.0066, -0.416256, -0.317969), Vector3(-1.13106, -0.198543, -0.223125), Vector3(-0.58445, 0.0249391, -0.0674842), Vector3(-0.508226, -0.016757, -0.0897506), Vector3(-0.0628345, 0.524388, -0.936215), Vector3(0.187865, 0.65023, -1.11897), Vector3(0, 0, -0.073)] "values": [Vector3(0, 0, -0.073), Vector3(-0.61041, 1.05032, -0.236151), Vector3(-0.4225, 0.657429, -0.251105), Vector3(-1.27312, 1.15341, -0.515495), Vector3(-1.0066, -0.416256, -0.317969), Vector3(-1.13106, -0.198543, -0.223125), Vector3(-0.58445, 0.0249391, -0.0674842), Vector3(-0.508226, -0.016757, -0.0897506), Vector3(-0.0153492, 0.604715, -0.11206), Vector3(0.187865, 0.65023, -0.11897), Vector3(0, 0, -0.073)]
} }
tracks/1/type = "value" tracks/1/type = "value"
tracks/1/imported = false tracks/1/imported = false
@@ -94,7 +94,7 @@ tracks/1/keys = {
"times": PackedFloat32Array(0, 0.22, 0.4, 0.6, 1.07, 1.33, 1.5, 1.66, 1.82, 1.89, 2.5), "times": PackedFloat32Array(0, 0.22, 0.4, 0.6, 1.07, 1.33, 1.5, 1.66, 1.82, 1.89, 2.5),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), "transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1),
"update": 0, "update": 0,
"values": [Vector3(0, 0, -1.5708), Vector3(0.687548, 0.326954, -0.642657), Vector3(1.01821, 0.680476, -0.426182), Vector3(0.903525, 0.852835, -0.569306), Vector3(-0.971497, 0.7422, -1.86723), Vector3(-1.31235, 0.518595, -1.46474), Vector3(-1.38018, 0.534, -1.42873), Vector3(-1.21355, 0.571637, -1.67236), Vector3(-0.0980584, 0.11705, -2.01685), Vector3(0.189279, -0.0229725, -2.20242), Vector3(0, 0, -1.5708)] "values": [Vector3(0, 0, -1.5708), Vector3(0.687548, 0.326954, -0.642657), Vector3(1.01821, 0.680476, -0.426182), Vector3(0.903525, 0.852835, -0.569306), Vector3(-0.971497, 0.7422, -1.86723), Vector3(-1.31235, 0.518595, -1.46474), Vector3(-1.38018, 0.534, -1.42873), Vector3(-1.21355, 0.571637, -1.67236), Vector3(-0.222425, 0.158319, -2.06524), Vector3(0.189279, -0.0229724, -2.20242), Vector3(0, 0, -1.5708)]
} }
tracks/2/type = "value" tracks/2/type = "value"
tracks/2/imported = false tracks/2/imported = false
@@ -250,6 +250,18 @@ tracks/3/keys = {
"update": 0, "update": 0,
"values": [Vector3(1.5708, -1.36174, 0), Vector3(1.5708, -2.10732, 0), Vector3(1.5708, -1.36174, 0)] "values": [Vector3(1.5708, -1.36174, 0), Vector3(1.5708, -2.10732, 0), Vector3(1.5708, -1.36174, 0)]
} }
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("revolver1/Chamber:rotation")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0, 0.03),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector3(1.19209e-07, 1.5708, 1.5708), Vector3(1.0472, 1.5708, 1.5708)]
}
[sub_resource type="Animation" id="Animation_w02ee"] [sub_resource type="Animation" id="Animation_w02ee"]
resource_name = "swap_in" resource_name = "swap_in"
@@ -335,10 +347,11 @@ _data = {
script = ExtResource("2_7rsti") script = ExtResource("2_7rsti")
gun_name = "Ye Ol' Revolver" gun_name = "Ye Ol' Revolver"
fire_mode = 1 fire_mode = 1
recoil_amount = 0.4 recoil_amount = 1.0
max_ammo = 6 max_ammo = 6
start_mags = 4 start_mags = 4
bullet_damage = 5 bullet_damage = 5
bullet_speed = 300
bullet_drop = 0.0 bullet_drop = 0.0
random_spread_amt = 0.1 random_spread_amt = 0.1
chamber = NodePath("revolver1/Chamber") chamber = NodePath("revolver1/Chamber")
@@ -356,7 +369,7 @@ audio_reload = NodePath("Audio/Reload")
transform = Transform3D(-1.81e-06, 0.5, 0, -0.5, -1.80999e-06, 0, 0, 0, 0.5, 0, 0, -0.073) transform = Transform3D(-1.81e-06, 0.5, 0, -0.5, -1.80999e-06, 0, 0, 0, 0.5, 0, 0, -0.073)
[node name="Chamber" parent="revolver1" index="0"] [node name="Chamber" parent="revolver1" index="0"]
transform = Transform3D(1.19209e-07, -1.19209e-07, 1, 1, 0, -1.19209e-07, 0, 1, 1.19209e-07, -0.0143475, 0, -0.0849619) transform = Transform3D(0.866025, 5.85622e-09, 0.5, 0.5, -2.18557e-08, -0.866025, 5.85622e-09, 1, -2.18557e-08, -0.0143475, 0, -0.0849619)
[node name="casing" parent="revolver1/Chamber" index="6"] [node name="casing" parent="revolver1/Chamber" index="6"]
transform = Transform3D(-0.611184, 1.18824e-07, 0.791489, -9.55509e-08, -1, 7.63428e-08, 0.791489, -2.89681e-08, 0.611184, -0.110813, 0.140209, -0.066206) transform = Transform3D(-0.611184, 1.18824e-07, 0.791489, -9.55509e-08, -1, 7.63428e-08, 0.791489, -2.89681e-08, 0.611184, -0.110813, 0.140209, -0.066206)

4
scripts/gun.gd
View File

@@ -86,8 +86,6 @@ func shoot(player,delta):
if !anim_player.is_playing(): if !anim_player.is_playing():
level_control.ammo_current[gun_index] -= 1 level_control.ammo_current[gun_index] -= 1
#RECOIL --- fix later to happen over a period of time #RECOIL --- fix later to happen over a period of time
#player.camera.rotation.x = clamp(lerp(player.camera.rotation.x, player.camera.rotation.x + recoil_amount, delta * 10), deg_to_rad(-90), deg_to_rad(60))
player.weapon_recoil(delta)
#(ADD PLAYER KICK HERE. RELATIVE TO GUN POSITION) #(ADD PLAYER KICK HERE. RELATIVE TO GUN POSITION)
audio_fire.pitch_scale = 1 + rng.randf_range(-fire_pitch_scale_amt,fire_pitch_scale_amt) audio_fire.pitch_scale = 1 + rng.randf_range(-fire_pitch_scale_amt,fire_pitch_scale_amt)
audio_fire.play() audio_fire.play()
@@ -112,7 +110,7 @@ func shoot(player,delta):
instance_casing.position = casing_ejector.global_position instance_casing.position = casing_ejector.global_position
instance_casing.transform.basis = casing_ejector.global_transform.basis instance_casing.transform.basis = casing_ejector.global_transform.basis
get_tree().get_root().add_child(instance_casing) get_tree().get_root().add_child(instance_casing)
player.weapon_recoil(delta)
if fire_mode != 0: if fire_mode != 0:
cycle_count -= 1 cycle_count -= 1

4
scripts/revolver_1.gd
View File

@@ -85,7 +85,6 @@ func shoot(player,delta):
level_control.ammo_current[gun_index] -= 1 level_control.ammo_current[gun_index] -= 1
#RECOIL --- fix later to happen over a period of time #RECOIL --- fix later to happen over a period of time
#player.camera.rotation.x = clamp(lerp(player.camera.rotation.x, player.camera.rotation.x + recoil_amount, delta * 10), deg_to_rad(-90), deg_to_rad(60)) #player.camera.rotation.x = clamp(lerp(player.camera.rotation.x, player.camera.rotation.x + recoil_amount, delta * 10), deg_to_rad(-90), deg_to_rad(60))
player.weapon_recoil(delta)
#(ADD PLAYER KICK HERE. RELATIVE TO GUN POSITION) #(ADD PLAYER KICK HERE. RELATIVE TO GUN POSITION)
audio_fire.pitch_scale = 1 + rng.randf_range(-fire_pitch_scale_amt,fire_pitch_scale_amt) audio_fire.pitch_scale = 1 + rng.randf_range(-fire_pitch_scale_amt,fire_pitch_scale_amt)
audio_fire.play() audio_fire.play()
@@ -104,8 +103,9 @@ func shoot(player,delta):
instance_bullet.instance_bullethole = bullethole.instantiate() instance_bullet.instance_bullethole = bullethole.instantiate()
instance_bullet.gun = self instance_bullet.gun = self
get_tree().get_root().add_child(instance_bullet) get_tree().get_root().add_child(instance_bullet)
player.weapon_recoil(delta)
# chamberspin transform # chamberspin transform
#chamber.rotate.x = #DO SOMETHING HERE
if fire_mode != 0: if fire_mode != 0:
cycle_count -= 1 cycle_count -= 1