now that's an animation

assets/swords/resources/first_person_material.tres

@@ -0,0 +1,13 @@
+[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://buevqo8w8fq75"]
+
+[ext_resource type="Texture2D" uid="uid://qtu5ue4ixkwm" path="res://assets/swords/fbx/Texture_MAp_sword.png" id="1_ke6g8"]
+
+[resource]
+resource_name = "Sword_mat_map"
+vertex_color_use_as_albedo = true
+albedo_texture = ExtResource("1_ke6g8")
+emission_enabled = true
+use_z_clip_scale = true
+z_clip_scale = 0.5
+use_fov_override = true
+fov_override = 30.0

player_controller/PlayerController.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=54 format=3 uid="uid://bei4nhkf8lwdo"]
+[gd_scene load_steps=52 format=3 uid="uid://bei4nhkf8lwdo"]
 
 [ext_resource type="Script" uid="uid://bbbrf5ckydfna" path="res://player_controller/Scripts/PlayerController.cs" id="1_poq2x"]
 [ext_resource type="PackedScene" uid="uid://cf3rrgr1imvv4" path="res://scenes/path/path.tscn" id="2_6lejt"]
@@ -17,11 +17,9 @@
 [ext_resource type="PackedScene" uid="uid://wq1okogkhc5l" path="res://systems/mantle/mantle_system.tscn" id="8_qu4wy"]
 [ext_resource type="Resource" uid="uid://bebstkm608wxx" path="res://systems/inputs/base_mode/aim_pressed.tres" id="9_nob5r"]
 [ext_resource type="Resource" uid="uid://bdit2jy5gbpts" path="res://systems/inputs/base_mode/jump.tres" id="10_4u7i3"]
-[ext_resource type="Script" uid="uid://g8idirw62qe0" path="res://player_controller/Scripts/Bobbing.cs" id="10_7wk1w"]
 [ext_resource type="Resource" uid="uid://b5gx3q8nvu72e" path="res://systems/inputs/base_mode/hit.tres" id="11_cresl"]
 [ext_resource type="PackedScene" uid="uid://0ysqmqphq6mq" path="res://systems/head/head_system.tscn" id="11_rxwoh"]
 [ext_resource type="Resource" uid="uid://d2r0ur8k3cuu3" path="res://systems/inputs/base_mode/dash.tres" id="12_34snm"]
-[ext_resource type="Script" uid="uid://b6k73aj5povgv" path="res://player_controller/Scripts/FieldOfView.cs" id="12_m2mxi"]
 [ext_resource type="Resource" uid="uid://55b0dsvioj08" path="res://systems/inputs/base_mode/jump_pressed.tres" id="13_nob5r"]
 [ext_resource type="Shape3D" uid="uid://keseacdcooot" path="res://player_controller/resources/PlayerShape.tres" id="13_r7i3q"]
 [ext_resource type="Script" uid="uid://b5nk6ntlps3x0" path="res://systems/inputs/input_system.gd" id="16_v31n3"]
@@ -174,6 +172,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.6, 0)
 CameraInclineAcceleration = 20.0
 GroundedCameraIncline = 3.0
 SlidingJitterAmplitude = 0.2
+WeaponSway = 8.0
+WeaponLookRotation = 10.0
+WeaponAdjustmentSpeed = 1.0
 
 [node name="MantleSystem" parent="HeadSystem" instance=ExtResource("8_qu4wy")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1.6, 0)
@@ -203,12 +204,6 @@ collision_mask = 256
 target_position = Vector3(0, -0.75, 0)
 collision_mask = 256
 
-[node name="Bobbing" type="Node3D" parent="."]
-script = ExtResource("10_7wk1w")
-
-[node name="FieldOfView" type="Node3D" parent="."]
-script = ExtResource("12_m2mxi")
-
 [node name="HeadCollisionDetectors" type="Node3D" parent="."]
 visible = false
 
@@ -277,11 +272,11 @@ collision_mask = 256
 DashSpeed = 0.2
 PostDashSpeed = 30.0
 
-[node name="WeaponRoot" type="Node3D" parent="."]
-
-[node name="WeaponSystem" parent="WeaponRoot" instance=ExtResource("29_wv70j")]
+[node name="WeaponSystem" parent="." instance=ExtResource("29_wv70j")]
 transform = Transform3D(1, 0, 0, 0, 0.173648, -0.984808, 0, 0.984808, 0.173648, 0.45268, 1.44035, -0.692528)
-ThrowForce = 15.0
+mass = 10.0
+gravity_scale = 3.0
+ThrowForce = 300.0
 StraightThrowDuration = 0.05
 
 [node name="DashIndicator" type="Node3D" parent="."]

player_controller/Scripts/PlayerController.cs

@@ -41,14 +41,11 @@ public partial class PlayerController : CharacterBody3D,
 	// Public stuff //
 	///////////////////////////
 	public HeadSystem       HeadSystem;
-	public Bobbing          Bobbing;
-	public FieldOfView      FieldOfView;
 	public StairsSystem     StairsSystem;
 	public MantleSystem     MantleSystem;
 	public DashSystem       DashSystem;
 	public CollisionShape3D StandingCollider;
 	public CollisionShape3D SlideCollider;
-	public Node3D           WeaponRoot;
 	public WeaponSystem     WeaponSystem;
 	public WallHugSystem    WallHugSystem;
 	public PlayerUi		    PlayerUi;
@@ -311,6 +308,8 @@ public partial class PlayerController : CharacterBody3D,
 	private StateChartState  _onWallHanging;
 	private StateChartState  _onWallRunning;
 	
