diff --git a/Assets/Sprites/Characters/base.ase b/Assets/Sprites/Characters/base.ase index ed5e1da..ac8c457 100644 Binary files a/Assets/Sprites/Characters/base.ase and b/Assets/Sprites/Characters/base.ase differ diff --git a/Assets/Sprites/Characters/doc.ase b/Assets/Sprites/Characters/doc.ase index b20a9be..b5712d2 100644 Binary files a/Assets/Sprites/Characters/doc.ase and b/Assets/Sprites/Characters/doc.ase differ diff --git a/Assets/Sprites/Characters/doc.png b/Assets/Sprites/Characters/doc.png index d537e24..6b94ad1 100644 Binary files a/Assets/Sprites/Characters/doc.png and b/Assets/Sprites/Characters/doc.png differ diff --git a/Assets/Sprites/Characters/forsen2.ase b/Assets/Sprites/Characters/forsen2.ase index 88e2849..3e5650c 100644 Binary files a/Assets/Sprites/Characters/forsen2.ase and b/Assets/Sprites/Characters/forsen2.ase differ diff --git a/Assets/Sprites/Characters/forsen2.png b/Assets/Sprites/Characters/forsen2.png index 5a08090..94ba793 100644 Binary files a/Assets/Sprites/Characters/forsen2.png and b/Assets/Sprites/Characters/forsen2.png differ diff --git a/Assets/Sprites/Characters/velcuz.ase b/Assets/Sprites/Characters/velcuz.ase new file mode 100644 index 0000000..b258fc2 Binary files /dev/null and b/Assets/Sprites/Characters/velcuz.ase differ diff --git a/Assets/Sprites/arena-tileset.ase b/Assets/Sprites/arena-tileset.ase index 0c50590..1f58db8 100644 Binary files a/Assets/Sprites/arena-tileset.ase and b/Assets/Sprites/arena-tileset.ase differ diff --git a/Assets/Sprites/forsenbussin.ase b/Assets/Sprites/forsenbussin.ase new file mode 100644 index 0000000..9792dd8 Binary files /dev/null and b/Assets/Sprites/forsenbussin.ase differ diff --git a/Scenes/Maps/Arena.tscn b/Scenes/Maps/Arena.tscn index d575289..cf59744 100644 --- a/Scenes/Maps/Arena.tscn +++ b/Scenes/Maps/Arena.tscn @@ -252,7 +252,7 @@ physics_layer_0/collision_layer = 1 sources/2 = SubResource("TileSetAtlasSource_5yxvt") sources/0 = SubResource("TileSetAtlasSource_fcd6d") -[sub_resource type="ShaderMaterial" id="ShaderMaterial_i75i0"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_uhsxa"] resource_local_to_scene = true shader = ExtResource("5_h8k5p") shader_parameter/color = Quaternion(1, 1, 1, 1) @@ -344,7 +344,7 @@ visible = false position = Vector2(120, -112) [node name="Doc" parent="Entities" index="18" instance=ExtResource("4_ej0f3")] -material = SubResource("ShaderMaterial_i75i0") +material = SubResource("ShaderMaterial_uhsxa") [node name="PointLight2D" type="PointLight2D" parent="Entities" index="19"] position = Vector2(168, -42) diff --git a/State/Character/NPCIdleState.cs b/State/Character/NPCIdleState.cs index 910b978..f41ddb1 100644 --- a/State/Character/NPCIdleState.cs +++ b/State/Character/NPCIdleState.cs @@ -17,9 +17,9 @@ public partial class NPCIdleState : NPCState return null; } - public override IState Enter(IState previousState) + public override IState Enter(IState prev) { - Character.MovementAnimation.Play("idle"); - return base.Enter(previousState); + Character.MovementAnimation?.Play("idle"); + return base.Enter(prev); } }