From 65677d8d3a935c9743c4afa0359c7bfc9977f049 Mon Sep 17 00:00:00 2001 From: derek Date: Thu, 10 Apr 2025 10:53:41 -0500 Subject: [PATCH] tweaks to mac 10 and gun look control --- assets/mac_10.tscn | 2 +- assets/player.tscn | 2 +- scripts/leaderboard.gd | 2 +- scripts/player.gd | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/mac_10.tscn b/assets/mac_10.tscn index 365ecb9..2bb6e5d 100644 --- a/assets/mac_10.tscn +++ b/assets/mac_10.tscn @@ -748,7 +748,7 @@ audio_empty = NodePath("Audio/Empty") audio_reload = NodePath("Audio/Reload") [node name="mac10" type="MeshInstance3D" parent="."] -transform = Transform3D(0.00547455, 0.00277349, -0.299937, -0.0256886, 0.298889, 0.00229492, 0.298848, 0.0256413, 0.00569177, -0.0109618, 0.0121364, 9.31208e-05) +transform = Transform3D(0.00547455, 0.00277349, -0.299937, -0.0256886, 0.298889, 0.00229493, 0.298848, 0.0256413, 0.00569177, -0.0109618, 0.0121364, 9.31208e-05) cast_shadow = 0 lod_bias = 10.0 mesh = SubResource("ArrayMesh_pcg38") diff --git a/assets/player.tscn b/assets/player.tscn index e568fb0..4080548 100644 --- a/assets/player.tscn +++ b/assets/player.tscn @@ -223,7 +223,7 @@ collision_mask = 105 collide_with_areas = true [node name="GunLookTarget" type="Marker3D" parent="Head/Recoil/Camera3D/BulletRay"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.265447, 0, -4.48192) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -4.482) [node name="InteractRay" type="RayCast3D" parent="Head/Recoil/Camera3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00322104, -0.0232438) diff --git a/scripts/leaderboard.gd b/scripts/leaderboard.gd index fefd4b2..467adbd 100644 --- a/scripts/leaderboard.gd +++ b/scripts/leaderboard.gd @@ -41,4 +41,4 @@ func load_leaderboard_data(): print("Failed to load document from Firebase") func get_leaderboard_name(): - return "leaderboard_" + str(GameGlobals.all_user_leaderboards[GameGlobals.user_id][GameGlobals.last_leaderboard_id]) + return str(GameGlobals.all_user_leaderboards[GameGlobals.user_id][GameGlobals.last_leaderboard_id]) + "_leaderboard" diff --git a/scripts/player.gd b/scripts/player.gd index 014cb2f..428029e 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -697,8 +697,9 @@ func weapon_tilt(input_x, delta): func weapon_sway(delta): #aim gun at center screen - if !gun_ray.is_colliding(): - gun.look_at(gun_look_target.global_position) + if gun != null: + if !gun_ray.is_colliding(): + gun.look_at(gun_look_target.global_position) #apply sway if !ads: