diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd index d9a68de1..c167f502 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd @@ -94,7 +94,7 @@ func _ready(): var time = OS.get_datetime() var day = time["day"] var month = time["month"] - if(day == 8 and month ==2): + if( day == 8 and month ==2 ): escoria.globals_manager.set_global('zorionak_eneko', true) diff --git a/gymkhana/items/inventory/assets/turno_cocina_cuerno.png b/gymkhana/items/inventory/assets/turno_cocina_cuerno.png index 4fa83a67..dccfd279 100644 Binary files a/gymkhana/items/inventory/assets/turno_cocina_cuerno.png and b/gymkhana/items/inventory/assets/turno_cocina_cuerno.png differ diff --git a/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png b/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png new file mode 100644 index 00000000..4fa83a67 Binary files /dev/null and b/gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png differ diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.esc b/gymkhana/items/inventory/turno_cocina_cuerno.esc index a2f38b14..8355f249 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.esc +++ b/gymkhana/items/inventory/turno_cocina_cuerno.esc @@ -2,10 +2,12 @@ say player "Que cosa tan curiosa" :action2 -say player "No lo quiero coger" +say current_player "A la saca!" +set_active turno_cocina_cuerno false +inventory_add turno_cocina_cuerno :action3 -say player "Que cosa tan curiosa" +say player "Parece un cuerno de algo." :action4 -say player "No lo quiero coger" +say player "No tengo claro como funciona." diff --git a/gymkhana/items/inventory/turno_cocina_cuerno.tscn b/gymkhana/items/inventory/turno_cocina_cuerno.tscn index 2ac56862..0fe37ed6 100644 --- a/gymkhana/items/inventory/turno_cocina_cuerno.tscn +++ b/gymkhana/items/inventory/turno_cocina_cuerno.tscn @@ -1,28 +1,28 @@ -[gd_scene load_steps=5 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=1] [ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno.png" type="Texture" id=2] -[ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] +[ext_resource path="res://gymkhana/items/inventory/assets/turno_cocina_cuerno_inventario.png" type="Texture" id=3] [node name="turno_cocina_cuerno" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) global_id = "turno_cocina_cuerno" esc_script = "res://gymkhana/items/inventory/turno_cocina_cuerno.esc" -inventory_texture = ExtResource( 2 ) +combine_when_selected_action_is_in = [ ] +inventory_texture = ExtResource( 3 ) dialog_color = Color( 1, 1, 1, 1 ) tooltips = { - "action1": "Mirar el cuerno", - "action2": "Coger el cuerno", - "action3": "Mirar", - "action4": "Usar" +"action1": "Mirar el cuerno", +"action2": "Coger el cuerno", +"action3": "Mirar", +"action4": "Usar" } animations = null [node name="Sprite" type="Sprite" parent="."] -position = Vector2( -2, 0 ) -scale = Vector2( 0.5, 0.5 ) +position = Vector2( 8.125, -8.125 ) 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( -11, -22, -11, -32, -10, -42, -7, -46, 0, -49, 3, -49, 9, -48, 13, -43, 12, -33, 7, -24, 5, -13, 5, -4, 7, 4, 11, 13, 16, 19, 23, 24, 28, 27, 27, 32, 24, 33, 18, 32, 11, 28, 3, 22, -3, 15, -8, 5, -10, -4, -11, -15 ) diff --git a/gymkhana/rooms/turno_cocina/cocina/assets/background.png b/gymkhana/rooms/turno_cocina/cocina/assets/background.png index 96f27bc0..50b40e05 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 0bf70bb3..d9a4e7b7 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 56b4952b..1407ddb6 100644 --- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn +++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn @@ -119,7 +119,7 @@ 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 ) +polygon = PoolVector2Array( 44.1165, 551.899, 44.1165, 541.772, 38.9263, 515.443, 36.8501, 487.089, 25.4319, 459.747, 7.7854, 437.468, 10.3804, 161.013, 124.564, 97.2152, 120.751, 208.793, 108.474, 210.633, 104.322, 228.861, 105.36, 255.19, 109.512, 271.392, 114.703, 279.494, 106.398, 457.721, 103.284, 469.873, 83.5615, 487.089, 70.0671, 524.557, 59.6868, 555.949 ) [node name="puerta_delante_start" type="Position2D" parent="puerta_delante"] position = Vector2( 2379, 526 ) @@ -394,15 +394,8 @@ position = Vector2( 93.7431, -73.8329 ) script = ExtResource( 5 ) [node name="turno_cocina_cuerno" parent="." instance=ExtResource( 20 )] -position = Vector2( 2805, 151 ) -rotation = 1.44513 -scale = Vector2( 0.8, 0.8 ) -combine_when_selected_action_is_in = [ ] +position = Vector2( 2801, 175 ) -[node name="turno_cocina_cuerno_collision" type="CollisionPolygon2D" parent="turno_cocina_cuerno"] -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.133, -1.61509, -29.5033, -20.6873, -14.7783, -17.5671, -15.0916, -15.0868 ) - -[node name="turno_cocina_cuerno_location" type="Position2D" parent="turno_cocina_cuerno"] -position = Vector2( 421.503, 164.124 ) +[node name="ESCLocation" type="Position2D" parent="turno_cocina_cuerno"] +position = Vector2( -81, 334 ) script = ExtResource( 5 )