From 24df81424bd017c1e24535bceec1130d9ed693d9 Mon Sep 17 00:00:00 2001
From: Franklin <franklinblanco@tutanota.com>
Date: Thu, 23 Nov 2023 17:28:48 -0400
Subject: [PATCH] High ready + Low ready system. With animations and logic
 flows with sprinting, shooting, reloading, and aiming

---
 Design.md                                |   7 ++-
 assets/character/main_character.glb      | Bin 49370308 -> 49370308 bytes
 src/comps/core/controller.rs             |   5 ++-
 src/logic/core/guns/inspect.rs           |  31 +++++++++++++
 src/logic/core/guns/mod.rs               |   1 +
 src/logic/core/guns/player_firing.rs     |  11 +++++
 src/logic/core/guns/shoot.rs             |  34 +++++++-------
 src/logic/core/player/hands.rs           |  55 +++++++++++++++++++----
 src/logic/core/player/player_movement.rs |  18 +++++---
 src/logic/core/player/player_settings.rs |   7 ++-
 src/scenes/scene1/init.rs                |   3 +-
 src/setup/equipment.rs                   |   9 ++++
 12 files changed, 145 insertions(+), 36 deletions(-)
 create mode 100644 src/logic/core/guns/inspect.rs

diff --git a/Design.md b/Design.md
index 8188716..b33e27f 100644
--- a/Design.md
+++ b/Design.md
@@ -23,12 +23,17 @@ Multiplayer
         - [x] Snap back leaning too quick
         - [x] Issue with moving around quickly
     - [x] Bring Crouching back
-- [ ] Inspect animation (procedural)
+- [x] Inspect animation & state (procedural)
+    - [ ] Attachment editor system when in inspect mode
+- [x] High Ready & Low Ready system with state
+    - [x] High ready animation (procedural)
+    - [x] Low ready animation (procedural)
 - [ ] Reload animation (procedural)
     - [ ] Real world magazines
 - [ ] Rewriting bullet physics to use raycasts & kinematic rigidbodies (logic controlled)
 - [ ] Low Ready & High ready (low ready == more speed | high ready == more accuracy)
     - [ ] Auto Low ready when gun collider hits object OR when player starts sprinting
+- [ ] Create a Controls struct that holds mappings to all the game keys and replace them in all the game's code
 
 
 # Design
