diff --git a/gymkhana/characters/oier/oier-mod-talk.png b/gymkhana/characters/oier/oier-mod-talk.png new file mode 100644 index 00000000..bebfa778 Binary files /dev/null and b/gymkhana/characters/oier/oier-mod-talk.png differ diff --git a/gymkhana/characters/oier/oier-mod-talk.xcf b/gymkhana/characters/oier/oier-mod-talk.xcf new file mode 100644 index 00000000..bdfef36c Binary files /dev/null and b/gymkhana/characters/oier/oier-mod-talk.xcf differ diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn index 0aae9b81..0c701bfe 100644 --- a/gymkhana/characters/oier/oier.tscn +++ b/gymkhana/characters/oier/oier.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=29 format=2] +[gd_scene load_steps=32 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://gymkhana/characters/oier/oier-mod.png" type="Texture" id=2] [ext_resource path="res://gymkhana/characters/oier/oier_animations.tres" type="Resource" id=3] +[ext_resource path="res://gymkhana/characters/oier/oier-mod-talk.png" type="Texture" id=4] [sub_resource type="AtlasTexture" id=22] flags = 4 @@ -34,6 +35,16 @@ flags = 4 atlas = ExtResource( 2 ) region = Rect2( 1638, 0, 273, 795 ) +[sub_resource type="AtlasTexture" id=59] +flags = 4 +atlas = ExtResource( 2 ) +region = Rect2( 5733, 0, 273, 795 ) + +[sub_resource type="AtlasTexture" id=60] +flags = 4 +atlas = ExtResource( 4 ) +region = Rect2( 5733, 0, 273, 795 ) + [sub_resource type="AtlasTexture" id=46] flags = 4 atlas = ExtResource( 2 ) @@ -151,6 +162,11 @@ animations = [ { "name": "idle_up", "speed": 5.0 }, { +"frames": [ SubResource( 59 ), SubResource( 60 ) ], +"loop": true, +"name": "speak_down", +"speed": 5.0 +}, { "frames": [ SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 47 ) ], "loop": true, "name": "walk_down", @@ -193,7 +209,7 @@ animations = ExtResource( 3 ) position = Vector2( 0, -155 ) scale = Vector2( 0.389246, 0.389247 ) frames = SubResource( 20 ) -animation = "idle_up" +animation = "speak_down" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 5, -151 ) diff --git a/gymkhana/characters/oier/oier_animations.tres b/gymkhana/characters/oier/oier_animations.tres index 14e8c39d..65fdf49d 100644 --- a/gymkhana/characters/oier/oier_animations.tres +++ b/gymkhana/characters/oier/oier_animations.tres @@ -141,12 +141,12 @@ mirrored = false [sub_resource type="Resource" id=28] script = ExtResource( 3 ) -animation = "idle_down" +animation = "speak_down" mirrored = false [sub_resource type="Resource" id=29] script = ExtResource( 3 ) -animation = "idle_down" +animation = "speak_down" mirrored = false [sub_resource type="Resource" id=30]