yuki/girlwillneversingagain
yuki/girlwillneversingagain
1
0
Fork 0
Code Pull requests Releases Activity

Compare commits

base: yuki:2a865423dc325335292777535799508b75c015a2
Branches Tags
yuki:master
..
compare: yuki:66039b70d9a1b96abd0e161300ee120f72f8d695
Branches Tags
yuki:master

No commits in common. "2a865423dc325335292777535799508b75c015a2" and "66039b70d9a1b96abd0e161300ee120f72f8d695" have entirely different histories.
2a865423dc ... 66039b70d9

6 changed files with 2 additions and 50 deletions
Show stats Expand all files Collapse all files

2
classes/state/player_state.gd
View file

@ -12,7 +12,7 @@ func _ready() -> void:
assert(player != null, "The PlayerState state type must be used only in the player scene. It needs the owner to be a Player node.") assert(player != null, "The PlayerState state type must be used only in the player scene. It needs the owner to be a Player node.")
func _enter(_previous_state_path: String, _data: Dictionary[StringName, Variant] = {}) -> void: func _enter(_previous_state_path: String, _data: Dictionary = {}) -> void:
pass pass

3
classes/state/state.gd
View file

@ -7,9 +7,6 @@
signal finished(next_state_path: String, data: Dictionary) signal finished(next_state_path: String, data: Dictionary)
## Universal paused state
const PAUSED = "Paused"
## For 'ghost frame' update fix ## For 'ghost frame' update fix
var is_active: bool = false: var is_active: bool = false:
set(value): set(value):

18
scenes/player/player.gd
View file

@ -1,28 +1,10 @@
class_name Player extends CharacterBody2D class_name Player extends CharacterBody2D
const DEADZONE = 0.1
@export var max_speed: float = 300.0 @export var max_speed: float = 300.0
@onready var sprite: AnimatedSprite2D = $AnimatedSprite2D
@onready var state_machine: StateMachine = $StateMachine
func get_movement_vector() -> Vector2: func get_movement_vector() -> Vector2:
var x_mov: float = Input.get_action_strength('move_right') - Input.get_action_strength('move_left') var x_mov: float = Input.get_action_strength('move_right') - Input.get_action_strength('move_left')
var y_mov: float = Input.get_action_strength('move_down') - Input.get_action_strength('move_up') var y_mov: float = Input.get_action_strength('move_down') - Input.get_action_strength('move_up')
return Vector2(x_mov, y_mov) return Vector2(x_mov, y_mov)
func match_state(exclude: Array[StringName] = []) -> StringName:
var movement_vector: Vector2 = get_movement_vector()
if movement_vector.length() > DEADZONE:
if PlayerState.WALKING in exclude: return ""
return PlayerState.WALKING
elif movement_vector.length() < DEADZONE:
if PlayerState.IDLE in exclude: return ""
return PlayerState.IDLE
return ""

12
scenes/player/player.tscn
View file

@ -1,9 +1,7 @@
[gd_scene load_steps=6 format=3 uid="uid://cqm5besqgsb7x"] [gd_scene load_steps=4 format=3 uid="uid://cqm5besqgsb7x"]
[ext_resource type="Script" uid="uid://dpsocqnk0e6le" path="res://scenes/player/player.gd" id="1_dovo2"] [ext_resource type="Script" uid="uid://dpsocqnk0e6le" path="res://scenes/player/player.gd" id="1_dovo2"]
[ext_resource type="SpriteFrames" uid="uid://6v5nyv2wo47g" path="res://scenes/player/assets/yukotsuki.aseprite" id="2_dovo2"] [ext_resource type="SpriteFrames" uid="uid://6v5nyv2wo47g" path="res://scenes/player/assets/yukotsuki.aseprite" id="2_dovo2"]
[ext_resource type="Script" uid="uid://diths5s8vd7lr" path="res://classes/state_machine/state_machine.gd" id="2_lvxji"]
[ext_resource type="Script" uid="uid://cl6snimpmxcvu" path="res://scenes/player/states/player_idle.gd" id="3_p47bc"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_gmlin"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_gmlin"]
radius = 6.0 radius = 6.0
@ -13,14 +11,6 @@ height = 14.0
collision_mask = 2 collision_mask = 2
script = ExtResource("1_dovo2") script = ExtResource("1_dovo2")
[node name="StateMachine" type="Node" parent="."]
script = ExtResource("2_lvxji")
metadata/_custom_type_script = "uid://diths5s8vd7lr"
[node name="Idle" type="Node" parent="StateMachine"]
script = ExtResource("3_p47bc")
metadata/_custom_type_script = "uid://bebe1y51hwns8"
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
position = Vector2(0, -16) position = Vector2(0, -16)
sprite_frames = ExtResource("2_dovo2") sprite_frames = ExtResource("2_dovo2")

16
scenes/player/states/player_idle.gd
View file

@ -1,16 +0,0 @@
extends PlayerState
var next_state: StringName
func _enter(_previous_state_path: String, _data: Dictionary[StringName, Variant] = {}) -> void:
print('entering idle')
#print('entered')
func _state_physics_update(_delta: float) -> void:
next_state = player.match_state([IDLE])
if next_state != "":
print(next_state)
#finished.emit(next_state)

1
scenes/player/states/player_idle.gd.uid
View file

@ -1 +0,0 @@
uid://cl6snimpmxcvu