Update Finite State Machine demo

aaronfranke · aaronfranke · commit 9975c9506522 · 2020-02-02T20:28:25.000-05:00
diff --git a/2d/finite_state_machine/Demo.tscn b/2d/finite_state_machine/Demo.tscn
@@ -1,13 +1,13 @@
 [gd_scene load_steps=5 format=2]
 
-[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=1]
+[ext_resource path="res://player/Player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://debug/Explanations.tscn" type="PackedScene" id=2]
 [ext_resource path="res://debug/StatesStackDiplayer.tscn" type="PackedScene" id=3]
-[ext_resource path="res://player/Player.tscn" type="PackedScene" id=4]
+[ext_resource path="res://debug/ControlsPanel.tscn" type="PackedScene" id=4]
 
 [node name="Demo" type="Node"]
 
-[node name="Player" parent="." instance=ExtResource( 4 )]
+[node name="Player" parent="." instance=ExtResource( 1 )]
 
 [node name="Explanations" parent="." instance=ExtResource( 2 )]
 
@@ -20,6 +20,6 @@ __meta__ = {
 
 [node name="StatesStackDiplayer" parent="Control" instance=ExtResource( 3 )]
 
-[node name="ControlsPanel" parent="Control" instance=ExtResource( 1 )]
+[node name="ControlsPanel" parent="Control" instance=ExtResource( 4 )]
 
 [editable path="Player"]
diff --git a/2d/finite_state_machine/debug/ControlsPanel.tscn b/2d/finite_state_machine/debug/ControlsPanel.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=2]
+[ext_resource path="res://fonts/source_code_pro_explanations.tres" type="DynamicFont" id=1]
 
 [node name="ControlsPanel" type="Panel"]
 anchor_left = 1.0
@@ -18,7 +18,7 @@ margin_left = 10.0
 margin_top = 10.0
 margin_right = -10.0
 margin_bottom = -10.0
-custom_fonts/font = ExtResource( 2 )
+custom_fonts/font = ExtResource( 1 )
 text = "Shoot:
 Attack:
 Stagger:
@@ -32,7 +32,7 @@ margin_left = 10.0
 margin_top = 10.0
 margin_right = -10.0
 margin_bottom = -10.0
-custom_fonts/font = ExtResource( 2 )
+custom_fonts/font = ExtResource( 1 )
 text = "R
 F
 X
diff --git a/2d/finite_state_machine/debug/states_stack_displayer.gd b/2d/finite_state_machine/debug/states_stack_displayer.gd
@@ -2,14 +2,13 @@ extends Panel
 
 onready var fsm_node = get_node("../../Player/StateMachine")
 
-func _process(delta):
-	var states_names = ''
-	var numbers = ''
+func _process(_delta):
+	var states_names = ""
+	var numbers = ""
 	var index = 0
 	for state in fsm_node.states_stack:
 		states_names += state.get_name() + '\n'
 		numbers += str(index) + '\n'
 		index += 1
-
 	$States.text = states_names
 	$Numbers.text = numbers