diff --git a/assets/character/main_character.glb b/assets/character/main_character.glb
index 986337b3eeb1fe9783929846d722ed9ef1473503..50445edb695df4d570c39ec82469e52bca3cba90 100644
GIT binary patch
delta 3557
zcmXBUQ*amx5J1ssYTLHkG)>c{wr$(CZQHhOGqsW0cAu?#=k3frvw!=yVVlk-4Wpg=
z!qOHD4Gjqm4h+c`R47+qo}j@0Cn&T~U{L;`px`m#VH3i`B2WNDq(~I`KzLY`0huRM
z`51+wQZ$NAF(@X*qSzFN;!-?{PYEa?C8ETXgpyJ+N=_*#C8eU&l!nq$I!aF&C?jPe
z?`NT`l#Q}e4$4WnC^zMyyc9_JD2Vb?FcqK>DoBMWlnPT3DoVwuIF+E1REkPd87fQV
zs617mid2azQx&R8)u=kvpqf;RYEvDmOZBKeHK2ynh#FH9YD&$hIkljc)QVbD8){4K
zs6BO{j?{@dQy1z=-KabDpq|u=dQ%_jOZ})n4WNNEhz8RT8cM@xIE|o@G>S&k7#d6C
zXgp1zi8P5O(-fLY(`Y))pqVs_X44#+OY>+xEue+8h!)clT1v}kIjx|Tw2D^K8d^*1
zXgzJ9jkJk2(-zuF+h{xOpq;dfcGDi(OZ#X)9iW4Bhz`>cI!edrIGv!Abc#;X849Db
zbdJu`1-eL==rUcQt8|U7(+#>wx9B$Ap>VoO_vk)7pojE`9@7(gO3&yyy`Y!$ieA$j
zdQ0!<J$;~$^oc&x7y3%y=sWtJexM)eC;FLwp<n4Y`knruKj|;}oBpAHr&ReEVFpQn
zM3hJpS)xc(i6+q{hQyRu5?kU(T!|;~C4nTAM3PvNNK#2A$t8uPlvI*h(nwlKC+Q`F
zWRy&jS+Yo0$tKw)hvbx8l3VgfUI~<Z5+wO0SPDpp6qG^|Dutzp6qRC9TuMkuDJ7+)
zjFgpfQeG-ZMX4l}rHWLQYEoTlNKL6FwWW^Km3mTN8c0KFB#otsG?ix3Tv|v=X(g?t
zjkJ|^(q1}9N9iP;rHgcxZqi+PNKfe{y`_)zm44D+2FO4eB!gv$43%LrTt>)986~4-
zjEt3WGF~RgM42R$Wr|FdX);}A$V{0fvt^FVm3cB>7RW+bB#UK<ER|)lTvo_RStYAw
zjjWY*vR*dGM%g5rWs7W;ZL(c<$WGZMyJe5;m3^{b4#+_{B!}gQ9F=2oTu#VIIVGp%
zjD*QqIVb1kf?SkKa#^m(Rk<eD<%ZmpTXI|ONVwdUdvaeM$U}J~kL8Ixm1pu?UdT&%
zC9ma;yp?zIUOvc2`6Qp^i+q)D@|}DyKgf^rll&~d$glF7{4RgUpYoUdE&s^B5qN(A
zED<C?B1$BQEKww?M3d+eLt;uSi7jy?uEdl0l0XtlB1tSsB&j5m<dQ;CN-9Y$X(X+r
zlk}27GD;@NELkM0WRvWYLvl(k$t`&#uLMdy36lI0ECnP)3Q8dfmBLa)ib^plE+wR-
zl#<d?M#@S#DK8bIqEwQ~QbnptHK{H&q^8u8+EPdAN<FDB4WywolE%_Rno2WiE-j>`
zw361+M%qd{X)hh5qjZwa(nY#TH|Z`tq^I<f-qJ_<N<Zl@17x5KlEE@WhRQG*E+b^5
zjFQnZM#joG87~uLqD+#>GDW7!G?^|lWTwoL*)m7w$~>7b3uK`zlEtz_mdY|&E-PfE
ztdiBTM%KzYSuY!8qimARvPHJaHrXyaWT)(s-Lgma%0AgI2jrj}lEZRDj><7PE+^!q
zoRZUWM#AK*oRjl%K`zQAxhz-Ys$7%nazk#)Ex9dsBwX&wJ-IIr<e@y0$MQs;$}@Q`
kFXW}XlGpM^-pV_9FCXNie3H-dMZU_nfD^pGfI*%A12D<34FCWD

delta 3558
zcmWmEQ+N;z7)SA^W!tuEtJSt_+qP}v%eHOX_Off)c73+axj4V)y?gKe;hWAT52u~`
z!ZU;h7bqMU793cpP*7-|z<fa=g~I}a3WNrRhJ=NM1Q!e$6A?ZkB0LfWP-KciQ4d6f
zM;n-RLbZ?4C_2TUm=ud*Qyhv*@hCnepoEl&5>paNO35fWrJ$6Qic(V=N=xY|J!PPb
zl!-D^7V>{K%1${bC*`8tl!x+CKFUvl6hsB6AO%w)Doi01N?}xlic&EuP9>-$m7>yA
zhRRYoDo+)tB2}WwRE4TiHL6ZEs3z5-+Ej<?Qa!3q4X7bCqQ=yOno=`rPA#Y<wW8M4
zhT2j)YEK=gBXy$A)P=fIH|kD3s3-NJ-qeTsQa|cX185)(qQNwThSD$^P9ta}eMh5c
zG>xILG>*p81e!>bXfjQqsWgqI(+rwPvuHNWp}91V=F<XNNQ-DOEup2fjF!_1T1l&D
zHLanww2s!(2HHrQXfti0t+b7{(+=86yJ$D<p}n+^_R|46NQdY!9igLijE>U@I!UMK
zG@YSvI!ov1JYArRbcrt06}n2-=sMk?n{<nAQv}_iyL6B4(*t@)kLWQyp{MkWp3@6@
zNw4TNy`i`Cj^5J;`beMXGku}2^o_o!ALvK=iGHSE=vVrUey2a^Px_1grhn*P`fp0L
zkCA4O1W06wB2gupM3)#6Q({SMi6e0(p2U{~l28&!Vo4%NC7C3b6p~U>Noq+WX(gSc
zmkg3oGD&91B3UJyWS1P0Q*ude$s>6spX8T736cU*P=ck96qXPPl`ttHMWvV&ml9G^
zN=a!cBW0zWl$Q!pQ7TDgsUlUSnpBq>Qd4S4ZK)%5rJmH62GUR(Nn>duO{JMMmlo1e
zT1jhZBW<Ofw3iOjQ94Oy=^|aFn{<~R(o=d#Z|Ng_rJwYd0Wweq$zT~GLuHr@mk}~j
zzLQZhTE@s&87Jdqf=rZ2GFhg`RGB8zWroa@Su$JZ$XuBx^JRf7ltr>wmdH|BCd*}o
ztdv!<TGq%~StsjdgKU&dvRSssR@o-oWrysPU9wyD$X?ke`{jTfltXe@j>u6tCdcK3
zoRm{?TFywgoRxEOUM|Q*xg?k6id>aza$Ro7O}QnvB|`4VUAZUs<$*kuNAg&n$WwVH
z&*g=@lvnav-pE^dC-3Ehe3Vb}S-!|u`6l1X5Avh@BtOe9@~iwNzsn!;r~D;<%Rln3
z{1=J&3*d+(0TNlFNK}a?(Itk&lvom5;z(SHC-EhLB$PywSdvImNhZl9g`|{Jl3LP8
zT1hAAC4*#?Op;l$NLI-v*(HbMlw6Wq@<?9EC;25%f~0^Hlwc_&g(XBnB}|G)Q7I<H
zrG%7}Qc_yVNLeW-<)wmDluA-rsz_C-Ce@{e)RbCMTk1$%sVDWNfi#px(pZ{EQ)wp6
zrG>PVR?=G9NLy(q?WKcslupuFx=2^)Cf%in^psxGTlz>}=_mbVfDDvDGFXPlP#Gq}
zWrU2B?_`vWmN7C`#>se@AQNShOqMA!Ri?>wnISV}mdutpGFRrwd|4n1WsxkFC9+hO
z$#PjCD`l0emNl|g*2#L=ARA?qY?dvuRkq1?*&#b+m+Y23vRC%WemNiq<&YefBXU%Z
z$#FR$C*_o!mNODAXXTunmkV-HF3DxNB3I>_T$dYiQ*Oy^iI6*TSMJGuc_0tvkvx_s
p@>HJ5b9o^z<(0gaH}Y2A$$R-AALWyLmM`*Ez6G3M{sIPd`5(Z+vrYg2

diff --git a/src/comps/core/controller.rs b/src/comps/core/controller.rs
index e36e066..fd6656f 100644
--- a/src/comps/core/controller.rs
+++ b/src/comps/core/controller.rs
@@ -2,12 +2,12 @@ use bevy::prelude::*;
 use bevy_rapier3d::prelude::*;
 
 use crate::{
-    logic::core::player::{
+    logic::core::{player::{
         player_movement::{
             move_player, PlayerLinearXZState, PlayerLinearYState, PlayerMovementInput,
         },
         player_values_state::PlayerValuesState,
-    },
+    }, guns::player_firing::PlayerFiringInfo},
     ui::game::game_ui_state::GameUiState,
 };
 
@@ -24,6 +24,7 @@ pub fn capture_input(
             &mut PlayerLinearXZState,
             &mut Transform,
             &mut Damping,
+            &mut PlayerFiringInfo,
         ),
         With<Player>,
     >,
diff --git a/src/logic/core/guns/inspect.rs b/src/logic/core/guns/inspect.rs
new file mode 100644
index 0000000..b5656ad
--- /dev/null
+++ b/src/logic/core/guns/inspect.rs
@@ -0,0 +1,31 @@
+use bevy::prelude::*;
+
+use crate::comps::core::markers::{proxy::{character::in_player_hands_parent::InPlayerHandsParent, physics::utils::TransformExt}, player::Player};
+
+use super::player_firing::PlayerFiringInfo;
+
+
+
+pub fn inspect_firearm(
+    //mut commands: Commands,
+    mut in_player_hands_parent_query: Query<&mut Transform, With<InPlayerHandsParent>>,
+    mut player_firing_info_query: Query<&mut PlayerFiringInfo, With<Player>>,
+    time: Res<Time>,
+    keyboard_input: Res<Input<KeyCode>>,
+) {
+    for mut player_firing_info in player_firing_info_query.iter_mut() {
+        for mut in_player_hands_parent_transform in in_player_hands_parent_query.iter_mut() {
+            if player_firing_info.is_inspecting {
+                let inspect_hand_transform: Transform = Transform {
+                    translation: Vec3 { x: 0.0, y: -0.1, z: -0.8 },
+                    rotation: Quat::from_euler(EulerRot::XYZ, -2.6, -1.0, -2.5),
+                    ..Default::default()
+                };
+                *in_player_hands_parent_transform = in_player_hands_parent_transform.lerp(inspect_hand_transform, time.delta_seconds() / 0.5);
+                if keyboard_input.just_pressed(KeyCode::Return) {
+                    player_firing_info.is_inspecting = false;
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/logic/core/guns/mod.rs b/src/logic/core/guns/mod.rs
index 9676614..c9aba0e 100644
--- a/src/logic/core/guns/mod.rs
+++ b/src/logic/core/guns/mod.rs
@@ -1,3 +1,4 @@
 pub mod despawn_shots;
 pub mod player_firing;
 pub mod shoot;
+pub mod inspect;
\ No newline at end of file
diff --git a/src/logic/core/guns/player_firing.rs b/src/logic/core/guns/player_firing.rs
index 80f1d8b..c284472 100644
--- a/src/logic/core/guns/player_firing.rs
+++ b/src/logic/core/guns/player_firing.rs
@@ -2,6 +2,13 @@ use std::time::Duration;
 
 use bevy::prelude::*;
 
+#[derive(Reflect, Default, PartialEq, Eq, PartialOrd, Ord, Clone)]
+pub enum GunReadyPose {
+    #[default]
+    LowReady,
+    HighReady,
+}
+
 #[derive(Component, Reflect)]
 #[reflect(Component)]
 pub struct PlayerFiringInfo {
@@ -15,6 +22,8 @@ pub struct PlayerFiringInfo {
     pub current_round_index: usize,
     pub full_auto_timer: Timer,
     pub is_reloading: bool,
+    pub gun_ready_pose: GunReadyPose,
+    pub is_inspecting: bool,
 }
 
 impl Default for PlayerFiringInfo {
@@ -25,6 +34,8 @@ impl Default for PlayerFiringInfo {
             current_round_index: Default::default(),
             full_auto_timer: Timer::new(Duration::from_secs_f32(0.0), TimerMode::Repeating),
             is_reloading: false,
+            gun_ready_pose: GunReadyPose::LowReady,
+            is_inspecting: false,
         }
     }
 }
diff --git a/src/logic/core/guns/shoot.rs b/src/logic/core/guns/shoot.rs
index 4cef11d..8ffe621 100644
--- a/src/logic/core/guns/shoot.rs
+++ b/src/logic/core/guns/shoot.rs
@@ -38,24 +38,26 @@ pub fn shoot_bullet(
         },
         MuzzleFlashMarker(Timer::new(Duration::from_millis(10), TimerMode::Once)),
     ));
-    // Spawn Line
 
-    commands.spawn(
-        MaterialMeshBundle {
-            mesh: {
-                let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
-                mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, Vec::from([Vec3::ZERO, forward * caliber.range()]));
-                meshes.add(mesh)
-            },
-            material: materials.add(StandardMaterial {
-                base_color: Color::GREEN,
+    // Spawn Line
+    if player_settings.shot_lines_enabled {
+        commands.spawn(
+            MaterialMeshBundle {
+                mesh: {
+                    let mut mesh = Mesh::new(PrimitiveTopology::LineStrip);
+                    mesh.insert_attribute(Mesh::ATTRIBUTE_POSITION, Vec::from([Vec3::ZERO, forward * caliber.range()]));
+                    meshes.add(mesh)
+                },
+                material: materials.add(StandardMaterial {
+                    base_color: Color::GREEN,
+                    ..Default::default()
+                }),
+                visibility: Visibility::Visible,
+                transform: firing_point,
                 ..Default::default()
-            }),
-            visibility: Visibility::Visible,
-            transform: firing_point,
-            ..Default::default()
-        }
-    );
+            }
+        );
+    }
 
     spawn_bullet(
         commands,
diff --git a/src/logic/core/player/hands.rs b/src/logic/core/player/hands.rs
index 2894b58..066dad1 100644
--- a/src/logic/core/player/hands.rs
+++ b/src/logic/core/player/hands.rs
@@ -1,4 +1,4 @@
-use bevy::{ecs::system::SystemParam, prelude::*, gltf::Gltf};
+use bevy::{ecs::system::SystemParam, prelude::*, gltf::Gltf, input::mouse::MouseWheel};
 use bevy_rapier3d::prelude::*;
 
 use crate::{
@@ -9,10 +9,10 @@ use crate::{
             camera::MainCamera,
             holdable::InPlayerHands,
             interactable::Interactable,
-            player::Player, proxy::{character::in_player_hands_parent::InPlayerHandsParent, physics::rapier::LinkToPlayer},
+            player::Player, proxy::{character::in_player_hands_parent::InPlayerHandsParent, physics::{rapier::LinkToPlayer, utils::TransformExt}},
         }, weapons::{firearm::Firearm, firearm_state::FirearmState, parts::firing_point::FiringPoint},
     },
-    logic::core::guns::{player_firing::PlayerFiringInfo, shoot::shoot_bullet},
+    logic::core::guns::{player_firing::{PlayerFiringInfo, GunReadyPose}, shoot::shoot_bullet},
     setup::{
         equipment::{Equipment, EquipmentChangeEvent},
         load_state::GameLoadState, assets::GltfAssets, //animations::AllAnimations,
@@ -21,7 +21,7 @@ use crate::{
     utils::{rad_deg::radians_from_degrees, hierarchy::find_child_in_parent_children},
 };
 
-use super::player_settings::PlayerSettings;
+use super::{player_settings::PlayerSettings, player_movement::PlayerLinearXZState};
 
 #[derive(SystemParam)]
 pub struct CaptureHandUsageResourcesParams<'w> {
@@ -45,7 +45,7 @@ pub struct CaptureHandUsageQueryParams<'w, 's> {
     in_hand_query: Query<'w, 's, (&'static Parent, &'static mut Transform), (With<InPlayerHands>, Without<InPlayerHandsParent>, Without<PlayerInventory>)>,
     firearms_query: Query<'w, 's, (Entity, &'static GlobalTransform, &'static Firearm, &'static mut FirearmState),>,
     firing_point_query: Query<'w, 's, (&'static GlobalTransform, &'static Parent), With<FiringPoint>>,
-    player_query: Query<'w, 's, (&'static Player, &'static mut PlayerInventory, Entity, &'static Transform, &'static mut PlayerFiringInfo), Without<InPlayerHands>>,
+    player_query: Query<'w, 's, (&'static Player, &'static mut PlayerInventory, Entity, &'static Transform, &'static mut PlayerFiringInfo, &'static PlayerLinearXZState), Without<InPlayerHands>>,
     children: Query<'w, 's, &'static Children>,
 }
 
@@ -58,6 +58,7 @@ pub fn capture_hand_usage(
 
     mut equipment_change_event_writer: EventWriter<EquipmentChangeEvent>,
     mut inventory_changed_events: EventWriter<PlayerInventoryChangedEvent>,
+    mut mouse_wheel_events: EventReader<MouseWheel>,
 ) {
     if !resources.game_load_state.player_loaded {
         return;
@@ -65,9 +66,32 @@ pub fn capture_hand_usage(
 
     // Equipping stuff
 
-    for (player, mut player_inventory, player_entity, player_transform, mut player_firing_info) in queries.player_query.iter_mut() {
+    for (player, mut player_inventory, player_entity, player_transform, mut player_firing_info, player_linear_xz_state) in queries.player_query.iter_mut() {
         // Equipping gun
         // Validate player has primary item, and secondary item in inventory
+        if player_firing_info.is_inspecting {
+            continue;
+        }
+        for (mut hand_transform, _) in queries.hand_query.iter_mut() {
+            let default_hand_transform: Transform = match player_firing_info.gun_ready_pose {
+                GunReadyPose::LowReady => {
+                    Transform {
+                        translation: Vec3 { x: -0.2, y: -0.3, z: -0.8 },
+                        rotation: Quat::from_euler(EulerRot::XYZ, -3.6, -0.6, -3.3),
+                        ..Default::default()
+                    }
+                },
+                GunReadyPose::HighReady => {
+                    Transform {
+                        translation: Vec3 { x: 0.039, y: -0.193, z: -0.453 },
+                        rotation: Quat::from_euler(EulerRot::XYZ, -180.0f32.to_radians(), 0.0, -180.0f32.to_radians()),
+                        ..Default::default()
+                    }
+                },
+            };
+            *hand_transform = hand_transform.lerp(default_hand_transform, resources.time.delta_seconds() / 0.25);
+        }
+        
         if !resources.game_ui_state.any_window() && !player_firing_info.is_reloading {
             if resources.keyboard_input.just_pressed(KeyCode::Key1) {
                 if let Some(primary_item) = player_inventory.get_primary() {
@@ -113,6 +137,20 @@ pub fn capture_hand_usage(
                     },
                     None => {},
                 }
+            } else if resources.keyboard_input.just_pressed(KeyCode::I) {
+                if player.0.equipment.is_firearm() {
+                    player_firing_info.is_inspecting = true;
+                }
+            } else if !mouse_wheel_events.is_empty() {
+                if player.0.equipment.is_firearm() {
+                    for mouse_wheel_event in mouse_wheel_events.read() {
+                        if mouse_wheel_event.y >= 0.0 {
+                            player_firing_info.gun_ready_pose = GunReadyPose::HighReady;
+                        } else {
+                            player_firing_info.gun_ready_pose = GunReadyPose::LowReady;
+                        }
+                    }
+                }
             }
         }
 
@@ -158,8 +196,9 @@ pub fn capture_hand_usage(
                                     }
                                 };
                                 if resources.mouse_buttons.pressed(MouseButton::Right)
-                                    && !resources.game_ui_state.any_window()
+                                    && !resources.game_ui_state.any_window() && !player_linear_xz_state.is_sprinting()
                                 {
+                                    player_firing_info.gun_ready_pose = GunReadyPose::HighReady;
                                     let rotation_lerp_quat = in_hand_transform.rotation.lerp(
                                         firearm_data.final_aimed_rotation + resources.player_settings.rot_aimed_offset,
                                         (resources.time.delta_seconds()
@@ -191,7 +230,7 @@ pub fn capture_hand_usage(
         
                                 // SHOOTING & RECOIL
                                 if resources.mouse_buttons.pressed(MouseButton::Left)
-                                    && !resources.game_ui_state.any_window()
+                                    && !resources.game_ui_state.any_window() && player_firing_info.gun_ready_pose == GunReadyPose::HighReady
                                 {
                                     if let Some(magazine_data) = &mut firearm_state.magazine_data {
                                         if player_firing_info.full_auto_timer.finished() {
diff --git a/src/logic/core/player/player_movement.rs b/src/logic/core/player/player_movement.rs
index afd9d67..8e3054d 100644
--- a/src/logic/core/player/player_movement.rs
+++ b/src/logic/core/player/player_movement.rs
@@ -1,7 +1,7 @@
 use bevy::prelude::*;
 use bevy_rapier3d::prelude::*;
 
-use crate::comps::core::markers::player::Player;
+use crate::{comps::core::markers::player::Player, logic::core::guns::player_firing::{PlayerFiringInfo, GunReadyPose}};
 
 use super::player_values_state::PlayerValuesState;
 
@@ -111,6 +111,7 @@ pub fn move_player(
             &mut PlayerLinearXZState,
             &mut Transform,
             &mut Damping,
+            &mut PlayerFiringInfo,
         ),
         With<Player>,
     >,
@@ -124,16 +125,21 @@ pub fn move_player(
         mut player_linear_xz_state,
         player_transform,
         mut player_damping,
+        mut player_firing_info,
     ) in &mut query
     {
+        if player_linear_xz_state.is_sprinting() {
+            player_firing_info.gun_ready_pose = GunReadyPose::LowReady;
+        }
         if player_movement_input.down {
             player_linear_xz_state.toggle_crouch(time.elapsed().as_secs_f32());
         }
-        let crouch_multiplier = if player_linear_xz_state.is_crouched() {
-            player_values_state.player_crouch_speed_multiplier
-        } else {
-            1.0
-        };
+        let crouch_multiplier = 
+            if player_linear_xz_state.is_crouched() {
+                player_values_state.player_crouch_speed_multiplier
+            } else {
+                1.0
+            };
         let sprint_multiplier =
             if player_movement_input.sprint && !player_linear_xz_state.is_crouched() {
                 player_values_state.player_sprint_speed_multiplier
diff --git a/src/logic/core/player/player_settings.rs b/src/logic/core/player/player_settings.rs
index 200747c..9fd0011 100644
--- a/src/logic/core/player/player_settings.rs
+++ b/src/logic/core/player/player_settings.rs
@@ -8,7 +8,7 @@ pub struct PlayerSettings {
     //pub gun_offset: f32,
     pub fov: f32,
     
-    /// Debug thing for me
+    /// Debug things for me
     pub pos_aimed_offset: Vec3,
     pub pos_offset: Vec3,
 
@@ -16,6 +16,8 @@ pub struct PlayerSettings {
     pub rot_offset: Quat,
 
     pub third_person_toggle: bool,
+    pub shot_lines_enabled: bool,
+
 }
 
 impl Default for PlayerSettings {
@@ -26,7 +28,8 @@ impl Default for PlayerSettings {
             pos_offset: Vec3::ZERO,
             rot_aimed_offset: Quat::default(),
             rot_offset: Quat::default(),
-            third_person_toggle: false
+            third_person_toggle: false,
+            shot_lines_enabled: false,
         }
     }
 }
\ No newline at end of file
diff --git a/src/scenes/scene1/init.rs b/src/scenes/scene1/init.rs
index c98a5a9..9a3d828 100644
--- a/src/scenes/scene1/init.rs
+++ b/src/scenes/scene1/init.rs
@@ -7,7 +7,7 @@ use crate::{
         spawners::{player::player_spawner, spawn::SpawnerPlugin},
     },
     logic::core::{
-        guns::despawn_shots::{despawn_muzzle_flashes, despawn_stray_bullets},
+        guns::{despawn_shots::{despawn_muzzle_flashes, despawn_stray_bullets}, inspect::inspect_firearm},
         player::{
             camera_player_sync::{
                 follow_cursor_with_camera, update_camera_vertical_position, MouseMovementSettings,
@@ -59,6 +59,7 @@ pub fn load_scene(application: &mut App) {
 
     application.add_systems(Update, change_equipment.before(player_spawner));
     application.add_systems(Update, (despawn_muzzle_flashes, despawn_stray_bullets));
+    application.add_systems(Update, inspect_firearm);
 
     //application.add_systems(Update, animate_player);
     //application.add_systems(Update, register_bullet_hits);
diff --git a/src/setup/equipment.rs b/src/setup/equipment.rs
index 960c79a..8f17413 100644
--- a/src/setup/equipment.rs
+++ b/src/setup/equipment.rs
@@ -23,6 +23,15 @@ pub enum Equipment {
     Nothing,
 }
 
+impl Equipment {
+    pub fn is_firearm(&self) -> bool {
+        match self {
+            Equipment::Firearm(_, _) => true,
+            Equipment::Nothing => false,
+        }
+    }
+}
+
 /// Called whenever player wants to change equipment
 pub fn change_equipment(
     mut commands: Commands,