Merge pull request #7 from magarich228/dev

Наработки по скрипту игрока с dev.

Author: magarich228

README.md

@@ -2,8 +2,8 @@
 
 ## TODO:
 * Замена ui событий на кастомные.
-* Отрефачить код _Process + баги анимации после прыжка.
-* Передвижение в присяде.
+* Отрефачить код _Process.
 * Фикс странной механики замедленного движения при зажатых ui_up, ui_down.
+* Фикс состояния Stand после прекращения передвижения в присяде.
 
 ![image](https://github.com/magarich228/TDP5/assets/78496868/e8e352f7-186e-45a4-aea9-f5b1e19b06db)

player/stickplayer.cs

@@ -1,5 +1,6 @@
 using Godot;
 using System;
+using System.Diagnostics;
 using System.Text.RegularExpressions;
 using Godot.Collections;
 using Tdp5.player;
@@ -9,23 +10,12 @@ public partial class stickplayer : CharacterBody2D
 	public const float Speed = 300.0f;
 	public const float JumpVelocity = -500.0f;
 
-	public PlayerState State
-	{
-		get => _state;
-		set
-		{
-			if (value != _state)
-			{
-				_state = value;
-				Animate();
-			}
-		}
-	}
+	public PlayerState State { get; set; }
 	public float Gravity = ProjectSettings.GetSetting("physics/2d/default_gravity").AsSingle();
 
 	private AnimationPlayer _animationPlayer;
 	private Dictionary<PlayerState, string> _stateAnimations;
-	private PlayerState _state;	
+	private Stopwatch _watch = new Stopwatch();
 
 	public override void _Ready()
 	{
@@ -59,12 +49,14 @@ public override void _Ready()
 
 	public override void _PhysicsProcess(double delta)
 	{
+		var oldState = State;
 		Vector2 velocity = Velocity;
 
 		if (IsOnFloor() && velocity.X.Equals(0) && !Input.IsActionPressed("ui_down"))
 		{
+			Console.WriteLine("stand");
 			State = PlayerState.Stand;
-		}
+		} else { Console.WriteLine($"not stand ({State})"); }
 
 		if (!IsOnFloor())
 			velocity.Y += Gravity * (float)delta;
@@ -92,17 +84,22 @@ public override void _PhysicsProcess(double delta)
 			State = PlayerState.Run;
 		}
 
-		if (velocity.Y != 0 && !Input.IsActionJustPressed("ui_down"))
+		if (velocity.Y != 0 && !Input.IsActionPressed("ui_down"))
 		{
-			Console.WriteLine($"{velocity.Y}");
 			State = PlayerState.Jump;
 		}
 
-		if (Input.IsActionJustPressed("ui_down"))
+		if (Input.IsActionPressed("ui_down"))
 		{
 			State = PlayerState.Sit;
 		}
 
+		if (velocity.X != 0 && Input.IsActionPressed("ui_down") &&
+			(Input.IsActionPressed("ui_left") || Input.IsActionPressed("ui_right")))
+		{
+			State = PlayerState.SitWalk;
+		}
+
 		var localMousePosition = GetLocalMousePosition();
 		var globalMousePosition = GetGlobalMousePosition();
 
@@ -125,6 +122,12 @@ public override void _PhysicsProcess(double delta)
 		Velocity = velocity;
 
 		MoveAndSlide();
+		
+		if (State == PlayerState.Sit && oldState == PlayerState.SitWalk)
+			_animationPlayer.Play("sit", fromEnd: true);
+		
+		if (State != oldState)
+			Animate();
 	}
 
 	private void Animate()

player/stickplayer.tscn

@@ -215,6 +215,18 @@ tracks/16/keys = {
 "update": 0,
 "values": [0.0]
 }
+tracks/17/type = "value"
+tracks/17/imported = false
+tracks/17/enabled = true
+tracks/17/path = NodePath("CollisionShape2D2:scale")
+tracks/17/interp = 1
+tracks/17/loop_wrap = true
+tracks/17/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector2(2.54, 2.4)]
+}
 
 [sub_resource type="Animation" id="Animation_fcopi"]
 resource_name = "creep"
@@ -866,6 +878,7 @@ tracks/18/keys = {
 
 [sub_resource type="Animation" id="Animation_4uhs2"]
 resource_name = "sit_walk"
+loop_mode = 1
 tracks/0/type = "value"
 tracks/0/imported = false
 tracks/0/enabled = true
@@ -1493,3 +1506,4 @@ shape = SubResource("CapsuleShape2D_ix8b3")
 libraries = {
 "": SubResource("AnimationLibrary_houuf")
 }
+next/RESET = &"sit"