diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index c7160658..96a21340 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=8 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] @@ -26,8 +26,8 @@ texture = ExtResource( 3 ) [node name="ESCTerrain" type="Navigation2D" parent="."] script = ExtResource( 4 ) -scale_max = 2.0 scales = ExtResource( 7 ) +scale_max = 2.0 [node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] position = Vector2( 1160, 289 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc index e61c7bd0..e5163b1a 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc @@ -1,3 +1,7 @@ :setup + > [eq ESC_LAST_SCENE cocina_detras] + teleport player puerta_detras_start + set_angle player 180 + stop teleport player puerta_delante_start set_angle player 270 diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc index 25d5731c..dd326dbe 100644 --- a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc +++ b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc @@ -1,2 +1,2 @@ :action1 -change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" +change_scene "res://gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg b/gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg new file mode 100644 index 00000000..baf6812d Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg differ diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png b/gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png new file mode 100644 index 00000000..27046983 Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn new file mode 100644 index 00000000..3c397d16 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -0,0 +1,55 @@ +[gd_scene load_steps=9 format=2] + +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_room.gd" type="Script" id=1] +[ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=2] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/background.jpg" type="Texture" id=3] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_terrain.gd" type="Script" id=4] +[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=5] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] +[ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_detras/assets/depth.png" type="Texture" id=7] + +[sub_resource type="NavigationPolygon" id=1] +vertices = PoolVector2Array( -1104, 183, -1146, 112, -1013, 114, -864, 131, -787, 150, -717, 189, 44, 171, 37, 137, 169, 158, 177, 170, 184, 248, 169, 316, 246, 170, 246, 233, -236, 229, -1093, 316, -598, 200, -852, 111, -790, 115, -519, 186, -392, 198 ) +polygons = [ PoolIntArray( 0, 1, 2, 3, 4, 5 ), PoolIntArray( 6, 7, 8, 9, 10, 11 ), PoolIntArray( 9, 12, 13, 10 ), PoolIntArray( 14, 11, 15, 0, 16 ), PoolIntArray( 17, 18, 4, 3 ), PoolIntArray( 14, 6, 11 ), PoolIntArray( 16, 19, 20, 14 ), PoolIntArray( 0, 5, 16 ) ] +outlines = [ PoolVector2Array( -1146, 112, -1013, 114, -864, 131, -852, 111, -790, 115, -787, 150, -717, 189, -598, 200, -519, 186, -392, 198, -236, 229, 44, 171, 37, 137, 169, 158, 177, 170, 246, 170, 246, 233, 184, 248, 169, 316, -1093, 316, -1104, 183 ) ] + +[node name="ESCRoom" type="Node2D"] +script = ExtResource( 1 ) +global_id = "cocina_detras" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc" +player_scene = ExtResource( 2 ) +camera_limits = [ Rect2( 0, 0, 1500, 577 ) ] + +[node name="background" type="Sprite" parent="."] +position = Vector2( 750, 289 ) +texture = ExtResource( 3 ) + +[node name="ESCTerrain" type="Navigation2D" parent="."] +script = ExtResource( 4 ) +scales = ExtResource( 7 ) +scale_min = 0.5 + +[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] +position = Vector2( 1252, 260 ) +navpoly = SubResource( 1 ) + +[node name="puerta_cocina" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_detras_puerta_cocina" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc" +is_exit = true +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +action1_text = "Entrar en la cocina" +animations = null + +[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] +position = Vector2( 630, -130 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 117.298, 581.266, 120.412, 341.266, 169.199, 325.063, 236.671, 333.165, 236.671, 588.354 ) + +[node name="puerta_cocina_start" type="Position2D" parent="puerta_cocina"] +position = Vector2( 793, 465 ) +script = ExtResource( 5 ) +global_id = "puerta_cocina_start" diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc new file mode 100644 index 00000000..90c277b2 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc @@ -0,0 +1,3 @@ +:setup + teleport player puerta_cocina_start + set_angle player 180 diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc new file mode 100644 index 00000000..e011479d --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_cocina.esc @@ -0,0 +1,2 @@ +:action1 +change_scene "res://gymkhana/rooms/turno_cocina/cocina/cocina.tscn" diff --git a/project.godot b/project.godot index d71dc266..20218d38 100644 --- a/project.godot +++ b/project.godot @@ -204,7 +204,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_options_chooser.gd" }, { -"base": "Node", +"base": "StateMachine", "class": "ESCDialogPlayer", "language": "GDScript", "path": "res://addons/escoria-core/game/scenes/dialogs/esc_dialog_player.gd" @@ -344,7 +344,7 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://addons/escoria-core/game/esc_project_settings_manager.gd" }, { -"base": "Node", +"base": "Reference", "class": "ESCResourceCache", "language": "GDScript", "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"