+	private Transition       _onDashEnded;
+	
 	private Transition       _onJumpFromWall;
 	private Transition       _onJumpFromWallFalling;
 	private Transition       _onLeaveWallFromRun;
@@ -340,14 +339,11 @@ public partial class PlayerController : CharacterBody3D,
 		
 		// Camera stuff
 		HeadSystem = GetNode<HeadSystem>("HeadSystem");
-		Bobbing = GetNode<Bobbing>("Bobbing");
-		FieldOfView = GetNode<FieldOfView>("FieldOfView");
 		Camera3D camera = GetNode<Camera3D>("HeadSystem/CameraSmooth/Camera3D");
 		Node3D cameraSmooth = GetNode<Node3D>("HeadSystem/CameraSmooth");
 		
 		// Movement stuff
-		WeaponRoot = GetNode<Node3D>("WeaponRoot");	
-		WeaponSystem = GetNode<WeaponSystem>("WeaponRoot/WeaponSystem");
+		WeaponSystem = GetNode<WeaponSystem>("WeaponSystem");
 		MantleSystem = GetNode<MantleSystem>("HeadSystem/MantleSystem");
 		StandingCollider = GetNode<CollisionShape3D>("StandingCollider");
 		SlideCollider = GetNode<CollisionShape3D>("SlideCollider");
@@ -388,6 +384,7 @@ public partial class PlayerController : CharacterBody3D,
 		_airGlidingDoubleJump = StateChartState.Of(GetNode("StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled"));
 		_onGroundSlideJump = Transition.Of(GetNode("StateChart/Root/Movement/Sliding/GroundSlide/OnJump"));
 		_onAirGlideDoubleJump = Transition.Of(GetNode("StateChart/Root/Movement/Sliding/AirGlideDoubleJumpEnabled/OnJump"));
+		_onDashEnded = Transition.Of(GetNode("StateChart/Root/Movement/Dashing/OnDashEnded"));
 		
 		// _actionHanging = StateChartState.Of(GetNode("StateChart/Root/Actions/Hanging"));
 		_powerExpired = StateChartState.Of(GetNode("StateChart/Root/PowerReserve/Expired"));
@@ -422,8 +419,6 @@ public partial class PlayerController : CharacterBody3D,
 
 		// Camera stuff
 		HeadSystem.Init();
-		Bobbing.Init(camera);
-		FieldOfView.Init(camera);
 		
 		// Movement stuff
 		// Getting universal setting from GODOT editor to be in sync
@@ -501,6 +496,9 @@ public partial class PlayerController : CharacterBody3D,
 		_onWallHanging.StatePhysicsProcessing += HandleWallHanging;
 		_onWallRunning.StatePhysicsProcessing += HandleWallRunning;
 		
+		_onWallHanging.StateExited += RecoverWeapon;
+		_onDashEnded.Taken += RecoverWeapon;
+		
 		_onJumpFromWall.Taken += OnJumpFromWall;
 		_onJumpFromWallFalling.Taken += OnJumpFromWall;
 		_onLeaveWallFromRun.Taken += OnLeaveWallFromRun;
@@ -548,9 +546,9 @@ public partial class PlayerController : CharacterBody3D,
 		if (TutorialDone)
 			return;
 		
-		RemoveChild(WeaponRoot);
-		GetTree().GetRoot().CallDeferred(Node.MethodName.AddChild, WeaponRoot);
-		WeaponRoot.CallDeferred(Node3D.MethodName.SetGlobalPosition, TutorialWeaponTarget.GlobalPosition);
+		RemoveChild(WeaponSystem);
+		GetTree().GetRoot().CallDeferred(Node.MethodName.AddChild, WeaponSystem);
+		WeaponSystem.CallDeferred(Node3D.MethodName.SetGlobalPosition, TutorialWeaponTarget.GlobalPosition);
 		WeaponSystem.CallDeferred(WeaponSystem.MethodName.PlaceWeaponForTutorial, TutorialWeaponTarget.GlobalPosition);
 	}
 	
@@ -811,39 +809,25 @@ public partial class PlayerController : CharacterBody3D,
 		var lookSensitivity = _isUsingGamepad ? _lookSensitivityMultiplier : _mouseSensitivityMultiplier;
 		
 		var wallHugContactPoint = _onWallRunning.Active ? _currentWallContactPoint : Vector3.Zero;
-		var playerVelocity = GetGlobalMoveInput();
-		HeadSystem.LookAround(delta, inputLookDir, playerVelocity, Velocity, wallHugContactPoint, lookSensitivity, isSliding: _groundSliding.Active);
-	}
-	public void RotateWeaponWithPlayer()
-	{
-		WeaponRoot.SetRotation(HeadSystem.Rotation);
+		var moveInput = GetGlobalMoveInput();
+
+		var lookAroundInputs = new HeadSystem.CameraParameters(
+			Delta: delta,
+			LookDir: inputLookDir,
+			PlayerInput: moveInput,
+			PlayerVelocity:Velocity,
+			WallContactPoint: wallHugContactPoint,
+			SensitivitMultiplier: lookSensitivity,
+			WithCameraJitter: _groundSliding.Active,
+			WithCameraBobbing: _grounded.Active || _onWallRunning.Active,
+			BobbingMultiplier: _headBobbingMultiplier, 
+			FovMultiplier: _fovChangeMultiplier);
+		HeadSystem.LookAround(lookAroundInputs);
 	}
 	public Vector3 GetGlobalForwardFacingVector()
 	{
 		return Transform.Basis * HeadSystem.Transform.Basis * Vector3.Forward;
 	}
