From 83c8b2e6be804ac9219981843a60561fa66ab2b0 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 28 Jan 2024 13:11:36 +0100 Subject: [PATCH] Intro cocina --- .../inventory/inventory_ui.tscn | 2 +- gymkhana/characters/mark/mark.esc | 3 - gymkhana/characters/mark/mark.tscn | 556 ------------------ gymkhana/characters/mark/mark_animations.tres | 172 ------ .../mark/mark_animations_jester.tres | 172 ------ gymkhana/characters/mark/mark_talk.tscn | 39 -- gymkhana/characters/mark/mark_think.tscn | 66 --- gymkhana/characters/mark/png/mark.png | Bin 5792 -> 0 bytes .../characters/mark/png/mark_talk_down.png | Bin 1117 -> 0 bytes .../mark/png/mark_talk_down_right.png | Bin 720 -> 0 bytes .../characters/mark/png/mark_talk_right.png | Bin 1058 -> 0 bytes gymkhana/characters/mark/png/mark_talk_up.png | Bin 666 -> 0 bytes .../mark/png/mark_talk_up_right.png | Bin 596 -> 0 bytes .../characters/mark/png/mark_thinking.png | Bin 796 -> 0 bytes .../mark/png/mark_thinking_question.png | Bin 2094 -> 0 bytes gymkhana/characters/mark/png/markjester.png | Bin 4581 -> 0 bytes .../characters/mark/png/markjester_talk.png | Bin 2896 -> 0 bytes .../mark/sfx/footstep_concrete_000.ogg | Bin 5808 -> 0 bytes gymkhana/characters/oier/oier.esc | 3 - .../rooms/turno_cocina/cocina/esc/cocina.esc | 9 + .../cocina_delante/cocina_delante.tscn | 2 +- .../cocina_delante/esc/cocina_delante.esc | 13 +- 22 files changed, 17 insertions(+), 1020 deletions(-) delete mode 100644 gymkhana/characters/mark/mark.esc delete mode 100644 gymkhana/characters/mark/mark.tscn delete mode 100644 gymkhana/characters/mark/mark_animations.tres delete mode 100644 gymkhana/characters/mark/mark_animations_jester.tres delete mode 100644 gymkhana/characters/mark/mark_talk.tscn delete mode 100644 gymkhana/characters/mark/mark_think.tscn delete mode 100644 gymkhana/characters/mark/png/mark.png delete mode 100644 gymkhana/characters/mark/png/mark_talk_down.png delete mode 100644 gymkhana/characters/mark/png/mark_talk_down_right.png delete mode 100644 gymkhana/characters/mark/png/mark_talk_right.png delete mode 100644 gymkhana/characters/mark/png/mark_talk_up.png delete mode 100644 gymkhana/characters/mark/png/mark_talk_up_right.png delete mode 100644 gymkhana/characters/mark/png/mark_thinking.png delete mode 100644 gymkhana/characters/mark/png/mark_thinking_question.png delete mode 100644 gymkhana/characters/mark/png/markjester.png delete mode 100644 gymkhana/characters/mark/png/markjester_talk.png delete mode 100644 gymkhana/characters/mark/sfx/footstep_concrete_000.ogg diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index 7edd7f82..1336fa3a 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -22,7 +22,7 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol [node name="Polygon2D" type="Polygon2D" parent="FloatingInventory"] color = Color( 0.156863, 0.0627451, 0, 1 ) -polygon = PoolVector2Array( -3, 578, 1279, 578, 1279, 752, -3, 757 ) +polygon = PoolVector2Array( -3, 578, 1280, 578, 1280, 752, -3, 757 ) [node name="panel" type="TextureRect" parent="FloatingInventory"] anchor_left = 1.0 diff --git a/gymkhana/characters/mark/mark.esc b/gymkhana/characters/mark/mark.esc deleted file mode 100644 index 5638a54a..00000000 --- a/gymkhana/characters/mark/mark.esc +++ /dev/null @@ -1,3 +0,0 @@ -:look - -say player "That's a-me, Mark-io." diff --git a/gymkhana/characters/mark/mark.tscn b/gymkhana/characters/mark/mark.tscn deleted file mode 100644 index 2fd29fb5..00000000 --- a/gymkhana/characters/mark/mark.tscn +++ /dev/null @@ -1,556 +0,0 @@ -[gd_scene load_steps=85 format=2] - -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_player.gd" type="Script" id=1] -[ext_resource path="res://game/characters/mark/png/mark_talk_down.png" type="Texture" id=2] -[ext_resource path="res://game/characters/mark/png/markjester.png" type="Texture" id=3] -[ext_resource path="res://game/characters/mark/png/mark.png" type="Texture" id=4] -[ext_resource path="res://game/characters/mark/png/mark_talk_down_right.png" type="Texture" id=5] -[ext_resource path="res://game/characters/mark/png/mark_talk_up.png" type="Texture" id=6] -[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=7] -[ext_resource path="res://gymkhana/characters/mark/mark_animations.tres" type="Resource" id=8] -[ext_resource path="res://game/characters/mark/png/markjester_talk.png" type="Texture" id=9] - -[sub_resource type="AtlasTexture" id=18] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=67] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 120, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=66] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 120, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=11] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=69] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=17] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=70] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=27] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=65] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=68] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=1] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 2 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=56] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=57] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=58] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=59] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 432, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=60] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 456, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=61] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 480, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=28] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=29] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=30] -flags = 4 -atlas = ExtResource( 5 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=62] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=63] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=64] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 120, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=48] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 312, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=49] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 336, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=50] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 360, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=51] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 384, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=52] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 408, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=6] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=7] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=8] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=9] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=10] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=38] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 144, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=39] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 168, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=40] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 192, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=41] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 216, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=42] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 240, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=12] -flags = 4 -atlas = ExtResource( 6 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=13] -flags = 4 -atlas = ExtResource( 6 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=33] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 264, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=34] -flags = 4 -atlas = ExtResource( 9 ) -region = Rect2( 288, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=19] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 144, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=20] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 168, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=21] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 192, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=53] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 144, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=54] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 168, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=55] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 192, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=71] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 408, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=72] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 432, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=73] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 456, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=74] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 480, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=75] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 504, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=22] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 216, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=23] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 240, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=24] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 264, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=25] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 288, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=26] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 312, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=43] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 216, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=44] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 240, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=45] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 264, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=46] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 288, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=47] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 312, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=14] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 336, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=15] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 360, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=16] -flags = 4 -atlas = ExtResource( 4 ) -region = Rect2( 384, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=35] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 336, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=36] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 360, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=37] -flags = 4 -atlas = ExtResource( 3 ) -region = Rect2( 384, 0, 24, 70 ) - -[sub_resource type="SpriteFrames" id=31] -animations = [ { -"frames": [ SubResource( 18 ) ], -"loop": true, -"name": "idle_down", -"speed": 5.0 -}, { -"frames": [ SubResource( 67 ) ], -"loop": true, -"name": "idle_down_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 4 ) ], -"loop": true, -"name": "idle_down_left", -"speed": 5.0 -}, { -"frames": [ SubResource( 66 ) ], -"loop": true, -"name": "idle_down_left_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 11 ) ], -"loop": true, -"name": "idle_down_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 69 ) ], -"loop": true, -"name": "idle_down_right_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 17 ) ], -"loop": true, -"name": "idle_left", -"speed": 5.0 -}, { -"frames": [ SubResource( 70 ) ], -"loop": true, -"name": "idle_left_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 27 ) ], -"loop": true, -"name": "idle_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 65 ) ], -"loop": true, -"name": "idle_right_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 5 ) ], -"loop": true, -"name": "idle_up", -"speed": 5.0 -}, { -"frames": [ SubResource( 68 ) ], -"loop": true, -"name": "idle_up_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 2 ), SubResource( 3 ) ], -"loop": true, -"name": "speak_down", -"speed": 6.0 -}, { -"frames": [ SubResource( 56 ), SubResource( 57 ), SubResource( 58 ) ], -"loop": true, -"name": "speak_down_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 59 ), SubResource( 60 ), SubResource( 61 ) ], -"loop": true, -"name": "speak_down_left_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ], -"loop": true, -"name": "speak_down_right", -"speed": 6.0 -}, { -"frames": [ SubResource( 62 ), SubResource( 63 ), SubResource( 64 ) ], -"loop": true, -"name": "speak_down_right_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 48 ), SubResource( 49 ), SubResource( 50 ), SubResource( 51 ), SubResource( 52 ) ], -"loop": true, -"name": "speak_left_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], -"loop": true, -"name": "speak_right", -"speed": 5.0 -}, { -"frames": [ SubResource( 38 ), SubResource( 39 ), SubResource( 40 ), SubResource( 41 ), SubResource( 42 ) ], -"loop": true, -"name": "speak_right_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 12 ), SubResource( 13 ), SubResource( 12 ), SubResource( 13 ), SubResource( 13 ) ], -"loop": true, -"name": "speak_up", -"speed": 3.0 -}, { -"frames": [ SubResource( 33 ), SubResource( 34 ) ], -"loop": true, -"name": "speak_up_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 20 ) ], -"loop": true, -"name": "walk_down", -"speed": 6.0 -}, { -"frames": [ SubResource( 53 ), SubResource( 54 ), SubResource( 55 ), SubResource( 54 ) ], -"loop": true, -"name": "walk_down_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 71 ), SubResource( 72 ), SubResource( 73 ), SubResource( 74 ), SubResource( 75 ) ], -"loop": true, -"name": "walk_left_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 22 ), SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ) ], -"loop": true, -"name": "walk_right", -"speed": 6.0 -}, { -"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ) ], -"loop": true, -"name": "walk_right_jester", -"speed": 5.0 -}, { -"frames": [ SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 15 ) ], -"loop": true, -"name": "walk_up", -"speed": 6.0 -}, { -"frames": [ SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 36 ) ], -"loop": true, -"name": "walk_up_jester", -"speed": 5.0 -} ] - -[sub_resource type="CapsuleShape2D" id=32] -radius = 38.2347 -height = 217.78 - -[node name="mark" type="Area2D"] -pause_mode = 1 -script = ExtResource( 1 ) -global_id = "player" -esc_script = "res://gymkhana/characters/mark/mark.esc" -is_movable = true -default_action = "look" -combine_when_selected_action_is_in = [ ] -dialog_color = Color( 1, 1, 1, 1 ) -animations = ExtResource( 8 ) - -[node name="sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -137.938 ) -scale = Vector2( 4, 4 ) -frames = SubResource( 31 ) -animation = "idle_down" - -[node name="collision" type="CollisionShape2D" parent="."] -position = Vector2( 0.455139, -138.362 ) -shape = SubResource( 32 ) - -[node name="debug" type="Label" parent="."] -margin_right = 40.0 -margin_bottom = 14.0 - -[node name="dialog_position" type="Position2D" parent="."] -position = Vector2( 0, -320 ) diff --git a/gymkhana/characters/mark/mark_animations.tres b/gymkhana/characters/mark/mark_animations.tres deleted file mode 100644 index d466d0d5..00000000 --- a/gymkhana/characters/mark/mark_animations.tres +++ /dev/null @@ -1,172 +0,0 @@ -[gd_resource type="Resource" load_steps=36 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 = 340 -angle_size = 40 - -[sub_resource type="Resource" id=2] -script = ExtResource( 2 ) -angle_start = 20 -angle_size = 50 - -[sub_resource type="Resource" id=3] -script = ExtResource( 2 ) -angle_start = 70 -angle_size = 40 - -[sub_resource type="Resource" id=4] -script = ExtResource( 2 ) -angle_start = 110 -angle_size = 50 - -[sub_resource type="Resource" id=5] -script = ExtResource( 2 ) -angle_start = 160 -angle_size = 40 - -[sub_resource type="Resource" id=6] -script = ExtResource( 2 ) -angle_start = 200 -angle_size = 50 - -[sub_resource type="Resource" id=7] -script = ExtResource( 2 ) -angle_start = 250 -angle_size = 40 - -[sub_resource type="Resource" id=8] -script = ExtResource( 2 ) -angle_start = 290 -angle_size = 50 - -[sub_resource type="Resource" id=9] -script = ExtResource( 3 ) -animation = "walk_up" -mirrored = false - -[sub_resource type="Resource" id=10] -script = ExtResource( 3 ) -animation = "walk_up" -mirrored = false - -[sub_resource type="Resource" id=11] -script = ExtResource( 3 ) -animation = "walk_right" -mirrored = false - -[sub_resource type="Resource" id=12] -script = ExtResource( 3 ) -animation = "walk_down" -mirrored = false - -[sub_resource type="Resource" id=13] -script = ExtResource( 3 ) -animation = "walk_down" -mirrored = false - -[sub_resource type="Resource" id=14] -script = ExtResource( 3 ) -animation = "walk_down" -mirrored = false - -[sub_resource type="Resource" id=15] -script = ExtResource( 3 ) -animation = "walk_right" -mirrored = true - -[sub_resource type="Resource" id=16] -script = ExtResource( 3 ) -animation = "walk_up" -mirrored = false - -[sub_resource type="Resource" id=17] -script = ExtResource( 3 ) -animation = "idle_up" -mirrored = false - -[sub_resource type="Resource" id=18] -script = ExtResource( 3 ) -animation = "idle_up" -mirrored = false - -[sub_resource type="Resource" id=19] -script = ExtResource( 3 ) -animation = "idle_right" -mirrored = false - -[sub_resource type="Resource" id=20] -script = ExtResource( 3 ) -animation = "idle_down_right" -mirrored = false - -[sub_resource type="Resource" id=21] -script = ExtResource( 3 ) -animation = "idle_down" -mirrored = false - -[sub_resource type="Resource" id=22] -script = ExtResource( 3 ) -animation = "idle_down_left" -mirrored = false - -[sub_resource type="Resource" id=23] -script = ExtResource( 3 ) -animation = "idle_left" -mirrored = false - -[sub_resource type="Resource" id=24] -script = ExtResource( 3 ) -animation = "idle_up" -mirrored = false - -[sub_resource type="Resource" id=25] -script = ExtResource( 3 ) -animation = "speak_up" -mirrored = false - -[sub_resource type="Resource" id=26] -script = ExtResource( 3 ) -animation = "speak_up" -mirrored = false - -[sub_resource type="Resource" id=27] -script = ExtResource( 3 ) -animation = "speak_right" -mirrored = false - -[sub_resource type="Resource" id=28] -script = ExtResource( 3 ) -animation = "speak_down" -mirrored = false - -[sub_resource type="Resource" id=29] -script = ExtResource( 3 ) -animation = "speak_down" -mirrored = false - -[sub_resource type="Resource" id=30] -script = ExtResource( 3 ) -animation = "speak_down" -mirrored = false - -[sub_resource type="Resource" id=31] -script = ExtResource( 3 ) -animation = "speak_right" -mirrored = true - -[sub_resource type="Resource" id=32] -script = ExtResource( 3 ) -animation = "speak_up" -mirrored = false - -[resource] -script = ExtResource( 1 ) -dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ] -directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ] -idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ] -speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ] diff --git a/gymkhana/characters/mark/mark_animations_jester.tres b/gymkhana/characters/mark/mark_animations_jester.tres deleted file mode 100644 index d2fd3bcc..00000000 --- a/gymkhana/characters/mark/mark_animations_jester.tres +++ /dev/null @@ -1,172 +0,0 @@ -[gd_resource type="Resource" load_steps=36 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 = 340 -angle_size = 40 - -[sub_resource type="Resource" id=2] -script = ExtResource( 2 ) -angle_start = 20 -angle_size = 50 - -[sub_resource type="Resource" id=3] -script = ExtResource( 2 ) -angle_start = 70 -angle_size = 40 - -[sub_resource type="Resource" id=4] -script = ExtResource( 2 ) -angle_start = 110 -angle_size = 50 - -[sub_resource type="Resource" id=5] -script = ExtResource( 2 ) -angle_start = 160 -angle_size = 40 - -[sub_resource type="Resource" id=6] -script = ExtResource( 2 ) -angle_start = 200 -angle_size = 50 - -[sub_resource type="Resource" id=7] -script = ExtResource( 2 ) -angle_start = 250 -angle_size = 40 - -[sub_resource type="Resource" id=8] -script = ExtResource( 2 ) -angle_start = 290 -angle_size = 50 - -[sub_resource type="Resource" id=9] -script = ExtResource( 3 ) -animation = "walk_up_jester" -mirrored = false - -[sub_resource type="Resource" id=10] -script = ExtResource( 3 ) -animation = "walk_up_jester" -mirrored = false - -[sub_resource type="Resource" id=11] -script = ExtResource( 3 ) -animation = "walk_right_jester" -mirrored = false - -[sub_resource type="Resource" id=12] -script = ExtResource( 3 ) -animation = "walk_down_jester" -mirrored = false - -[sub_resource type="Resource" id=13] -script = ExtResource( 3 ) -animation = "walk_down_jester" -mirrored = false - -[sub_resource type="Resource" id=14] -script = ExtResource( 3 ) -animation = "walk_down_jester" -mirrored = false - -[sub_resource type="Resource" id=15] -script = ExtResource( 3 ) -animation = "walk_left_jester" -mirrored = false - -[sub_resource type="Resource" id=16] -script = ExtResource( 3 ) -animation = "walk_up_jester" -mirrored = false - -[sub_resource type="Resource" id=17] -script = ExtResource( 3 ) -animation = "idle_up_jester" -mirrored = false - -[sub_resource type="Resource" id=18] -script = ExtResource( 3 ) -animation = "idle_up_jester" -mirrored = false - -[sub_resource type="Resource" id=19] -script = ExtResource( 3 ) -animation = "idle_right_jester" -mirrored = false - -[sub_resource type="Resource" id=20] -script = ExtResource( 3 ) -animation = "idle_down_jester" -mirrored = false - -[sub_resource type="Resource" id=21] -script = ExtResource( 3 ) -animation = "idle_down_jester" -mirrored = false - -[sub_resource type="Resource" id=22] -script = ExtResource( 3 ) -animation = "idle_down_jester" -mirrored = false - -[sub_resource type="Resource" id=23] -script = ExtResource( 3 ) -animation = "idle_left_jester" -mirrored = false - -[sub_resource type="Resource" id=24] -script = ExtResource( 3 ) -animation = "idle_up_jester" -mirrored = false - -[sub_resource type="Resource" id=25] -script = ExtResource( 3 ) -animation = "speak_up_jester" -mirrored = false - -[sub_resource type="Resource" id=26] -script = ExtResource( 3 ) -animation = "speak_up_jester" -mirrored = false - -[sub_resource type="Resource" id=27] -script = ExtResource( 3 ) -animation = "speak_right_jester" -mirrored = false - -[sub_resource type="Resource" id=28] -script = ExtResource( 3 ) -animation = "speak_down_right_jester" -mirrored = false - -[sub_resource type="Resource" id=29] -script = ExtResource( 3 ) -animation = "speak_down_jester" -mirrored = false - -[sub_resource type="Resource" id=30] -script = ExtResource( 3 ) -animation = "speak_down_left_jester" -mirrored = false - -[sub_resource type="Resource" id=31] -script = ExtResource( 3 ) -animation = "speak_left_jester" -mirrored = false - -[sub_resource type="Resource" id=32] -script = ExtResource( 3 ) -animation = "speak_up_jester" -mirrored = false - -[resource] -script = ExtResource( 1 ) -dir_angles = [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ] -directions = [ SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ] -idles = [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ] -speaks = [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ), SubResource( 31 ), SubResource( 32 ) ] diff --git a/gymkhana/characters/mark/mark_talk.tscn b/gymkhana/characters/mark/mark_talk.tscn deleted file mode 100644 index 60465e05..00000000 --- a/gymkhana/characters/mark/mark_talk.tscn +++ /dev/null @@ -1,39 +0,0 @@ -[gd_scene load_steps=8 format=2] - -[ext_resource path="res://game/characters/mark/png/mark_talk_right.png" type="Texture" id=1] - -[sub_resource type="AtlasTexture" id=1] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 24, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 48, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 72, 0, 24, 70 ) - -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 96, 0, 24, 70 ) - -[sub_resource type="SpriteFrames" id=6] -animations = [ { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], -"loop": true, -"name": "default", -"speed": 5.0 -} ] - -[node name="AnimatedSprite" type="AnimatedSprite"] -frames = SubResource( 6 ) diff --git a/gymkhana/characters/mark/mark_think.tscn b/gymkhana/characters/mark/mark_think.tscn deleted file mode 100644 index b4680dc6..00000000 --- a/gymkhana/characters/mark/mark_think.tscn +++ /dev/null @@ -1,66 +0,0 @@ -[gd_scene load_steps=12 format=2] - -[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking_question.png" type="Texture" id=1] -[ext_resource path="res://gymkhana/characters/mark/png/mark_thinking.png" type="Texture" id=2] - -[sub_resource type="AtlasTexture" id=1] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 0, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=2] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 189, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=3] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 162, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=4] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 135, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=5] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 108, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=6] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 81, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=7] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 54, 0, 27, 27 ) - -[sub_resource type="AtlasTexture" id=8] -flags = 4 -atlas = ExtResource( 1 ) -region = Rect2( 27, 0, 27, 27 ) - -[sub_resource type="SpriteFrames" id=9] -animations = [ { -"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ], -"loop": true, -"name": "default", -"speed": 8.0 -} ] - -[node name="Node2D" type="Node2D"] - -[node name="MarkThinking" type="Sprite" parent="."] -position = Vector2( -48, 0 ) -scale = Vector2( 4, 4 ) -texture = ExtResource( 2 ) - -[node name="AnimatedSprite" type="AnimatedSprite" parent="."] -position = Vector2( 54, 0 ) -scale = Vector2( 4, 4 ) -frames = SubResource( 9 ) -frame = 7 -playing = true diff --git a/gymkhana/characters/mark/png/mark.png b/gymkhana/characters/mark/png/mark.png deleted file mode 100644 index 91cacd24e10184da846dc75cd87803351ee33d8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5792 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 j`jQ3T4$_3IL4uAKe{1ehT4z)cZ_&^OjecwSt;2 zL=IN6e7o?NLvuyo0u~KMuZDvQU8XWDK456jCABi6ME3t1b{)B|&OYiQ%)D}6uUM9U z@_XUJ$-9r^Q-U=^?StY8?|U+`Ic7Uwrtxn(d4o>(bb8{dsq@1xgov|LG@C z*1zEEL54pDJp6z3R!nExpZxW}#QUt7?fagd1v1!|?tN&J^i?xs>G}Qxo{bluEBrhf zVDqTs;_?Lwv)?iM35WGB5I82#^t~oz@r}J~t%Y-z8CrIX?oC7#Nbu&F234z%k?`8=N2!%S}aiOxrgKX55Ww7|9sS(Vd zGViy{FA$T)75atn0LGpdsr^M zXDuu_7!vbG`~DNl4oxZ1wEuj+m>pxZ&ivcm6t`__`2~IMD6zbNl?J~>j(D^(q{%nG xh~J$!fs64>oqUM@ii=T;+*W_M+;r_Lcc#zJv$L;?0+SsBgQu&X%Q~loCIGEJG|2z} diff --git a/gymkhana/characters/mark/png/mark_talk_right.png b/gymkhana/characters/mark/png/mark_talk_right.png deleted file mode 100644 index 15937f2151167d487a25e1e085b9b43d3e9db41f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1058 zcmV+-1l{|IP)Px&+(|@1RCt{2o6SobK^Vs0sD#=>+EWD)NvJWT?WxVdi{Poyf)qU{y=nUgNH0Y! zg8MwMMSI!MJbIe#`Mtcl8w7NA3L)fhUbC6COi4f zWS^aPX5O6;K}IVPbaIfW&H}757~sdt_dUr27pVyRc=(fO$Owp$%z3~ zDDV~XuNlm9_l%A|bOA*g4}P@#4(^&8Kt0{P)R}CjxnhQ9iVKuYXa1L{h~U7FfX^MG zCnpBztZF%MTXV(dp&AXoUcOKdzSWs@!Pho6UFX6IeD!>xNmfsHuj_pwpQG9G7R{Eo z8p4FUz*o-??7?qm#+>8BqXW+}pO;o>^x0FPvA$(=gLJ-P7H8`ioxQ7RIU|#eSBrPXs9*iX|UH*iKEU;eBViyT?tR}dwYM6UN8M%6_eugj9X#&A~%icLCO=m*gJUo0N(#E$H#20$lP{`*zL#B$09|eDXcZcrZ?Q<@Y9W_km za~r(AyF-P1&M`q%qod|G-#{uaek=01DxdC3xd!^Kp+2PsfUl3wEHvGfs^4gH7rVIn zSKqsz=b?WD_gZm_&fD zpN~nF;gT{~tAihMD59&0?lI!e7$_;GKu#ukFo+^FCU2x!^LIrU~wVw za_fP%Mu4x6j~;BeV6fqW!G;S48!i}ZxL~m1g29Fh1{*FIY`9>s;ex@23kDl57;Ly; zu;GHihD&%~bj|vsqaEOD;tLt9Y9kr=(eXw0`*`iTR=FPud=31tW3b+>{NRV?W0GaK cV6fr(3nR?I!5fp`i2wiq07*qoM6N<$g4WCxQ2+n{ diff --git a/gymkhana/characters/mark/png/mark_talk_up.png b/gymkhana/characters/mark/png/mark_talk_up.png deleted file mode 100644 index 1d85e5608fda6ff9c9a85ff5d479729b0a04ea1d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 666 zcmV;L0%iS)P)Px%R7pfZRA_b3Sr7NC^zQaI_s#yBTL3by9Cq^xAbBQ0ItmWP zm)*N1GNlhuUw$fG6I6Z$a5KUiRU|W*s3vrigR%3P9B+~(RcN5%_FX_X`yg=LT%fcYUMrf(yAMq6t!KsfjItQZM$Tk+I%poYi!$^%1bH1 z$zQ)!2*9j7HZ7@b<)sHW6C^dD6U0~c0X)tDt^}b5C_!wp&(U)vz+LT7xa?g%zOoD* zY*|&A+@J*5-YUR;X)kr{BoVz_B1M`RiHCWl2l>z;xCFs8kd}e*XgKRq7c$|eh7k4>(Reh3{{3|h z0HAz!lPr#1%FjzK`2TAN{Y3=>z7-7kRxsdO!GLcC1HKgu_*O9BTgr1G*%uPmmzgbJ z^%b>v>XcJl*OfIN8$voqW+umLEd0#Rfy^8D1(-_>-MHD2@c;k-07*qoM6N<$g1wC- AssI20 diff --git a/gymkhana/characters/mark/png/mark_talk_up_right.png b/gymkhana/characters/mark/png/mark_talk_up_right.png deleted file mode 100644 index a21e4b5b8f353dbde644c51396d5b9eac893a662..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmeAS@N?(olHy`uVBq!ia0vp^9zg8I!3-oLER|S+6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5zh1=WCGUKinQHp{}PE)vBMj7^oHq zHU|nE0aAP=L4LvikpYA2fjcLFGMoh-k;Om-he4R}c>anMpaW)lx;TbJxWAozy6lhv z4{Nuu5BJ&s|MQlvmbMq-zCBw`Y-X!svI*au4_o&>&u+i2HV57XeLtiPojwJP}Ivd`<6cDI~FfDr=O6$vCXt4 z)$;Y?`_6}%IrT-}JC?nhIK4CQd_c_+38$W4S;r*4i*@z4OMLys#^v)v=G2o;&i;V6 zpO5tXzY?%jdH=#wp8XegiCGu=_J8kj_n5~K^)On_Wa{KP{-tvx_<4S7m$a5B7fN`P z{E_?Rd4+k3({bZ1Ho{jA>~Qz^S9V^!^3~K+p7Y;z{42GYx$E`n33_WA1+Z6C11Kx9}D3*9Y8>U$}3-Q|){wt}rg6H{UO;Z<^Y~^SgM(JcH!yPRZzl%Uid- Z<(I#-DRP!((p*s7db;|#taD0e0syTa{PzF= diff --git a/gymkhana/characters/mark/png/mark_thinking.png b/gymkhana/characters/mark/png/mark_thinking.png deleted file mode 100644 index 05d53f1df3a8e80e5ce34af6449ff2d6dd2de2e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 796 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 diff --git a/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg b/gymkhana/characters/mark/sfx/footstep_concrete_000.ogg deleted file mode 100644 index 163cc56468f1734fe694351e7ff984699afa8b86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5808 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 wZQ~wf@a?|qKg9a~RsQ1I6Vd6i`F{%8I`d1X< [!cocina_intro_played] + set_global cocina_intro_played true + accept_input SKIP + set_angle player 180 + say player "Debo hacer algo de comer" + accept_input ALL diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index ccb930e7..54d75190 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -123,7 +123,7 @@ z_index = 4096 texture = ExtResource( 9 ) [node name="new_game_start_location" type="Position2D" parent="."] -position = Vector2( 1326, 519 ) +position = Vector2( 718, 509 ) script = ExtResource( 5 ) global_id = "new_game_start_location" is_start_location = true diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc index 7748f7e3..3defde5e 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -15,19 +15,18 @@ anim eneko_smoking idle set_angle player 180 stop teleport player new_game_start_location -set_angle player 180 +set_angle player 90 :ready -> [!cutscene_played] - set_global cutscene_played true +> [!cocina_delante_intro_played] + set_global cocina_delante_intro_played true accept_input SKIP stop_snd play_video res://gymkhana/videos/turno_cocina/intro.ogv - # set_gui_visible false - # walk_block player puerta_cocina_start - # set_angle player 90 - queue_event eneko_smoking intro_dialog + queue_event eneko_smoking intro_dialog intro_dialog_channel true set_gui_visible true + walk_block player puerta_cocina_start + queue_event cocina_delante_puerta_cocina action1 accept_input ALL play_snd res://gymkhana/sounds/music_loop.ogg _music