diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.png b/gymkhana/rooms/turno_cocina/cocina/assets/background.png new file mode 100644 index 00000000..9f7da0dd Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/background.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/depth.png b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png new file mode 100644 index 00000000..dcd3e16e Binary files /dev/null and b/gymkhana/rooms/turno_cocina/cocina/assets/depth.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn new file mode 100644 index 00000000..c7160658 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -0,0 +1,76 @@ +[gd_scene load_steps=8 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/assets/background.png" 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/assets/depth.png" type="Texture" id=7] + +[sub_resource type="NavigationPolygon" id=1] +vertices = PoolVector2Array( 1131, 195, 1245.43, 193.692, 1306, 193, 1246, 291, 170, 291, 180, 219, 137, 198, 200, 151, 568, 72, -346, 392, -1217, 390, -1221, 244, -857, 225, -451, 348, -1046, 121, 1082, 89, 1445, 460, 65, 379, -678, 228 ) +polygons = [ PoolIntArray( 0, 1, 2, 3, 4 ), PoolIntArray( 5, 6, 7, 8 ), PoolIntArray( 9, 10, 11, 12, 13 ), PoolIntArray( 11, 14, 12 ), PoolIntArray( 8, 15, 0, 4, 5 ), PoolIntArray( 4, 3, 16, 17 ), PoolIntArray( 17, 16, 9 ), PoolIntArray( 13, 17, 9 ), PoolIntArray( 13, 12, 18 ) ] +outlines = [ PoolVector2Array( -1046, 121, -857, 225, -678, 228, -451, 348, 65, 379, 170, 291, 180, 219, 137, 198, 200, 151, 568, 72, 1082, 89, 1131, 195, 1245.43, 193.692, 1306, 193, 1246, 291, 1445, 460, -346, 392, -1217, 390, -1221, 244 ) ] + +[node name="ESCRoom" type="Node2D"] +script = ExtResource( 1 ) +global_id = "cocina" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc" +player_scene = ExtResource( 2 ) +camera_limits = [ Rect2( 0, 0, 2925, 577 ) ] + +[node name="background" type="Sprite" parent="."] +position = Vector2( 1160, 289 ) +texture = ExtResource( 3 ) + +[node name="ESCTerrain" type="Navigation2D" parent="."] +script = ExtResource( 4 ) +scale_max = 2.0 +scales = ExtResource( 7 ) + +[node name="NavigationPolygonInstance" type="NavigationPolygonInstance" parent="ESCTerrain"] +position = Vector2( 1160, 289 ) +navpoly = SubResource( 1 ) + +[node name="puerta_detras" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_puerta_detras" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina/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( 1710, -167 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 30.1029, 490.127, 25.9508, 330.127, 78.8904, 318.987, 127.678, 327.089, 130.792, 486.076 ) + +[node name="puerta_detras_start" type="Position2D" parent="puerta_detras"] +position = Vector2( 1791, 370 ) +script = ExtResource( 5 ) +global_id = "puerta_detras_start" + +[node name="puerta_delante" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_puerta_delante" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc" +is_exit = true +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +action1_text = "Salir de la cocina" +animations = null + +[node name="puerta_delante_collision" type="CollisionPolygon2D" parent="puerta_delante"] +position = Vector2( 2385, -81 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( 9.34229, 531.646, 10.3804, 161.013, 124.564, 97.2152, 107.955, 583.291 ) + +[node name="puerta_delante_start" type="Position2D" parent="puerta_delante"] +position = Vector2( 2379, 526 ) +script = ExtResource( 5 ) +global_id = "puerta_delante_start" diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc new file mode 100644 index 00000000..e61c7bd0 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/esc/cocina.esc @@ -0,0 +1,3 @@ +:setup + teleport player puerta_delante_start + set_angle player 270 diff --git a/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_delante.esc new file mode 100644 index 00000000..4c120f33 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/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/cocina/esc/puerta_detras.esc b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc new file mode 100644 index 00000000..25d5731c --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina/esc/puerta_detras.esc @@ -0,0 +1,2 @@ +:action1 +change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc index 25d5731c..e011479d 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina.esc @@ -1,2 +1,2 @@ :action1 -change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" +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"