diff --git a/2d/finite_state_machine/player/Player.tscn b/2d/finite_state_machine/player/Player.tscn
@@ -49,7 +49,6 @@ __meta__ = {
 
 [node name="StateMachine" type="Node" parent="."]
 script = ExtResource( 2 )
-START_STATE = NodePath("Idle")
 
 [node name="Idle" type="Node" parent="StateMachine"]
 script = ExtResource( 3 )
@@ -116,7 +115,6 @@ align = 1
 valign = 1
 uppercase = true
 script = ExtResource( 15 )
-
 [connection signal="state_changed" from="StateMachine" to="BodyPivot/WeaponPivot/Offset/Sword" method="_on_StateMachine_state_changed"]
 [connection signal="state_changed" from="StateMachine" to="StateNameDisplayer" method="_on_StateMachine_state_changed"]
 [connection signal="animation_finished" from="AnimationPlayer" to="StateMachine" method="_on_animation_finished"]
diff --git a/2d/finite_state_machine/player/bullet/Bullet.tscn b/2d/finite_state_machine/player/bullet/Bullet.tscn
@@ -12,4 +12,3 @@ script = ExtResource( 1 )
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource( 1 )
-
diff --git a/2d/finite_state_machine/player/bullet/bullet.gd b/2d/finite_state_machine/player/bullet/bullet.gd
@@ -1,9 +1,7 @@
 extends KinematicBody2D
 
-
 var direction = Vector2()
-export(float) var SPEED = 1000.0
-
+export(float) var speed = 1000.0
 
 func _ready():
 	set_as_toplevel(true)
@@ -13,16 +11,16 @@ func _physics_process(delta):
 	if is_outside_view_bounds():
 		queue_free()
 
-	var motion = direction * SPEED * delta
+	var motion = direction * speed * delta
 	var collision_info = move_and_collide(motion)
 	if collision_info:
 		queue_free()
 
 
 func is_outside_view_bounds():
 	return position.x > OS.get_screen_size().x or position.x < 0.0 \
-		or position.y > OS.get_screen_size().y or position.y < 0.0
+			or position.y > OS.get_screen_size().y or position.y < 0.0
 
 
 func _draw():
-	draw_circle(Vector2(), $CollisionShape2D.shape.radius, Color('#ffffff'))
+	draw_circle(Vector2(), $CollisionShape2D.shape.radius, Color.white)
diff --git a/2d/finite_state_machine/player/bullet/bullet_spawner.gd b/2d/finite_state_machine/player/bullet/bullet_spawner.gd
@@ -6,6 +6,7 @@ func _input(event):
 	if event.is_action_pressed("fire"):
 		fire(owner.look_direction)
 
+
 func fire(direction):
 	if not $CooldownTimer.is_stopped():
 		return
diff --git a/2d/finite_state_machine/player/player_controller.gd b/2d/finite_state_machine/player/player_controller.gd
@@ -1,25 +1,25 @@
-"""
-The Player is a KinematicBody2D, in other words a physics-driven object.
-It can move, collide with the world...
-It HAS a state machine, but the body and the state machine are separate.
-"""
 extends KinematicBody2D
+# The Player is a KinematicBody2D, in other words a physics-driven object.
+# It can move, collide with the world, etc...
+# The player has a state machine, but the body and the state machine are separate.
 
 signal direction_changed(new_direction)
 
-var look_direction = Vector2(1, 0) setget set_look_direction
+var look_direction = Vector2.RIGHT setget set_look_direction
 
-func take_damage(attacker, amount, effect=null):
-	if self.is_a_parent_of(attacker):
+func take_damage(attacker, amount, effect = null):
+	if is_a_parent_of(attacker):
 		return
 	$States/Stagger.knockback_direction = (attacker.global_position - global_position).normalized()
 	$Health.take_damage(amount, effect)
 
+
 func set_dead(value):
 	set_process_input(not value)
 	set_physics_process(not value)
 	$CollisionPolygon2D.disabled = value
 
+
 func set_look_direction(value):
 	look_direction = value
 	emit_signal("direction_changed", value)
diff --git a/2d/finite_state_machine/player/player_state_machine.gd b/2d/finite_state_machine/player/player_state_machine.gd
@@ -9,10 +9,9 @@ func _ready():
 		"attack": $Attack,
 	}
 
+
 func _change_state(state_name):
-	"""
-	The base state_machine interface this node extends does most of the work
-	"""
+	# The base state_machine interface this node extends does most of the work.
 	if not _active:
 		return
 	if state_name in ["stagger", "jump", "attack"]:
@@ -21,11 +20,10 @@ func _change_state(state_name):
 		$Jump.initialize($Move.speed, $Move.velocity)
 	._change_state(state_name)
 
+
 func _input(event):
-	"""
-	Here we only handle input that can interrupt states, attacking in this case
-	otherwise we let the state node handle it
-	"""
+	# Here we only handle input that can interrupt states, attacking in this case,
+	# otherwise we let the state node handle it.
 	if event.is_action_pressed("attack"):
 		if current_state in [$Attack, $Stagger]:
 			return
diff --git a/2d/finite_state_machine/player/states/combat/attack.gd b/2d/finite_state_machine/player/states/combat/attack.gd
@@ -3,5 +3,6 @@ extends "res://state_machine/state.gd"
 func enter():
 	owner.get_node("AnimationPlayer").play("idle")
 
+
 func _on_Sword_attack_finished():
 	emit_signal("finished", "previous")
diff --git a/2d/finite_state_machine/player/states/combat/stagger.gd b/2d/finite_state_machine/player/states/combat/stagger.gd
@@ -1,15 +1,12 @@
-"""
-The stagger state end with the stagger animation from the AnimationPlayer
-The animation only affects the Body Sprite's modulate property so
-it could stack with other animations if we had two AnimationPlayer nodes
-"""
 extends "res://state_machine/state.gd"