-	private void CameraModifications(float delta)
-	{
-		Bobbing.CameraBobbingParams cameraBobbingParams = new Bobbing.CameraBobbingParams
-		{
-			Delta = delta,
-			IsOnFloorCustom = _grounded.Active || _onWallRunning.Active,
-			Velocity = Velocity, 
-			SettingsMultiplier = _headBobbingMultiplier
-		};
-		Bobbing.PerformCameraBobbing(cameraBobbingParams);
-
-		FieldOfView.FovParameters fovParams = new FieldOfView.FovParameters
-		{
-			IsCrouchingHeight = false,
-			Delta = delta,
-			SprintSpeed = WalkSpeed,
-			Velocity = Velocity,
-			FOVMultiplier = _fovChangeMultiplier
-		};
-		FieldOfView.PerformFovAdjustment(fovParams);
-	}
-	
 	// Horizontal velocity computing
 	public Vector3 ComputeHVelocity(float delta, float accelerationFactor, float decelerationFactor, Vector3? direction = null)
 	{
@@ -1570,9 +1554,6 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void HandleAiming(float delta)
 	{
-		if (WeaponSystem.InHandState.Active)
-			RotateWeaponWithPlayer();
-		
 		DashIndicatorMeshCylinder.Height = DashSystem.PlannedLocation.DistanceTo(GlobalPosition);
 		DashIndicatorNode.LookAt(DashSystem.PlannedLocation);
 		
@@ -1640,7 +1621,8 @@ public partial class PlayerController : CharacterBody3D,
 	public void ThrowWeapon()
 	{
 		_playerState.SendEvent("cancel_aim");
-		RemoveChildNode(WeaponRoot);
+		RemoveChildNode(WeaponSystem);
+		HeadSystem.HideWeapon();
 
 		var weaponTargetLocation = DashSystem.HasHit ? DashSystem.CollisionPoint : DashSystem.PlannedLocation;
 		WeaponSystem.ThrowWeapon(
@@ -1651,7 +1633,10 @@ public partial class PlayerController : CharacterBody3D,
 	}
 	public void RecoverWeapon()
 	{
-		RecoverChildNode(WeaponRoot);
+		if (WeaponSystem.GetParent() == this) return;
+		
+		HeadSystem.ShowWeapon();
+		RecoverChildNode(WeaponSystem);
 		WeaponSystem.ResetWeapon();
 	}
 	
@@ -1704,8 +1689,6 @@ public partial class PlayerController : CharacterBody3D,
 		var isPlantedUnderPlatform = WeaponSystem.IsPlantedUnderPlatform();
 		var shouldDashToHanging = isPlantedOnWall || isPlantedUnderPlatform;
 		
-		RecoverWeapon();
-		
 		var resultingEvent = shouldDashToHanging ? "dash_to_planted" : "dash_finished";
 		_playerState.SendEvent(resultingEvent);
 	}
@@ -1718,12 +1701,9 @@ public partial class PlayerController : CharacterBody3D,
 		if (_currentInputBufferFrames > 0) _currentInputBufferFrames -= 1;
 		
 		LookAround(delta);
-		CameraModifications((float) delta);
 		MoveSlideAndHandleStairs((float) delta);
 		MantleSystem.ProcessMantle(_grounded.Active);
 		
-		if (WeaponSystem.InHandState.Active)
-			RotateWeaponWithPlayer();
 		if (WeaponSystem.InHandState.Active && !_aiming.Active && TutorialDone)
 		{
 			DashIndicatorMesh.Visible = false;
@@ -1755,6 +1735,13 @@ public partial class PlayerController : CharacterBody3D,
 		}
 
 		if (!WeaponSystem.InHandState.Active) return;
+		PerformHit();
+	}
+
+	public void PerformHit()
+	{
+		HeadSystem.OnHit();
+		
 		var bodies = WeaponHitbox.GetOverlappingBodies();
 		foreach (var body in bodies)
 		{

systems/head/HeadSystem.cs

@@ -6,32 +6,82 @@ namespace Movementtests.systems;
 
 public partial class HeadSystem : Node3D
 {
+    public record CameraParameters(
+        double Delta,
+        Vector2 LookDir,
+        Vector3 PlayerInput,
+        Vector3 PlayerVelocity,
+        Vector3 WallContactPoint,
+        float SensitivitMultiplier,
+        bool WithCameraJitter, 
+        bool WithCameraBobbing, 
+        float BobbingMultiplier, 
+        float FovMultiplier);
+    
     private Camera3D _camera;
     private Marker3D _cameraAnchor;
     private AnimationPlayer _animationPlayer;
+    private AnimationTree _animationTree;
 	
     [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
     public float LookSensitivity { get; set; } = 1f;
 	
+    [ExportGroup("Camera incline")]
     [Export(PropertyHint.Range, "0.1,50,0.1,or_greater")]
     public double CameraInclineAcceleration { get; set; } = 10f;
-	
     [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
     public float WallRunCameraIncline { get; set; } = 5f;
-	
     [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
     public float GroundedCameraIncline { get; set; } = 5f;
     
+    [ExportGroup("Sliding")]
     [Export(PropertyHint.Range, "0,2,0.1,or_greater")]
     public float SlidingCameraHeightOffset { get; set; } = 1.0f;
-    
     [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
     public float SlidingJitterFrequency { get; set; } = 0.01f;
-    
     [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
     public float SlidingJitterAmplitude { get; set; } = 0.1f;
     
     private FastNoiseLite _slidingNoise = new FastNoiseLite();
+
+    [ExportGroup("Bobbing")]
+    
+    private float _bobbingAccumulator;  // Constantly increases when player moves in X or/and Z axis
+    [Export(PropertyHint.Range, "0,10,0.01,or_greater")]
+    public float BobbingFrequency { set; get; } = 2.4f;
+    [Export(PropertyHint.Range, "0,0.4,0.01,or_greater")]
+    public float BobbingAmplitude { set; get; } = 0.08f;
+    
+    [ExportGroup("FOV")]
+    [Export(PropertyHint.Range, "0,180,0.1,degrees")]
+    public float BaseFov         { get; set; } = 75.0f;
+    [Export(PropertyHint.Range, "0,10,0.01,or_greater")]
+    public float FovChangeFactor { get; set; } = 1.2f;
+    [Export(PropertyHint.Range, "0,10,0.01,or_greater")]
+    public float FovChangeSpeed  { get; set; } = 6.25f;
+    [Export(PropertyHint.Range, "0,100,1,or_greater")]
+    public float FovMaxedOutSpeed { get; set; } = 20f;
+    
+    [ExportGroup("First Person rig")]
+    private Node3D _fpRig;
+    private Node3D _fpDisplacedRig;
+    private Vector3 _fpDisplacedRigInitialRotation;
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float WeaponSway { get; set; } = 5f;
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float WeaponLookRotation { get; set; } = 1f;
+    [Export(PropertyHint.Range, "0,200,1,or_greater")]
+    public float WeaponMoveRotation { get; set; } = 80f;
+    [Export(PropertyHint.Range, "0,20,0.1,or_greater")]
+    public float WeaponAdjustmentSpeed { get; set; } = 10f;
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float DisplacedWeaponSway { get; set; } = 5f;
+    [Export(PropertyHint.Range, "0,10,0.1,or_greater")]
+    public float DisplacedWeaponLookRotation { get; set; } = 1f;
+    [Export(PropertyHint.Range, "0,1,0.01,or_greater")]
+    public float DisplacedWeaponMoveRotation { get; set; } = 0.1f;
+    [Export(PropertyHint.Range, "0,20,0.1,or_greater")]
+    public float DisplacedWeaponAdjustmentSpeed { get; set; } = 10f;
     
     public void Init()
     {
@@ -39,7 +89,12 @@ public partial class HeadSystem : Node3D
         _camera = GetNode<Camera3D>("CameraSmooth/Camera3D");
         _cameraAnchor = GetNode<Marker3D>("CameraAnchor");
         _animationPlayer = GetNode<AnimationPlayer>("AnimationPlayer");
-
+        _animationTree = GetNode<AnimationTree>("AnimationTree");
+        
+        _fpRig = GetNode<Node3D>("FPRig");
+        _fpDisplacedRig = GetNode<Node3D>("FPRig/Sword");
+        _fpDisplacedRigInitialRotation = _fpDisplacedRig.Rotation;
+        
         _slidingNoise.NoiseType = FastNoiseLite.NoiseTypeEnum.Perlin;
         _slidingNoise.SetFrequency(SlidingJitterFrequency);
     }
@@ -48,9 +103,35 @@ public partial class HeadSystem : Node3D
     {
         _animationPlayer.Play("mantle");
     }
-
-    public void LookAround(double delta, Vector2 lookDir, Vector3 playerInput, Vector3 playerVelocity, Vector3? wallContactPoint = null, float sensitivitMultiplier = 1f, bool isSliding = false)
+    
+    public void OnHit()
     {
+        _animationTree.Set("parameters/OnHit/request", (int) AnimationNodeOneShot.OneShotRequest.Fire);
+    }
+
+    public void OnHitboxActivated()
+    {
+        GD.Print("Hitbox activated");
+    }
+
+    public void OnHitboxDeactivated()
+    {
+        GD.Print("Hitbox deactivated");
+    }
+
+    public void LookAround(CameraParameters inputs)
+    {
+        var (delta, 
+            lookDir, 
+            playerInput, 
+            playerVelocity, 
+            wallContactPoint, 
+            sensitivitMultiplier, 
+            withCameraJitter, 
+            withCameraBobbing, 
+            bobbingMultiplier,
+            fovMultiplier) = inputs;
+        
         // Horizontal movement of head
         float angleForHorizontalRotation = lookDir.X * LookSensitivity * sensitivitMultiplier;
         RotateY(angleForHorizontalRotation);
@@ -61,11 +142,11 @@ public partial class HeadSystem : Node3D
         currentCameraRotation.X = Mathf.Clamp(currentCameraRotation.X, Mathf.DegToRad(-90f), Mathf.DegToRad(90f));
         
         // Camera incline on Wall and more
-        var isWallRunning = wallContactPoint.HasValue && wallContactPoint.Value.Length() > Mathf.Epsilon;
+        var isWallRunning = wallContactPoint.Length() > Mathf.Epsilon;
         float cameraIncline;
         if (isWallRunning)
         {
-            var directionToWall = (wallContactPoint.Value - GlobalPosition).Normalized();
+            var directionToWall = (wallContactPoint - GlobalPosition).Normalized();
             var cameraInclineFactor = ComputeCameraInclineFactor(directionToWall);
             cameraIncline = Mathf.DegToRad(WallRunCameraIncline * cameraInclineFactor);
         }
@@ -77,7 +158,7 @@ public partial class HeadSystem : Node3D
         currentCameraRotation.Z = (float) Mathf.Lerp(currentCameraRotation.Z, cameraIncline, delta * CameraInclineAcceleration);
         _cameraAnchor.Rotation = currentCameraRotation;
 
-        if (isSliding)
+        if (withCameraJitter)
         {
             _cameraAnchor.Position = Vector3.Down*SlidingCameraHeightOffset;
             float noise1D = _slidingNoise.GetNoise1D(Time.GetTicksMsec());
@@ -89,7 +170,79 @@ public partial class HeadSystem : Node3D
             _cameraAnchor.Position = Vector3.Zero;
         }
         
+        Vector3 newPositionForCamera = Vector3.Zero;
+        Vector3 newPositionForRig = Vector3.Zero;
+        if (withCameraBobbing)
+        {
+            _bobbingAccumulator += (float) delta * playerVelocity.Length();
+            
+            // As the _bobbingAccumulator increases we're changing values for sin and cos functions.
+            // Because both of them are just waves, we will be slide up with y and then slide down with y 
+            // creating bobbing effect. The same works for cos. As the _bobbingAccumulator increases the cos decreases and then increases
+            newPositionForCamera.Y = Mathf.Sin(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude * bobbingMultiplier;
+            newPositionForCamera.X = Mathf.Cos(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude * bobbingMultiplier;
+            
+            // Offset bobbing for weapon rig
+            newPositionForRig.Y = Mathf.Cos(_bobbingAccumulator * BobbingFrequency) * BobbingAmplitude * bobbingMultiplier * 0.2f;
+            newPositionForRig.X = Mathf.Sin(_bobbingAccumulator * BobbingFrequency / 2.0f) * BobbingAmplitude * bobbingMultiplier * 0.2f;
+        }
+        _cameraAnchor.Position += newPositionForCamera;
+        
         _camera.GlobalTransform = _cameraAnchor.GetGlobalTransformInterpolated();
+        
+        // First person rig adjustments
+        _fpRig.GlobalTransform = _cameraAnchor.GetGlobalTransformInterpolated();
+        // Apply bobbing
+        _fpRig.Position += newPositionForRig;
+        
+        // Rotate the whole rig based on movement input
+        var newRigRotation = _fpRig.Rotation;
+        var camTilt = Mathf.Lerp(_fpRig.Rotation.Z, cameraIncline*WeaponMoveRotation, delta*WeaponAdjustmentSpeed);
+        newRigRotation.Z = (float) camTilt;
+
+        // Rotate the whole rig based on camera rotation input
+        newRigRotation.X = Mathf.Lerp(newRigRotation.X, -lookDir.Y*WeaponSway, (float) delta*WeaponAdjustmentSpeed);
+        newRigRotation.Y = Mathf.Lerp(newRigRotation.Y, -lookDir.X*WeaponSway, (float) delta*WeaponAdjustmentSpeed);
+        
+        // Apply
+        _fpRig.Rotation = newRigRotation;
+        
+        // Compute displaced rig adjustments, starting with movement input
+        var newDisplacedRigRotation = _fpDisplacedRig.Rotation;
+
+        var howMuchForward = ComputeHowMuchInputForward(playerInput);
+        var howMuchSideways = ComputeHowMuchInputSideways(playerInput);
+        var displacedCamTiltForward = Mathf.Lerp(newDisplacedRigRotation.Z, 
+            _fpDisplacedRigInitialRotation.Z + howMuchForward*DisplacedWeaponMoveRotation, 
+            delta*DisplacedWeaponAdjustmentSpeed);
+        var displacedCamTiltSide = Mathf.Lerp(newDisplacedRigRotation.X, 
+            _fpDisplacedRigInitialRotation.X - howMuchSideways*DisplacedWeaponMoveRotation, 
+            delta*DisplacedWeaponAdjustmentSpeed);
+        
+        newDisplacedRigRotation.X = (float) displacedCamTiltSide;
+        newDisplacedRigRotation.Z = (float) displacedCamTiltForward;
+        
+        var displacedSwayY = Mathf.Lerp(newDisplacedRigRotation.Y, 
+            _fpDisplacedRigInitialRotation.Y - lookDir.X*DisplacedWeaponSway, 
+            delta*DisplacedWeaponAdjustmentSpeed);
+        newDisplacedRigRotation.Y = (float) displacedSwayY;
+        
+        // Apply
+        _fpDisplacedRig.Rotation = newDisplacedRigRotation;
+
+        // Camera adjustments
+        float velocityClamped = Mathf.Clamp(playerVelocity.Length(), 0.5f, FovMaxedOutSpeed);
+        float targetFov = BaseFov + FovChangeFactor * velocityClamped * fovMultiplier;
+        _camera.Fov = Mathf.Lerp(_camera.Fov, targetFov, (float) delta * FovChangeSpeed);
+    }
+
+    public void HideWeapon()
+    {
+        _fpRig.Visible = false;   
+    }
+    public void ShowWeapon()
+    {
+        _fpRig.Visible = true;
     }
 
     public float ComputeCameraInclineFactor(Vector3 direction)
@@ -99,6 +252,20 @@ public partial class HeadSystem : Node3D
         return crossProduct.Length()*Mathf.Sign(crossProduct.Y);
     }
 
+    public float ComputeHowMuchInputForward(Vector3 playerInput)
+    {
+        var forwardAngle = GetForwardHorizontalVector().AngleTo(playerInput);
+        var forwardRemapped = Mathf.Remap(forwardAngle, 0, Mathf.Pi, -1, 1);
+        return playerInput.Length() > 0 ? forwardRemapped : 0;
+    }
+
+    public float ComputeHowMuchInputSideways(Vector3 playerInput)
+    {
+        var rightAngle = GetForwardHorizontalVector().Cross(Vector3.Up).Normalized().AngleTo(playerInput);
+        var forwardRemapped = Mathf.Remap(rightAngle, 0, Mathf.Pi, -1, 1);
+        return playerInput.Length() > 0 ? forwardRemapped : 0;
+    }
+
     public Vector3 GetForwardHorizontalVector()
     {
         return GetGlobalTransform().Basis.Z;

systems/head/fp_blend_tree.tres

@@ -0,0 +1,24 @@
+[gd_resource type="AnimationNodeBlendTree" load_steps=5 format=3 uid="uid://c26yvcyyyj811"]
+
+[ext_resource type="AnimationNodeStateMachine" uid="uid://3r5oeg0ho0d4" path="res://systems/head/fp_state_machine.tres" id="1_knaxl"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_knaxl"]
+animation = &"idle"
+
+[sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_1hkum"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_23rmc"]
+animation = &"hit1"
+
+[resource]
+graph_offset = Vector2(-455.3856, -37.41575)
+nodes/output/position = Vector2(320, 160)
+nodes/AnimationNodeStateMachine/node = ExtResource("1_knaxl")
+nodes/AnimationNodeStateMachine/position = Vector2(-540, 200)
+nodes/Idle/node = SubResource("AnimationNodeAnimation_knaxl")
+nodes/Idle/position = Vector2(-80, 20)
+nodes/OnHit/node = SubResource("AnimationNodeOneShot_1hkum")
+nodes/OnHit/position = Vector2(120, 100)
+nodes/hit1/node = SubResource("AnimationNodeAnimation_23rmc")
+nodes/hit1/position = Vector2(-80, 220)
+node_connections = [&"output", 0, &"OnHit", &"OnHit", 0, &"Idle", &"OnHit", 1, &"hit1"]

systems/head/fp_state_machine.tres

@@ -0,0 +1,28 @@
+[gd_resource type="AnimationNodeStateMachine" load_steps=6 format=3 uid="uid://3r5oeg0ho0d4"]
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_adm0b"]
+animation = &"hit1"
+
+[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_73q32"]
+animation = &"idle"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_adm0b"]
+advance_mode = 2
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7r4t3"]
+advance_mode = 2
+advance_condition = &"on_hit"
+
+[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_2u8w7"]
+break_loop_at_end = true
+switch_mode = 2
+advance_mode = 2
+
+[resource]
+states/Start/position = Vector2(100, 91)
+states/hit1/node = SubResource("AnimationNodeAnimation_adm0b")
+states/hit1/position = Vector2(511, 61)
+states/idle/node = SubResource("AnimationNodeAnimation_73q32")
+states/idle/position = Vector2(331, 91)
+transitions = ["Start", "idle", SubResource("AnimationNodeStateMachineTransition_adm0b"), "idle", "hit1", SubResource("AnimationNodeStateMachineTransition_7r4t3"), "hit1", "idle", SubResource("AnimationNodeStateMachineTransition_2u8w7")]
+graph_offset = Vector2(-82, -9)

systems/head/head_system.tscn

@@ -1,6 +1,8 @@
-[gd_scene load_steps=5 format=3 uid="uid://0ysqmqphq6mq"]
+[gd_scene load_steps=9 format=3 uid="uid://0ysqmqphq6mq"]
 
 [ext_resource type="Script" uid="uid://dtkdrnsmlwm67" path="res://systems/head/HeadSystem.cs" id="1_8abgy"]
+[ext_resource type="ArrayMesh" uid="uid://ckr26s4e3fj1m" path="res://assets/swords/resources/fp_sword23.tres" id="2_c5qep"]
+[ext_resource type="AnimationNodeBlendTree" uid="uid://c26yvcyyyj811" path="res://systems/head/fp_blend_tree.tres" id="3_r0h40"]
 
 [sub_resource type="Animation" id="Animation_urko7"]
 length = 0.001
@@ -26,6 +28,54 @@ tracks/1/keys = {
 "points": PackedFloat32Array(0, -0.15, 0, 0.15, 0),
 "times": PackedFloat32Array(0)
 }
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("../../FPRig/Sword:position")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0.53640664, -0.7880347, -1.9288678)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("../../FPRig/Sword:rotation")
+tracks/3/interp = 1
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(-0.083978735, -1.136043, 0.19867715)]
+}
+tracks/4/type = "value"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("../../FPRig/Sword:scale")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(1.0000001, 1.0000001, 1.0000005)]
+}
+tracks/5/type = "value"
+tracks/5/imported = false
+tracks/5/enabled = true
+tracks/5/path = NodePath("..:rotation")
+tracks/5/interp = 1
+tracks/5/loop_wrap = true
+tracks/5/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0, 0.00011616433)]
+}
 
 [sub_resource type="Animation" id="Animation_8abgy"]
 resource_name = "mantle"
@@ -53,16 +103,131 @@ tracks/1/keys = {
 "times": PackedFloat32Array(0, 0.1, 0.2, 0.3)
 }
 
+[sub_resource type="Animation" id="Animation_0hyrq"]
+resource_name = "idle"
+length = 2.0
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("../../FPRig/Sword:position")
+tracks/0/interp = 2
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 1, 1.4),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0.53640664, -0.7880347, -1.9288678), Vector3(0.53640664, -0.83580256, -1.9288678), Vector3(0.53640664, -0.86088884, -1.9288678), Vector3(0.53640664, -0.8256072, -1.9288678), Vector3(0.53640664, -0.7880347, -1.9288678)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("../../FPRig/Sword:rotation")
+tracks/1/interp = 2
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.3, 0.6, 1, 1.4),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(-0.083978735, -1.136043, 0.19867715), Vector3(-0.06987281, -1.1365474, 0.20524277), Vector3(-0.05990464, -1.1368362, 0.20987195), Vector3(-0.06303402, -1.1367121, 0.2084137), Vector3(-0.083978735, -1.136043, 0.19867715)]
+}
+
+[sub_resource type="Animation" id="Animation_r0h40"]
+resource_name = "hit1"
+length = 0.30000168
+step = 0.016666668
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("../../FPRig/Sword:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.06666667, 0.11666667, 0.15, 0.21666667, 0.3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0.53640664, -0.7880347, -1.9288678), Vector3(0.4045868, -0.4412415, -1.5352597), Vector3(-0.4799922, -0.5403832, -1.6861614), Vector3(-0.46995986, -0.53766656, -1.3638693), Vector3(-0.49520528, -0.5369735, -1.3145388), Vector3(-0.4048354, -0.5878634, -1.2836416)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("../../FPRig/Sword:rotation")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0, 0.06666667, 0.11666667, 0.15, 0.21666667, 0.3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(-0.083978735, -1.136043, 0.19867715), Vector3(-0.7788485, -2.0049822, -0.2951485), Vector3(-0.94931036, -0.5881021, -0.61733377), Vector3(-1.3252386, -0.102411434, 0.58406436), Vector3(-1.2938086, -0.18945412, 0.7334958), Vector3(-1.1484056, -0.2900904, 0.6867544)]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath("../../FPRig/Sword:scale")
+tracks/2/interp = 2
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0, 0.06666667, 0.11666667, 0.15, 0.21666667, 0.3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(1.0000001, 1.0000001, 1.0000005), Vector3(1, 1.0004268, 1.0000002), Vector3(0.99999994, 1.2493719, 0.99999976), Vector3(1.0000001, 1.1750004, 1.0000004), Vector3(0.99999994, 0.99999994, 0.99999994), Vector3(1.0000001, 0.9999999, 1)]
+}
+tracks/3/type = "value"
+tracks/3/imported = false
+tracks/3/enabled = true
+tracks/3/path = NodePath("..:rotation")
+tracks/3/interp = 2
+tracks/3/loop_wrap = true
+tracks/3/keys = {
+"times": PackedFloat32Array(0, 0.083333336, 0.11666667, 0.2, 0.23333333, 0.3),
+"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
+"update": 0,
+"values": [Vector3(0, 0, 0), Vector3(0, 0, 0), Vector3(0, 0, 0.00011616433), Vector3(0, -0.02617994, -0.02617994), Vector3(0, 0.02617994, 0.02617994), Vector3(0, 0, 0)]
+}
+tracks/4/type = "method"
+tracks/4/imported = false
+tracks/4/enabled = true
+tracks/4/path = NodePath("../..")
+tracks/4/interp = 1
+tracks/4/loop_wrap = true
+tracks/4/keys = {
+"times": PackedFloat32Array(0.083333336, 0.23333333),
+"transitions": PackedFloat32Array(1, 1),
+"values": [{
+"args": [],
+"method": &"OnHitboxActivated"
+}, {
+"args": [],
+"method": &"OnHitboxDeactivated"
+}]
+}
+
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_0hyrq"]
 _data = {
 &"RESET": SubResource("Animation_urko7"),
+&"hit1": SubResource("Animation_r0h40"),
+&"idle": SubResource("Animation_0hyrq"),
 &"mantle": SubResource("Animation_8abgy")
 }
 
 [node name="HeadSystem" type="Node3D"]
 script = ExtResource("1_8abgy")
