From 2b7d57c80245aece19a1944790e3b5b7007018cd Mon Sep 17 00:00:00 2001 From: Oier Bravo Urtasun Date: Sun, 7 Sep 2025 19:37:21 +0200 Subject: [PATCH] speak animations --- .../menus/pause_menu/pause_menu.tscn | 2 + gymkhana/characters/oier/oier.tscn | 75 ++++++++++++++++++- 2 files changed, 73 insertions(+), 4 deletions(-) diff --git a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn index b6fdf679..5ece9fe3 100644 --- a/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn +++ b/addons/escoria-ui-return-monkey-island/menus/pause_menu/pause_menu.tscn @@ -13,6 +13,8 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 script = ExtResource("1") [node name="Panel" type="Panel" parent="."] diff --git a/gymkhana/characters/oier/oier.tscn b/gymkhana/characters/oier/oier.tscn index a82180da..3c8857c5 100644 --- a/gymkhana/characters/oier/oier.tscn +++ b/gymkhana/characters/oier/oier.tscn @@ -1,9 +1,9 @@ -[gd_scene load_steps=33 format=3 uid="uid://cjmsexhyhi4vs"] +[gd_scene load_steps=38 format=3 uid="uid://cjmsexhyhi4vs"] [ext_resource type="Script" uid="uid://clg4yrj7v7eae" path="res://addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd" id="1"] -[ext_resource type="Texture2D" uid="uid://b2msjygw7oyi0" path="res://gymkhana/characters/oier/oier-mod.png" id="2"] +[ext_resource type="Texture2D" uid="uid://da1kd8lccd24" path="res://gymkhana/characters/oier/oier-mod.png" id="2"] [ext_resource type="Resource" uid="uid://cyjo7aq0e4hbe" path="res://gymkhana/characters/oier/oier_animations.tres" id="3"] -[ext_resource type="Texture2D" uid="uid://bcs6kqj5w23vk" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"] +[ext_resource type="Texture2D" uid="uid://dayds4a0t1ldv" path="res://gymkhana/characters/oier/oier-mod-talk.png" id="4"] [ext_resource type="Script" uid="uid://85bledusisk1" path="res://addons/escoria-core/game/core-scripts/esc_dialog_location.gd" id="5_10x32"] [sub_resource type="AtlasTexture" id="22"] @@ -38,6 +38,26 @@ region = Rect2(5733, 0, 273, 795) atlas = ExtResource("4") region = Rect2(5733, 0, 273, 795) +[sub_resource type="AtlasTexture" id="AtlasTexture_10x32"] +atlas = ExtResource("4") +region = Rect2(5460, 0, 273, 795) + +[sub_resource type="AtlasTexture" id="AtlasTexture_b64d8"] +atlas = ExtResource("4") +region = Rect2(4368, 0, 273, 795) + +[sub_resource type="AtlasTexture" id="AtlasTexture_c4eys"] +atlas = ExtResource("4") +region = Rect2(5187, 0, 273, 795) + +[sub_resource type="AtlasTexture" id="AtlasTexture_xnkj6"] +atlas = ExtResource("4") +region = Rect2(4914, 0, 273, 795) + +[sub_resource type="AtlasTexture" id="AtlasTexture_obf0k"] +atlas = ExtResource("4") +region = Rect2(4641, 0, 273, 795) + [sub_resource type="AtlasTexture" id="46"] atlas = ExtResource("2") region = Rect2(3549, 0, 273, 795) @@ -169,6 +189,53 @@ animations = [{ }, { "frames": [{ "duration": 1.0, +"texture": SubResource("23") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_10x32") +}], +"loop": true, +"name": &"speak_down_left", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("24") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_b64d8") +}], +"loop": true, +"name": &"speak_down_right", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("25") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_c4eys") +}], +"loop": true, +"name": &"speak_left", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": SubResource("26") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_xnkj6") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_obf0k") +}], +"loop": true, +"name": &"speak_right", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, "texture": SubResource("46") }, { "duration": 1.0, @@ -264,7 +331,7 @@ animations = ExtResource("3") position = Vector2(0, -155) scale = Vector2(0.389246, 0.389247) sprite_frames = SubResource("20") -animation = &"speak_down" +animation = &"speak_right" [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2(5, -151)