Merge branch 'gymkhana/main' of git.fosil.eu:gymkhana/gymkhana into gymkhana/main

2023-08-27 04:02:26 +02:00
parent 42e504f5b2 50ccb0f25b
commit ceb6dd1244
9 changed files with 106 additions and 5 deletions
--- a/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
+++ b/gymkhana/addons/escoria-ui-return-monkey-island/game.gd
@@ -235,6 +235,7 @@ func element_focused(element_id: String) -> void:
 	if target_obj is ESCItem or ESCItemWithTooltip:
 		$tooltip_layer/tooltip.set_target(target_obj.tooltip_name)
 		$tooltip_layer/tooltip.set_target_object(target_obj)
+		

 func element_unfocused() -> void:
 	$tooltip_layer/tooltip.set_target("")
--- a/gymkhana/items/inventory/turno_cocina_frontal.esc
+++ b/gymkhana/items/inventory/turno_cocina_frontal.esc
@@ -1,5 +1,3 @@
 :action3
 say player "Es mi frontal de toda la vida, le tengo cariño"

-:action4
-say player "NOT IMPLEMENTED"
--- a/gymkhana/items/inventory/turno_cocina_frontal.tscn
+++ b/gymkhana/items/inventory/turno_cocina_frontal.tscn
@@ -16,6 +16,7 @@ inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 action3_text = "Admirar"
 action4_text = "Usar"
+combine_when_selected_action_is_in = [ "action4" ]
 animations = null

 [node name="Sprite" type="Sprite" parent="."]
--- a/gymkhana/items/inventory/turno_cocina_peso_bol.tscn
+++ b/gymkhana/items/inventory/turno_cocina_peso_bol.tscn
@@ -13,13 +13,13 @@ script = ExtResource( 1 )
 global_id = "turno_cocina_peso_bol"
 esc_script = "res://gymkhana/items/inventory/turno_cocina_peso_bol.esc"
 combine_when_selected_action_is_in = [ "action4" ]
-target_when_selected_action_is_in = [ "action3" ]
 inventory_texture = ExtResource( 2 )
 dialog_color = Color( 1, 1, 1, 1 )
 action1_text = "¿Que es esto?"
 action2_text = "Coger"
 action3_text = "Mirar"
 action4_text = "Usar"
+target_when_selected_action_is_in = [ "action3" ]
 animations = null

 [node name="Sprite" type="Sprite" parent="."]