+WeaponMoveRotation = 20.0
+DisplacedWeaponSway = 1.0
+DisplacedWeaponAdjustmentSpeed = 8.0
+
+[node name="FPRig" type="Node3D" parent="."]
+
+[node name="Sword" type="Node3D" parent="FPRig"]
+transform = Transform3D(0.42791694, -0.008550272, -0.9037781, 0.19667713, 0.9768738, 0.0838801, 0.88215953, -0.2136461, 0.41970265, 0.53640664, -0.7880347, -1.9288678)
+
+[node name="SwordMesh" type="MeshInstance3D" parent="FPRig/Sword"]
+transform = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 1, 0, 0, 0)
+cast_shadow = 0
+mesh = ExtResource("2_c5qep")
 
 [node name="CameraSmooth" type="Node3D" parent="."]
+transform = Transform3D(1, -0.00011616433, 0, 0.00011616433, 1, 0, 0, 0, 1, 0, 0, 0)
 
 [node name="Camera3D" type="Camera3D" parent="CameraSmooth"]
 transform = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 0.99999994, 0, 0, 0)
@@ -76,3 +241,12 @@ root_node = NodePath("../CameraSmooth/Camera3D")
 libraries = {
 &"": SubResource("AnimationLibrary_0hyrq")
 }
+
+[node name="AnimationTree" type="AnimationTree" parent="."]
+root_node = NodePath("../CameraSmooth/Camera3D")
+tree_root = ExtResource("3_r0h40")
+anim_player = NodePath("../AnimationPlayer")
+parameters/AnimationNodeStateMachine/conditions/on_hit = false
+parameters/OnHit/active = false
+parameters/OnHit/internal_active = false
+parameters/OnHit/request = 0

