diff --git a/lib/templates/Actor/ActorTemplate.tscn b/lib/templates/Actor/ActorTemplate.tscn index fdf0050..c7dd585 100644 --- a/lib/templates/Actor/ActorTemplate.tscn +++ b/lib/templates/Actor/ActorTemplate.tscn @@ -1,29 +1,16 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=5 format=2] +[ext_resource path="res://lib/classes/animated_sprite_state_receiver.gd" type="Script" id=1] [ext_resource path="res://lib/classes/state_machine.gd" type="Script" id=2] -[ext_resource path="res://lib/classes/state_animated_actor.gd" type="Script" id=4] [ext_resource path="res://lib/classes/movement_state_receiver.gd" type="Script" id=5] [ext_resource path="res://lib/classes/actor.gd" type="Script" id=8] -[sub_resource type="Resource" id=1] -script = ExtResource( 4 ) -debug_state = false -timeout_seconds = 2.0 -name = "idle" -move_speed = 60.0 -move_acceleration = 0.0 -move_speed_modifier = 0.0 -move_modifier_move_acceleration = 0.0 -jerk_factor = 0.0 -animation_sequence = [ "idle", "Max Height" ] -emitter_frame_subscriptions = { -} - [node name="ActorTemplate" type="KinematicBody2D"] collision_layer = 2 script = ExtResource( 8 ) [node name="AnimatedSprite_StateReceiver" type="AnimatedSprite" parent="."] +script = ExtResource( 1 ) __meta__ = { "_aseprite_wizard_config_": { "layer": "", @@ -37,6 +24,7 @@ __meta__ = { "source": "" } } +callable_state_machine = NodePath("../Movement_StateMachine") [node name="Movement_StateReceiver" type="Node" parent="."] script = ExtResource( 5 ) @@ -44,7 +32,5 @@ callable_state_machine = NodePath("../Movement_StateMachine") [node name="Movement_StateMachine" type="Node" parent="."] script = ExtResource( 2 ) -starting_state_name = "idle" -states = [ SubResource( 1 ) ] [node name="SE_Player" type="AudioStreamPlayer" parent="."] diff --git a/src/actors/players/playerE/PlayerE-AnimatedSprite_StateReceiver.gd b/src/actors/players/playerE/PlayerE-AnimatedSprite_StateReceiver.gd new file mode 100644 index 0000000..1e0c6b9 --- /dev/null +++ b/src/actors/players/playerE/PlayerE-AnimatedSprite_StateReceiver.gd @@ -0,0 +1,16 @@ +extends AnimatedSprite_StateReceiver + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/src/actors/players/playerE/PlayerE-Movement_StateMachine.gd b/src/actors/players/playerE/PlayerE-Movement_StateMachine.gd new file mode 100644 index 0000000..82a45d0 --- /dev/null +++ b/src/actors/players/playerE/PlayerE-Movement_StateMachine.gd @@ -0,0 +1,16 @@ +extends StateMachine + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd b/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd new file mode 100644 index 0000000..d125128 --- /dev/null +++ b/src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd @@ -0,0 +1,16 @@ +extends Movement_StateReceiver + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/src/actors/players/playerE/PlayerE.gd b/src/actors/players/playerE/PlayerE.gd new file mode 100644 index 0000000..f655da4 --- /dev/null +++ b/src/actors/players/playerE/PlayerE.gd @@ -0,0 +1,16 @@ +extends Actor + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn index 6a8ceda..d0d09aa 100644 --- a/src/actors/players/playerE/PlayerE.tscn +++ b/src/actors/players/playerE/PlayerE.tscn @@ -1,13 +1,22 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://lib/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/actors/players/playerE/PlayerE_SpriteFrames.tres" type="SpriteFrames" id=2] +[ext_resource path="res://src/actors/players/playerE/PlayerE.gd" type="Script" id=3] +[ext_resource path="res://src/actors/players/playerE/PlayerE-Movement_StateMachine.gd" type="Script" id=4] +[ext_resource path="res://src/actors/players/playerE/PlayerE-AnimatedSprite_StateReceiver.gd" type="Script" id=5] +[ext_resource path="res://src/actors/players/playerE/PlayerE-Movement_StateReceiver.gd" type="Script" id=6] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 7, 14 ) [node name="PlayerE" instance=ExtResource( 1 )] +script = ExtResource( 3 ) actor_type = "Player" [node name="AnimatedSprite_StateReceiver" parent="." index="0"] frames = ExtResource( 2 ) +script = ExtResource( 5 ) __meta__ = { "_aseprite_wizard_config_": { "layer": "", @@ -21,3 +30,13 @@ __meta__ = { "source": "/home/relay01/Assets/Library/Asset Packs 1-5/Asset Packs 1-4 (final)/Asset Pack-V1/Player Run/player run 48x48.aseprite" } } + +[node name="Movement_StateReceiver" parent="." index="1"] +script = ExtResource( 6 ) + +[node name="Movement_StateMachine" parent="." index="2"] +script = ExtResource( 4 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="4"] +position = Vector2( 0, 2 ) +shape = SubResource( 1 )