From 4be604b1d48a3328d5c18aa43c80d7700d64e513 Mon Sep 17 00:00:00 2001 From: oier Date: Sun, 3 Nov 2024 01:14:04 +0100 Subject: [PATCH] Habla solo cuando te toca --- .../rtmi_dialog_simple.gd | 2 +- .../turno_cocina/creditos/EnekoDancing.tscn | 15 +++-------- .../creditos/EnekoDancingAnimations.tres | 27 +++++++++++++++++++ .../turno_cocina/creditos/OierDancing.tscn | 7 ++--- .../creditos/OierDancingAnimations.tres | 27 +++++++++++++++++++ 5 files changed, 63 insertions(+), 15 deletions(-) create mode 100644 gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres create mode 100644 gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres diff --git a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd index c4e6e38e..82d43874 100644 --- a/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd +++ b/addons/escoria-ui-return-monkey-island-dialog-simple/rtmi_dialog_simple.gd @@ -232,4 +232,4 @@ func remove_dialop_tip(): _dialog_player.remove_child(_dialog_tip) func _on_paused(): - remove_dialop_tip() \ No newline at end of file + remove_dialop_tip() diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn index 6cf686f3..ea925054 100644 --- a/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancing.tscn @@ -1,20 +1,13 @@ -[gd_scene load_steps=27 format=2] +[gd_scene load_steps=26 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] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-disco-sheet.png" type="Texture" id=3] [ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/assets/eneko-pulp-sheet.png" type="Texture" id=4] [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 ) -dir_angles = [ ] -directions = [ ] -idles = [ ] -speaks = [ ] +[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres" type="Resource" id=9] [sub_resource type="CapsuleShape2D" id=1] radius = 57.0 @@ -131,14 +124,14 @@ is_interactive = false player_orients_on_arrival = false combine_when_selected_action_is_in = [ ] dialog_color = Color( 0.584314, 0.490196, 0.270588, 1 ) -animations = SubResource( 17 ) +animations = ExtResource( 9 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 14 ) -animation = "speak" +animation = "idle" script = ExtResource( 7 ) [node name="Timer" type="Timer" parent="AnimatedSprite"] diff --git a/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres b/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres new file mode 100644 index 00000000..c6c3637f --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/EnekoDancingAnimations.tres @@ -0,0 +1,27 @@ +[gd_resource type="Resource" load_steps=7 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] + +[sub_resource type="Resource" id=1] +script = ExtResource( 2 ) +angle_start = 0 +angle_size = 360 + +[sub_resource type="Resource" id=2] +script = ExtResource( 3 ) +animation = "idle" +mirrored = false + +[sub_resource type="Resource" id=3] +script = ExtResource( 3 ) +animation = "speak" +mirrored = false + +[resource] +script = ExtResource( 1 ) +dir_angles = [ SubResource( 1 ) ] +directions = [ SubResource( 2 ) ] +idles = [ SubResource( 2 ) ] +speaks = [ SubResource( 3 ) ] diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn b/gymkhana/rooms/turno_cocina/creditos/OierDancing.tscn index 87591eb3..347d32fa 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=25 format=2] +[gd_scene load_steps=26 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] @@ -7,6 +7,7 @@ [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] +[ext_resource path="res://gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres" type="Resource" id=8] [sub_resource type="CapsuleShape2D" id=1] radius = 57.0 @@ -123,14 +124,14 @@ is_interactive = false player_orients_on_arrival = false combine_when_selected_action_is_in = [ ] dialog_color = Color( 0.321569, 0.662745, 0.301961, 1 ) -animations = null +animations = ExtResource( 8 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 14 ) -animation = "speak" +animation = "idle" script = ExtResource( 6 ) [node name="Timer" type="Timer" parent="AnimatedSprite"] diff --git a/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres b/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres new file mode 100644 index 00000000..c6c3637f --- /dev/null +++ b/gymkhana/rooms/turno_cocina/creditos/OierDancingAnimations.tres @@ -0,0 +1,27 @@ +[gd_resource type="Resource" load_steps=7 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationresource.gd" type="Script" id=1] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_directionangle.gd" type="Script" id=2] +[ext_resource path="res://addons/escoria-core/game/core-scripts/resources/esc_animationname.gd" type="Script" id=3] + +[sub_resource type="Resource" id=1] +script = ExtResource( 2 ) +angle_start = 0 +angle_size = 360 + +[sub_resource type="Resource" id=2] +script = ExtResource( 3 ) +animation = "idle" +mirrored = false + +[sub_resource type="Resource" id=3] +script = ExtResource( 3 ) +animation = "speak" +mirrored = false + +[resource] +script = ExtResource( 1 ) +dir_angles = [ SubResource( 1 ) ] +directions = [ SubResource( 2 ) ] +idles = [ SubResource( 2 ) ] +speaks = [ SubResource( 3 ) ]