systems/weapon/WeaponSystem.cs

@@ -28,6 +28,7 @@ public partial class WeaponSystem : RigidBody3D
     private TweenQueueSystem _tweenQueueSystem;
     
     private Transform3D _startTransform;
+    private Transform3D _startMeshTransform;
 
     private Vector3 _throwDirection;
     public Vector3 PlantLocation { get; set; }
@@ -36,7 +37,6 @@ public partial class WeaponSystem : RigidBody3D
     public MeshInstance3D WeaponLocationIndicator { get; set; }
     public StandardMaterial3D WeaponLocationIndicatorMaterial { get; set; }
     public MeshInstance3D WeaponMesh { get; set; }
-    public StandardMaterial3D WeaponMaterial { get; set; }
 
     public void Init(Node3D head, Camera3D camera)
     {
@@ -53,13 +53,14 @@ public partial class WeaponSystem : RigidBody3D
         WeaponLocationIndicatorMaterial = WeaponLocationIndicator.GetActiveMaterial(0) as StandardMaterial3D;
         
         WeaponMesh = GetNode<MeshInstance3D>("Weapon");
-        WeaponMaterial = WeaponMesh.GetActiveMaterial(0) as StandardMaterial3D;
+        _startMeshTransform = WeaponMesh.Transform;
         
         _tweenQueueSystem = GetNode<TweenQueueSystem>("TweenQueueSystem");
         _tweenQueueSystem.Init(this);
 
         _startTransform = Transform;
         Freeze = true;
+        Visible = false;
 
         BodyEntered += OnThrownWeaponReachesGround;
 
@@ -69,15 +70,15 @@ public partial class WeaponSystem : RigidBody3D
 
     public void WeaponLeft()
     {
-        WeaponLocationIndicator.Visible = true;
-        WeaponMaterial!.UseFovOverride = false;
+        Visible = true;
+        // WeaponLocationIndicator.Visible = true;
         EmitSignalWeaponThrown();
     }
 
     public void WeaponBack()
     {
-        WeaponLocationIndicator.Visible = false;
-        WeaponMaterial!.UseFovOverride = true;
+        Visible = false;
+        // WeaponLocationIndicator.Visible = false;
         EmitSignalWeaponRetrieved();
     }
 
@@ -87,14 +88,13 @@ public partial class WeaponSystem : RigidBody3D
         Freeze = true;
         GlobalPosition = location;
         PlantLocation = location;
-        Visible = false;
     }
 
     public void ThrowWeapon(Vector3 end, bool hasHit, Vector3 collisionLocation, Vector3 collisionNormal)
     {
         _weaponState.SendEvent("throw");
 
-        WeaponLocationIndicatorMaterial.StencilColor = new Color(1f, 1f, 1f);
+        // WeaponLocationIndicatorMaterial.StencilColor = new Color(1f, 1f, 1f);
         
         _throwDirection = (end - GlobalPosition).Normalized();
         PlantLocation = collisionLocation;
@@ -118,10 +118,11 @@ public partial class WeaponSystem : RigidBody3D
     {
         _weaponState.SendEvent("plant");
 
-        WeaponLocationIndicatorMaterial.StencilColor = new Color(1f, 0.2f, 0.2f);
+        // WeaponLocationIndicatorMaterial.StencilColor = new Color(1f, 0.2f, 0.2f);
         
         Freeze = true;
         GlobalPosition = PlantLocation;
+        WeaponMesh.Transform = _startMeshTransform;
         LookAt(GlobalTransform.Origin + PlantNormal, Vector3.Up, true);
     }
 
@@ -135,7 +136,7 @@ public partial class WeaponSystem : RigidBody3D
         _weaponState.SendEvent("recover");
         Transform = _startTransform;
         Freeze = true;
-        Visible = true;
+        Visible = false;
     }
     
     public override void _IntegrateForces(PhysicsDirectBodyState3D state)
