diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn index bdfa5ac5..6cf686f3 100644 --- a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=2] +[gd_scene load_steps=27 format=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-donkey-sheet.png" type="Texture" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-idle.png" type="Texture" id=5] [ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=6] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=7] +[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png" type="Texture" id=8] [sub_resource type="Resource" id=17] script = ExtResource( 6 ) @@ -84,11 +85,16 @@ flags = 4 atlas = ExtResource( 4 ) region = Rect2( 930, 0, 186, 375 ) -[sub_resource type="AtlasTexture" id=16] +[sub_resource type="AtlasTexture" id=18] flags = 4 -atlas = ExtResource( 5 ) +atlas = ExtResource( 8 ) region = Rect2( 0, 0, 118, 375 ) +[sub_resource type="AtlasTexture" id=19] +flags = 4 +atlas = ExtResource( 8 ) +region = Rect2( 118, 0, 118, 375 ) + [sub_resource type="SpriteFrames" id=14] animations = [ { "frames": [ SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], @@ -111,7 +117,7 @@ animations = [ { "name": "pulp", "speed": 5.0 }, { -"frames": [ SubResource( 16 ) ], +"frames": [ SubResource( 18 ), SubResource( 19 ) ], "loop": true, "name": "speak", "speed": 5.0 diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn index 3cb70b88..87591eb3 100644 --- a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=23 format=2] +[gd_scene load_steps=25 format=2] [ext_resource path="res://addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-donkey-sheet.png" type="Texture" id=2] @@ -6,6 +6,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-pulp-sheet.png" type="Texture" id=4] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-disco-sheet.png" type="Texture" id=5] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/DancingAnimator.gd" type="Script" id=6] +[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png" type="Texture" id=7] [sub_resource type="CapsuleShape2D" id=1] radius = 57.0 @@ -78,9 +79,14 @@ region = Rect2( 885, 0, 177, 375 ) [sub_resource type="AtlasTexture" id=28] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 7 ) region = Rect2( 0, 0, 117, 375 ) +[sub_resource type="AtlasTexture" id=29] +flags = 4 +atlas = ExtResource( 7 ) +region = Rect2( 117, 0, 117, 375 ) + [sub_resource type="SpriteFrames" id=14] animations = [ { "frames": [ SubResource( 15 ), SubResource( 16 ), SubResource( 17 ), SubResource( 18 ) ], @@ -103,7 +109,7 @@ animations = [ { "name": "pulp", "speed": 5.0 }, { -"frames": [ SubResource( 28 ) ], +"frames": [ SubResource( 28 ), SubResource( 29 ) ], "loop": true, "name": "speak", "speed": 5.0 @@ -124,7 +130,7 @@ shape = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 14 ) -animation = "idle" +animation = "speak" script = ExtResource( 6 ) [node name="Timer" type="Timer" parent="AnimatedSprite"] diff --git a/gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png b/gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png new file mode 100644 index 00000000..c0d14823 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/creditos/assets/eneko-speak-sheet.png differ diff --git a/gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png b/gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png new file mode 100644 index 00000000..b1040cf2 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/creditos/assets/oier-speak-sheet.png differ