diff --git a/gymkhana/items/inventory/assets/turno_cocina_carton.png b/gymkhana/items/inventory/assets/turno_cocina_carton.png index 84c170f0..9c063b39 100644 Binary files a/gymkhana/items/inventory/assets/turno_cocina_carton.png and b/gymkhana/items/inventory/assets/turno_cocina_carton.png differ diff --git a/gymkhana/items/inventory/turno_cocina_carton.tscn b/gymkhana/items/inventory/turno_cocina_carton.tscn index b06fea5a..0046a93e 100644 --- a/gymkhana/items/inventory/turno_cocina_carton.tscn +++ b/gymkhana/items/inventory/turno_cocina_carton.tscn @@ -4,10 +4,8 @@ [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton.png" type="Texture" id=2] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_carton_inventario.png" type="Texture" id=3] - [node name="turno_cocina_carton" type="Area2D"] pause_mode = 1 -rotation = 1.11177 script = ExtResource( 1 ) global_id = "turno_cocina_carton" esc_script = "res://gymkhana/items/inventory/turno_cocina_carton.esc" @@ -20,17 +18,14 @@ tooltips = { "action3": "Mirar", "action4": "Usar" } -animations = null - action3_target_texts = { "turno_cocina_mechero": "Encender el cartón" } target_when_selected_action_is_in = [ "action3" ] +animations = null [node name="Sprite" type="Sprite" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 2 ) [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="."] -polygon = PoolVector2Array( -13, -32, 1, -29, 1, -26, 24, -19, 17, 14, 7, 32, -29, 12, -15, -3, -15, -8, -13, -12 ) +polygon = PoolVector2Array( -23, -11, -24, 2, -24, 11, -21, 13, -6, 16, 5, 17, 21, 12, 25, 8, 25, -13, 0, -16, -9, -17 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.png b/gymkhana/rooms/turno_cocina/cocina/assets/background.png index 50b40e05..7ab0dac7 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/background.png and b/gymkhana/rooms/turno_cocina/cocina/assets/background.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf index d9a4e7b7..683c6cce 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf and b/gymkhana/rooms/turno_cocina/cocina/assets/background.xcf differ diff --git a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn index 1407ddb6..8f512c5f 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=23 format=2] +[gd_scene load_steps=22 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] @@ -18,7 +18,6 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido3.png" type="Texture" id=16] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido1.png" type="Texture" id=17] [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina/assets/gas-encendido2.png" type="Texture" id=18] -[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=19] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_cuerno.tscn" type="PackedScene" id=20] [sub_resource type="NavigationPolygon" id=3] @@ -380,19 +379,6 @@ position = Vector2( -160.838, 201.283 ) script = ExtResource( 5 ) interaction_direction = 3 -[node name="turno_cocina_carton" parent="." instance=ExtResource( 19 )] -position = Vector2( 1586, 536 ) -rotation = 1.44513 -scale = Vector2( 0.8, 0.8 ) - -[node name="turno_cocina_carton_collision" type="CollisionPolygon2D" parent="turno_cocina_carton"] -position = Vector2( 15.9014, -11.2695 ) -polygon = PoolVector2Array( 8.0011, -8.38965, 1.29077, 24.7809, -8.50018, 42.443, -45.2213, 23.9447, -30.6265, 8.14941, -31.2399, 3.03223, -28.1329, -1.61511, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 ) - -[node name="turno_cocina_carton_location" type="Position2D" parent="turno_cocina_carton"] -position = Vector2( 93.7431, -73.8329 ) -script = ExtResource( 5 ) - [node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )] position = Vector2( 2801, 175 ) diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png index 59350fe8..2439560e 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.png differ diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf index d06e17a4..109cbf35 100644 Binary files a/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf and b/gymkhana/rooms/turno_cocina/cocina_delante/assets/background.xcf differ diff --git a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn index 54d75190..7225221d 100644 --- a/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn +++ b/gymkhana/rooms/turno_cocina/cocina_delante/cocina_delante.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=14 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] @@ -11,6 +11,7 @@ [ext_resource path="res://gymkhana/rooms/turno_cocina/cocina_delante/assets/foreground.png" type="Texture" id=9] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_madera.tscn" type="PackedScene" id=10] [ext_resource path="res://gymkhana/items/inventory/turno_cocina_ajo.tscn" type="PackedScene" id=11] +[ext_resource path="res://gymkhana/items/inventory/turno_cocina_carton.tscn" type="PackedScene" id=12] [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( -768, 301, -1163, 462, -1161, 358, -532, 166, 676, 59, 651, -8, 720, -10, 760, 50, 167, 278, 419, 146, 36, 211, -86, 216, -236, 229, -87, 153, 22, 154, -360, 166 ) @@ -164,3 +165,10 @@ script = ExtResource( 5 ) [node name="turno_cocina_ajo" parent="." instance=ExtResource( 11 )] position = Vector2( 858, 399 ) + +[node name="turno_cocina_carton" parent="." instance=ExtResource( 12 )] +position = Vector2( 1221, 423 ) + +[node name="ESCLocation" type="Position2D" parent="turno_cocina_carton"] +position = Vector2( -52, 34 ) +script = ExtResource( 5 )