@@ -149,6 +150,14 @@ public partial class WeaponSystem : RigidBody3D
         }
     }
 
+    public override void _Process(double delta)
+    {
+        if (!FlyingState.Active) return;
+        
+        WeaponMesh.Rotation = new Vector3(WeaponMesh.Rotation.X, WeaponMesh.Rotation.Y + (float) delta * 100, WeaponMesh.Rotation.Z);
+        //LookAt(GlobalTransform.Origin + LinearVelocity.Normalized(), Vector3.Up, false);
+    }
+
     public bool IsPlantedUnderPlatform()
     {
         return PlantedState.Active && GlobalRotation.X > 1 && Math.Abs(GlobalRotation.Y) > 1;

systems/weapon/weapon.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" uid="uid://iii3wfto4t5b" path="res://systems/weapon/WeaponSystem.cs" id="1_csqwk"]
 [ext_resource type="PackedScene" uid="uid://dbe5f0p6lvqtr" path="res://systems/tween_queue/tween_queue_system.tscn" id="2_x1nha"]
 [ext_resource type="Script" uid="uid://couw105c3bde4" path="res://addons/godot_state_charts/state_chart.gd" id="3_5owyf"]
-[ext_resource type="CylinderMesh" uid="uid://b7vt0nk2htpo4" path="res://systems/weapon/weapon.tres" id="3_svc06"]
+[ext_resource type="ArrayMesh" uid="uid://cho5fixitrbds" path="res://assets/swords/resources/sword23.tres" id="3_svc06"]
 [ext_resource type="Script" uid="uid://jk2jm1g6q853" path="res://addons/godot_state_charts/compound_state.gd" id="4_svc06"]
 [ext_resource type="Script" uid="uid://cytafq8i1y8qm" path="res://addons/godot_state_charts/atomic_state.gd" id="5_m0v1h"]
 [ext_resource type="Script" uid="uid://cf1nsco3w0mf6" path="res://addons/godot_state_charts/transition.gd" id="6_jpdh0"]
@@ -51,7 +51,7 @@ transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0,
 shape = SubResource("CylinderShape3D_avini")
 
 [node name="Weapon" type="MeshInstance3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0.8673003)
 mesh = ExtResource("3_svc06")
 
 [node name="StateChart" type="Node" parent="."]