-
-var knockback_direction = Vector2()
+# The stagger state end with the stagger animation from the AnimationPlayer.
+# The animation only affects the Body Sprite's modulate property so it
+# could stack with other animations if we had two AnimationPlayer nodes.
 
 func enter():
 	owner.get_node("AnimationPlayer").play("stagger")
 
+
 func _on_animation_finished(anim_name):
 	assert(anim_name == "stagger")
 	emit_signal("finished", "previous")
diff --git a/2d/finite_state_machine/player/states/debug/state_name_displayer.gd b/2d/finite_state_machine/player/states/debug/state_name_displayer.gd
@@ -5,8 +5,10 @@ var start_position = Vector2()
 func _ready():
 	start_position = rect_position
 
-func _physics_process(delta):
+
+func _physics_process(_delta):
 	rect_position = $"../BodyPivot".position + start_position
 
+
 func _on_StateMachine_state_changed(current_state):
 	text = current_state.get_name()
diff --git a/2d/finite_state_machine/player/states/die.gd b/2d/finite_state_machine/player/states/die.gd
@@ -1,10 +1,10 @@
 extends "res://state_machine/state.gd"
 
-
-# Initialize the state. E.g. change the animation
+# Initialize the state. E.g. change the animation.
 func enter():
 	owner.set_dead(true)
 	owner.get_node("AnimationPlayer").play("die")
 
-func _on_animation_finished(anim_name):
+
+func _on_animation_finished(_anim_name):
 	emit_signal("finished", "dead")
diff --git a/2d/finite_state_machine/player/states/motion/in_air/jump.gd b/2d/finite_state_machine/player/states/motion/in_air/jump.gd
@@ -1,15 +1,12 @@
 extends "../motion.gd"
 
-export(float) var BASE_MAX_HORIZONTAL_SPEED = 400.0
+export(float) var base_max_horizontal_speed = 400.0
 
-export(float) var AIR_ACCELERATION = 1000.0
-export(float) var AIR_DECCELERATION = 2000.0
-export(float) var AIR_STEERING_POWER = 50.0
+export(float) var air_acceleration = 1000.0
+export(float) var air_deceleration = 2000.0
+export(float) var air_steering_power = 50.0
 
-export(float) var JUMP_HEIGHT = 120.0
-export(float) var JUMP_DURATION = 0.8
-
-export(float) var GRAVITY = 1600.0
+export(float) var gravity = 1600.0
 
 var enter_velocity = Vector2()
 
@@ -22,7 +19,7 @@ var height = 0.0
 
 func initialize(speed, velocity):
 	horizontal_speed = speed
-	max_horizontal_speed = speed if speed > 0.0 else BASE_MAX_HORIZONTAL_SPEED
+	max_horizontal_speed = speed if speed > 0.0 else base_max_horizontal_speed
 	enter_velocity = velocity
 
 func enter():
@@ -45,19 +42,19 @@ func update(delta):
 
 func move_horizontally(delta, direction):
 	if direction:
-		horizontal_speed += AIR_ACCELERATION * delta
+		horizontal_speed += air_acceleration * delta
 	else:
-		horizontal_speed -= AIR_DECCELERATION * delta
+		horizontal_speed -= air_deceleration * delta
 	horizontal_speed = clamp(horizontal_speed, 0, max_horizontal_speed)
 
 	var target_velocity = horizontal_speed * direction.normalized()
-	var steering_velocity = (target_velocity - horizontal_velocity).normalized() * AIR_STEERING_POWER
+	var steering_velocity = (target_velocity - horizontal_velocity).normalized() * air_steering_power
 	horizontal_velocity += steering_velocity
 
 	owner.move_and_slide(horizontal_velocity)
 
 func animate_jump_height(delta):
-	vertical_speed -= GRAVITY * delta
+	vertical_speed -= gravity * delta
 	height += vertical_speed * delta
 	height = max(0.0, height)
 
diff --git a/2d/finite_state_machine/player/states/motion/motion.gd b/2d/finite_state_machine/player/states/motion/motion.gd
@@ -1,16 +1,18 @@
-# Collection of important methods to handle direction and animation
 extends "res://state_machine/state.gd"
+# Collection of important methods to handle direction and animation.
 
 func handle_input(event):
 	if event.is_action_pressed("simulate_damage"):
 		emit_signal("finished", "stagger")
 
+
 func get_input_direction():
 	var input_direction = Vector2()
