diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/frame.png b/gymkhana/addons/escoria-ui-return-monkey-island/images/frame.png deleted file mode 100755 index 2831220d..00000000 Binary files a/gymkhana/addons/escoria-ui-return-monkey-island/images/frame.png and /dev/null differ diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png b/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png deleted file mode 100755 index 7f8f6371..00000000 Binary files a/gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png and /dev/null differ 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 5cb52df8..c75919a8 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 @@ -1,11 +1,9 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd" type="Script" id=1] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_bg.png" type="Texture" id=2] [ext_resource path="res://addons/escoria-core/ui_library/inventory/esc_inventory_container.gd" type="Script" id=3] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/frame.png" type="Texture" id=5] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png" type="Texture" id=6] -[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png" type="Texture" id=11] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/grey.png" type="Texture" id=4] [node name="inventory_ui" type="Control"] visible = false @@ -27,26 +25,6 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol anchor_right = 1.0 anchor_bottom = 1.0 -[node name="inventory_button" type="TextureButton" parent="HBoxContainer"] -margin_right = 1280.0 -margin_bottom = 796.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -texture_normal = ExtResource( 6 ) -expand = true -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="frame" type="TextureRect" parent="HBoxContainer/inventory_button"] -anchor_right = 1.0 -anchor_bottom = 1.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -texture = ExtResource( 5 ) -expand = true -stretch_mode = 1 - [node name="FloatingInventory" type="CanvasLayer" parent="."] [node name="grey" type="TextureRect" parent="FloatingInventory"] @@ -56,7 +34,7 @@ margin_top = 577.0 mouse_filter = 2 size_flags_horizontal = 3 size_flags_vertical = 3 -texture = ExtResource( 11 ) +texture = ExtResource( 4 ) stretch_mode = 1 [node name="panel" type="TextureRect" parent="FloatingInventory"] @@ -102,5 +80,3 @@ custom_constants/separation = 20 script = ExtResource( 3 ) [node name="InventoryTween" type="Tween" parent="FloatingInventory"] - -[connection signal="pressed" from="HBoxContainer/inventory_button" to="." method="_on_inventory_button_pressed"] diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index c8c6d416..d479d03f 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -40,17 +40,36 @@ esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_cocina is_exit = true combine_when_selected_action_is_in = [ ] dialog_color = Color( 1, 1, 1, 1 ) -action1_text = "Entrar" +action1_text = "Entrar en la cocina" animations = null -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="puerta_cocina"] +[node name="puerta_cocina_collision" type="CollisionPolygon2D" parent="puerta_cocina"] position = Vector2( 630, -130 ) scale = Vector2( 0.963362, 0.9875 ) polygon = PoolVector2Array( -1.03802, 589.367, -1.03809, 311.899, 166.085, 311.899, 166.085, 589.367 ) -[node name="start" type="Position2D" parent="puerta_cocina"] +[node name="puerta_cocina_start" type="Position2D" parent="puerta_cocina"] position = Vector2( 716, 473 ) script = ExtResource( 5 ) +global_id = "puerta_cocina_start" + +[node name="puerta_despensa" type="Area2D" parent="."] +pause_mode = 1 +script = ExtResource( 6 ) +global_id = "cocina_delante_puerta_despensa" +esc_script = "res://gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc" +is_exit = true +combine_when_selected_action_is_in = [ ] +dialog_color = Color( 1, 1, 1, 1 ) +action1_text = "Bajar a la despensa" +animations = null + +[node name="puerta_despensa_collision" type="CollisionPolygon2D" parent="puerta_despensa"] +position = Vector2( 51, 113 ) +scale = Vector2( 0.963362, 0.9875 ) +polygon = PoolVector2Array( -1.03803, 470.886, -1.03809, 311.899, 72.6622, 311.899, 71.6242, 469.873 ) + +[node name="puerta_despensa_start" type="Position2D" parent="puerta_despensa"] +position = Vector2( 90, 621 ) +script = ExtResource( 5 ) global_id = "start" -is_start_location = true -player_orients_on_arrival = false 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 e8e0beab..90c277b2 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,3 @@ :setup - teleport player start + teleport player puerta_cocina_start set_angle player 180 diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc new file mode 100644 index 00000000..12cdab82 --- /dev/null +++ b/gymkhana/rooms/turno_cocina/cocina_delante/esc/puerta_despensa.esc @@ -0,0 +1,2 @@ +:action1 +change_scene "res://gymkhana/rooms/turno_cocina/despensa/despensa.tscn"