diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index d479d03f..9b7458d4 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -8,9 +8,9 @@ [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=6] [sub_resource type="NavigationPolygon" id=1] -vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, -236, 229, 193, 193, 175, 286, -360, 166 ) -polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6, 0 ), PoolIntArray( 4, 0, 3, 7 ) ] -outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, 193, 193, 175, 286, -768, 301, -1163, 462 ) ] +vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 36, 211, 193, 193, 175, 286, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) +polygons = [ PoolIntArray( 0, 1, 2, 3 ), PoolIntArray( 4, 5, 6 ), PoolIntArray( 7, 4, 6, 0, 8 ), PoolIntArray( 7, 9, 10, 4 ), PoolIntArray( 8, 0, 3, 11 ) ] +outlines = [ PoolVector2Array( -1161, 358, -532, 166, -360, 166, -236, 229, -86, 216, -87, 153, 22, 154, 36, 211, 193, 193, 175, 286, -768, 301, -1163, 462 ) ] [node name="ESCRoom" type="Node2D"] script = ExtResource( 1 ) @@ -72,4 +72,25 @@ polygon = PoolVector2Array( -1.03803, 470.886, -1.03809, 311.899, 72.6622, 311.8 [node name="puerta_despensa_start" type="Position2D" parent="puerta_despensa"] position = Vector2( 90, 621 ) script = ExtResource( 5 ) -global_id = "start" +global_id = "puerta_despensa_start" + +[node name="puerta_detras" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_delante_puerta_detras" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc" +is_exit = true +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +action1_text = "Ir detrás" +animations = null + +[node name="puerta_detras_collision" type="CollisionPolygon2D" parent="puerta_detras"] +position = Vector2( 1067, -26 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 5.19019, 470.886, 6.22815, 359.494, -67.472, 360.506, -69.5481, 285.57, 120.412, 293.671, 122.488, 470.886 ) + +[node name="puerta_detras_start" type="Position2D" parent="puerta_detras"] +position = Vector2( 1131, 460 ) +script = ExtResource( 5 ) +global_id = "puerta_detras_start" 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 90c277b2..5e0ade98 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/cocina_delante.esc @@ -1,3 +1,11 @@ :setup + > [eq ESC_LAST_SCENE despensa] + teleport player puerta_despensa_start + set_angle player 180 + stop + > [eq ESC_LAST_SCENE cocina_detras] + teleport player puerta_detras_start + set_angle player 180 + stop teleport player puerta_cocina_start set_angle player 180 diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc new file mode 100644 index 00000000..dd326dbe --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_detras.esc @@ -0,0 +1,2 @@ +:action1 +change_scene "res://gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn index 3c397d16..d39b9224 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_detras/cocina_detras.tscn @@ -53,3 +53,24 @@ polygon = PoolVector2Array( 117.298, 581.266, 120.412, 341.266, 169.199, 325.063 position = Vector2( 793, 465 ) script = ExtResource( 5 ) global_id = "puerta_cocina_start" + +[node name="puerta_delante" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_detras_puerta_delante" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc" +is_exit = true +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +action1_text = "Ir delante" +animations = null + +[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] +position = Vector2( 298, -203 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 117.298, 581.266, 112.107, 422.279, 285.459, 437.468, 282.345, 486.076, 234.595, 513.418, 234.595, 582.279 ) + +[node name="puerta_delante_start" type="Position2D" parent="puerta_delante"] +position = Vector2( 436, 381 ) +script = ExtResource( 5 ) +global_id = "puerta_delante_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 index 90c277b2..5b011a21 100644 --- a/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/cocina_detras.esc @@ -1,3 +1,7 @@ :setup + > [eq ESC_LAST_SCENE cocina_delante] + teleport player puerta_delante_start + set_angle player 180 + stop teleport player puerta_cocina_start set_angle player 180 diff --git a/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc new file mode 100644 index 00000000..4c120f33 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_detras/esc/puerta_delante.esc @@ -0,0 +1,2 @@ +:action1 +change_scene "res://gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn" diff --git a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn index 2c414ff3..3e49b9df 100644 --- a/gymkhana/rooms/turno_cocina/despensa/despensa.tscn +++ b/gymkhana/rooms/turno_cocina/despensa/despensa.tscn @@ -55,7 +55,7 @@ scale = Vector2( 0.963362, 1.99167 ) polygon = PoolVector2Array( -5.19006, 640.474, 5.19019, 273.946, 85.1187, 269.428, 166.085, 311.899, 166.085, 589.367, 84.0806, 639.469 ) [node name="ESCLocation" type="Position2D" parent="puerta_exterior"] -position = Vector2( 172.439, 568 ) +position = Vector2( 191, 571 ) script = ExtResource( 5 ) [node name="start" type="Position2D" parent="."] diff --git a/gymkhana/rooms/turno_cocina/despensa/esc/despensa.esc b/gymkhana/rooms/turno_cocina/despensa/esc/despensa.esc index 2164d8df..2b300096 100644 --- a/gymkhana/rooms/turno_cocina/despensa/esc/despensa.esc +++ b/gymkhana/rooms/turno_cocina/despensa/esc/despensa.esc @@ -1,3 +1,3 @@ :setup teleport player start - set_angle player 90 + set_angle player 270