-	input_direction.x = int(Input.is_action_pressed("move_right")) - int(Input.is_action_pressed("move_left"))
-	input_direction.y = int(Input.is_action_pressed("move_down")) - int(Input.is_action_pressed("move_up"))
+	input_direction.x = Input.get_action_strength("move_right") - Input.get_action_strength("move_left")
+	input_direction.y = Input.get_action_strength("move_down") - Input.get_action_strength("move_up")
 	return input_direction
 
+
 func update_look_direction(direction):
 	if direction and owner.look_direction != direction:
 		owner.look_direction = direction
diff --git a/2d/finite_state_machine/player/states/motion/on_ground/idle.gd b/2d/finite_state_machine/player/states/motion/on_ground/idle.gd
@@ -3,10 +3,12 @@ extends "on_ground.gd"
 func enter():
 	owner.get_node("AnimationPlayer").play("idle")
 
+
 func handle_input(event):
 	return .handle_input(event)
 
-func update(delta):
+
+func update(_delta):
 	var input_direction = get_input_direction()
 	if input_direction:
 		emit_signal("finished", "move")
diff --git a/2d/finite_state_machine/player/states/motion/on_ground/move.gd b/2d/finite_state_machine/player/states/motion/on_ground/move.gd
@@ -1,7 +1,7 @@
 extends "on_ground.gd"
 
-export(float) var MAX_WALK_SPEED = 450
-export(float) var MAX_RUN_SPEED = 700
+export(float) var max_walk_speed = 450
+export(float) var max_run_speed = 700
 
 func enter():
 	speed = 0.0
@@ -11,22 +11,25 @@ func enter():
 	update_look_direction(input_direction)
 	owner.get_node("AnimationPlayer").play("walk")
 
+
 func handle_input(event):
 	return .handle_input(event)
 
-func update(delta):
+
+func update(_delta):
 	var input_direction = get_input_direction()
 	if not input_direction:
 		emit_signal("finished", "idle")
 	update_look_direction(input_direction)
 
-	speed = MAX_RUN_SPEED if Input.is_action_pressed("run") else MAX_WALK_SPEED
+	speed = max_run_speed if Input.is_action_pressed("run") else max_walk_speed
 	var collision_info = move(speed, input_direction)
 	if not collision_info:
 		return
-	if speed == MAX_RUN_SPEED and collision_info.collider.is_in_group("environment"):
+	if speed == max_run_speed and collision_info.collider.is_in_group("environment"):
 		return null
 
+
 func move(speed, direction):
 	velocity = direction.normalized() * speed
 	owner.move_and_slide(velocity, Vector2(), 5, 2)
diff --git a/2d/finite_state_machine/player/states/motion/on_ground/on_ground.gd b/2d/finite_state_machine/player/states/motion/on_ground/on_ground.gd
@@ -1,5 +1,6 @@
 extends "../motion.gd"
 
+# warning-ignore-all:unused_class_variable
 var speed = 0.0
 var velocity = Vector2()
 
diff --git a/2d/finite_state_machine/player/weapon/Sword.tscn b/2d/finite_state_machine/player/weapon/Sword.tscn
@@ -234,11 +234,10 @@ anims/attack_fast = SubResource( 3 )
 anims/attack_medium = SubResource( 4 )
 anims/idle = SubResource( 5 )
 
-[node name="sword" type="Sprite" parent="."]
+[node name="Sword" type="Sprite" parent="."]
 position = Vector2( 4, 0 )
 texture = ExtResource( 2 )
 offset = Vector2( 67, 0 )
 
 [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."]
 polygon = PoolVector2Array( 28.0001, -15.9999, 136, -15.9995, 160, 0, 136, 16.0005, 27.9999, 16.0001 )
-
diff --git a/2d/finite_state_machine/player/weapon/sword.gd b/2d/finite_state_machine/player/weapon/sword.gd
diff --git a/2d/finite_state_machine/player/weapon/weapon_pivot.gd b/2d/finite_state_machine/player/weapon/weapon_pivot.gd
diff --git a/2d/finite_state_machine/project.godot b/2d/finite_state_machine/project.godot
diff --git a/2d/finite_state_machine/state_machine/state.gd b/2d/finite_state_machine/state_machine/state.gd
diff --git a/2d/finite_state_machine/state_machine/state_machine.gd b/2d/finite_state_machine/state_machine/state_machine.gd
diff --git a/3d/platformer/stage.tscn b/3d/platformer/stage.tscn

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,3 @@ script = ExtResource( 1 )`
`12`	`12`
`13`	`13`	`[node name="CollisionShape2D" type="CollisionShape2D" parent="."]`
`14`	`14`	`shape = SubResource( 1 )`
`15`		`-`