--- a/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
+++ b/gymkhana/rooms/turno_cocina/cocina/cocina.tscn
@@ -117,3 +117,63 @@ polygon = PoolVector2Array( -7.95056, -30.4277, -4.54321, 21.412, -56.79, 37.189
 [node name="turno_cocina_bol_location" type="Position2D" parent="turno_cocina_bol"]
 position = Vector2( 198.765, 339.212 )
 script = ExtResource( 5 )
+
+[node name="fregadero_der" type="Area2D" parent="."]
+pause_mode = 1
+script = ExtResource( 6 )
+global_id = "cocina_fregadero_der"
+esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc"
+combine_when_selected_action_is_in = [  ]
+dialog_color = Color( 1, 1, 1, 1 )
+action1_text = "Mirar fregadero"
+action2_text = "Usar"
+action3_target_texts = {
+"turno_cocina_bol": "Llenar el bol de agua",
+"turno_cocina_bol_lentejas": "Llenar el bol de agua"
+}
+target_when_selected_action_is_in = [ "action3" ]
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_der"]
+polygon = PoolVector2Array( 2327, 294, 2395, 296, 2401, 290, 2367, 286, 2365, 260, 2362, 259, 2362, 278, 2356, 286, 2334, 286 )
+
+[node name="fregadero_izq" type="Area2D" parent="."]
+pause_mode = 1
+script = ExtResource( 6 )
+global_id = "cocina_fregadero_izq"
+esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc"
+combine_when_selected_action_is_in = [  ]
+dialog_color = Color( 1, 1, 1, 1 )
+action1_text = "Mirar fregadero"
+action2_text = "Usar"
+action3_target_texts = {
+"turno_cocina_bol": "Llenar el bol de agua",
+"turno_cocina_bol_lentejas": "Llenar el bol de agua"
+}
+target_when_selected_action_is_in = [ "action3" ]
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="fregadero_izq"]
+polygon = PoolVector2Array( 1800, 276, 1804, 280, 1895, 273, 1883, 266, 1863, 267, 1839, 268, 1835, 264, 1835, 259, 1838, 254, 1848, 248, 1854, 252, 1858, 252, 1856, 246, 1851, 244, 1843, 247, 1836, 251, 1831, 258, 1830, 263, 1828, 265, 1826, 264, 1823, 265, 1822, 269, 1824, 270, 1822, 272, 1809, 272, 1798, 273 )
+
+[node name="debajo_sofa" type="Area2D" parent="."]
+pause_mode = 1
+script = ExtResource( 6 )
+global_id = "cocina_debajo_sofa"
+esc_script = "res://gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc"
+combine_when_selected_action_is_in = [ "action4" ]
+dialog_color = Color( 1, 1, 1, 1 )
+action1_text = "Mirar debajo del sofa"
+action2_text = "Meter la mano"
+action3_target_texts = {
+"turno_cocina_frontal": "Mirar denajo del sofa"
+}
+target_when_selected_action_is_in = [ "action3" ]
+animations = null
+
+[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="debajo_sofa"]
+polygon = PoolVector2Array( 484, 406, 485, 421, 556, 423, 551, 415, 550, 409, 551, 406 )
+
+[node name="ESCLocation" type="Position2D" parent="debajo_sofa"]
+position = Vector2( 420, 494 )
+script = ExtResource( 5 )
--- a/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/debajo_sofa.esc
@@ -0,0 +1,17 @@
+:action1
+    say player "No se ve nada."
+:action2
+    say player "No pienso meter la mano está muy oscuro." [!turno_cocina_frontal_debajo_sofa]
+    say player "Bieen! una patata!" [turno_cocina_frontal_debajo_sofa]
+    inventory_add turno_cocina_patata [turno_cocina_frontal_debajo_sofa]
+    set_active cocina_debajo_sofa false
+
+:action3 turno_cocina_bol_lentejas
+    say player "Agua a ojo... en su justa medida."
+    inventory_remove turno_cocina_peso_bol
+    inventory_add turno_cocina_bol_lentejas
+    inventory_add turno_cocina_peso
+
+:action3 turno_cocina_frontal
+    say player "Veo una patata!!"
+    set_global turno_cocina_frontal_debajo_sofa true
--- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_der.esc
@@ -0,0 +1,12 @@
+:action1
+    say player "Parece que funciona."
+:action2
+    say player "No tengo donde meter el agua."
+:action3 turno_cocina_bol_lentejas
+    say player "Agua a ojo... en su justa medida."
+    inventory_remove turno_cocina_peso_bol
+    inventory_add turno_cocina_bol_lentejas
+    inventory_add turno_cocina_peso
+    set_active cocina_fregadero_izq false
+:action3 turno_cocina_bol
+    say player "Mejor meter las lentejas primero."
--- a/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc
+++ b/gymkhana/rooms/turno_cocina/cocina/esc/fregadero_izq.esc
@@ -0,0 +1,12 @@
+:action1
+    say player "Parece que funciona."
+:action2
+    say player "No tengo donde meter el agua."
+:action3 turno_cocina_bol_lentejas
+    say player "Agua a ojo... en su justa medida."
+    inventory_remove turno_cocina_peso_bol
+    inventory_add turno_cocina_bol_lentejas
+    inventory_add turno_cocina_peso
+    set_active cocina_fregadero_izq false
+:action3 turno_cocina_bol
+    say player "Mejor meter las lentejas primero."
--- 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": "StateMachine",
+"base": "Node",
 "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": "Reference",
+"base": "Node",
 "class": "ESCResourceCache",
 "language": "GDScript",
 "path": "res://addons/escoria-core/game/core-scripts/esc_resource_cache.gd"