diff --git a/game/translations/main_menu.de.translation b/game/translations/main_menu.de.translation index 5c4ed566..c23018ac 100644 Binary files a/game/translations/main_menu.de.translation and b/game/translations/main_menu.de.translation differ diff --git a/game/translations/main_menu.en.translation b/game/translations/main_menu.en.translation index 8a36c9ef..0a49b1be 100644 Binary files a/game/translations/main_menu.en.translation and b/game/translations/main_menu.en.translation differ diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation index 0daf0b5e..9105a175 100644 Binary files a/game/translations/main_menu.fr.translation and b/game/translations/main_menu.fr.translation differ diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd b/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd index acf527dd..2a2f6bae 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/esc/esc_action_manager_monkey.gd @@ -298,7 +298,7 @@ func perform_inputevent_on_object( dont_interact = context.dont_interact_on_arrival var player_global_pos = escoria.main.current_scene.player.global_position - var clicked_position = event.position + # var clicked_position = event.position # Using this instead of is_equal_approx due to # https://github.com/godotengine/godot/issues/65257 diff --git a/gymkhana/items/inventory/I_Bombona.tscn b/gymkhana/items/inventory/bombona.tscn similarity index 95% rename from gymkhana/items/inventory/I_Bombona.tscn rename to gymkhana/items/inventory/bombona.tscn index 5ec2670b..7a087f45 100644 --- a/gymkhana/items/inventory/I_Bombona.tscn +++ b/gymkhana/items/inventory/bombona.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://gymkhana/items/inventory/assets/bombona.png" type="Texture" id=1] [ext_resource path="res://addons/escoria-core/game/core-scripts/esc_location.gd" type="Script" id=3] -[node name="i_bombona" type="Area2D"] +[node name="bombona" type="Area2D"] pause_mode = 1 position = Vector2( 0, -1 ) diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc b/gymkhana/items/inventory/bombona2.esc similarity index 80% rename from gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc rename to gymkhana/items/inventory/bombona2.esc index 75689b5d..cac6e253 100644 --- a/gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc +++ b/gymkhana/items/inventory/bombona2.esc @@ -2,8 +2,8 @@ say player "Es naranja" :action2 -set_active i_bombona2 false -inventory_add i_bombona2 +set_active bombona2 false +inventory_add bombona2 :action3 say player "Es el segundo bolsillo más grande que he visto nunca" diff --git a/gymkhana/rooms/trasera_cocina/esc/i_caja_herramientas.esc b/gymkhana/items/inventory/caja_herramientas.esc similarity index 68% rename from gymkhana/rooms/trasera_cocina/esc/i_caja_herramientas.esc rename to gymkhana/items/inventory/caja_herramientas.esc index dfb67c26..c6033990 100644 --- a/gymkhana/rooms/trasera_cocina/esc/i_caja_herramientas.esc +++ b/gymkhana/items/inventory/caja_herramientas.esc @@ -3,8 +3,8 @@ say current_player "Parece una caja de herramientas" :action2 say current_player "Podria ser util!!" -set_active i_caja_herramientas false -inventory_add i_caja_herramientas +set_active caja_herramientas false +inventory_add caja_herramientas :action3 say current_player "Hay de too!" diff --git a/gymkhana/items/inventory/I_caja_herramientas.tscn b/gymkhana/items/inventory/caja_herramientas.tscn similarity index 96% rename from gymkhana/items/inventory/I_caja_herramientas.tscn rename to gymkhana/items/inventory/caja_herramientas.tscn index 6c765c9c..d46fac15 100644 --- a/gymkhana/items/inventory/I_caja_herramientas.tscn +++ b/gymkhana/items/inventory/caja_herramientas.tscn @@ -9,7 +9,7 @@ extents = Vector2( 22.5, 12.5 ) [node name="ESCItemWithTooltip" type="Area2D"] pause_mode = 1 script = ExtResource( 1 ) -global_id = "i_caja_herramientas" +global_id = "caja_herramientas" inventory_texture = ExtResource( 2 ) dialog_color = Color( 1, 1, 1, 1 ) animations = null diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc b/gymkhana/rooms/trasera_cocina/esc/bombona.esc similarity index 100% rename from gymkhana/rooms/trasera_cocina/esc/i_bombona.esc rename to gymkhana/rooms/trasera_cocina/esc/bombona.esc diff --git a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc index 49b0c2ab..12ae0efe 100644 --- a/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc +++ b/gymkhana/rooms/trasera_cocina/esc/entrada_cocina.esc @@ -6,7 +6,7 @@ say player "Parece que veo a Mikel" play_snd res://game/sfx/sounds/doorOpen_2.ogg change_scene "res://gymkhana/rooms/interior_cocina/interior_cocina.tscn" -:action3 i_bombona2 +:action3 bombona2 say player "He usado la 'bombona' con la puerta" # > [eq r5_dialog_advance 2] # say player "I already fixed the water leak." @@ -19,5 +19,5 @@ say player "He usado la 'bombona' con la puerta" # accept_input ALL -:action4 i_bombona2 +:action4 bombona2 say player "No creo que les haga gracia" diff --git a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc index 03ab2613..967d7a52 100644 --- a/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc +++ b/gymkhana/rooms/trasera_cocina/esc/p_eneko_smoking.esc @@ -44,10 +44,10 @@ set_global loom_conversation_done false ! #set_gui_visible true -:action3 i_caja_herramientas +:action3 caja_herramientas say eneko_smoking "No quiero una caja vacía" -:action3 i_bombona2 +:action3 bombona2 > [eq bombona2_offered 1] say eneko_smoking "¡No vuelvas a hacerlo, es peligroso!" set_global bombona2_offered 2 diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 553706a7..0d96b369 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -9,11 +9,11 @@ [ext_resource path="res://gymkhana/characters/oier/oier.tscn" type="PackedScene" id=7] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/columna.png" type="Texture" id=25] [ext_resource path="res://gymkhana/rooms/trasera_cocina/assets/background trasera cocina-pix-height.png" type="Texture" id=26] -[ext_resource path="res://gymkhana/items/inventory/I_Bombona.tscn" type="PackedScene" id=27] +[ext_resource path="res://gymkhana/items/inventory/bombona.tscn" type="PackedScene" id=27] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/esc_item_with_tooltip.gd" type="Script" id=28] [ext_resource path="res://gymkhana/items/inventory/assets/bombona-inv.png" type="Texture" id=29] [ext_resource path="res://gymkhana/characters/eneko/eneko_smoking.tscn" type="PackedScene" id=30] -[ext_resource path="res://gymkhana/items/inventory/I_caja_herramientas.tscn" type="PackedScene" id=31] +[ext_resource path="res://gymkhana/items/inventory/caja_herramientas.tscn" type="PackedScene" id=31] [sub_resource type="NavigationPolygon" id=1] vertices = PoolVector2Array( 155, 425, 129, 383, 242, 376, 1511, 445, 1512, 574, 193, 574, 1133, 474, 263, 374, 359, 376, 385, 397, 442, 395, 464, 432, 506, 457, 725, 472, 794, 462, 846, 467, 864, 482, 1318, 435, 1367, 411, 1425, 417, 749, 460, 584, 468, 1249, 454, 981, 480 ) @@ -67,8 +67,8 @@ is_exit = true dialog_color = Color( 1, 1, 1, 1 ) action1_text = "Esto es una puerta y tiene una descripcion mu larga" action2_text = "Entrar! con descricion..." -action3_target_texts = { "i_bombona2": "Usar la bombona con la puerta?" } -action4_target_texts = { "i_bombona2": "Lanzarla contra la puerta" } +action3_target_texts = { "bombona2": "Usar la bombona con la puerta?" } +action4_target_texts = { "bombona2": "Lanzarla contra la puerta" } target_when_selected_action_is_in = [ "action3", "action4" ] animations = SubResource( 2 ) @@ -84,8 +84,8 @@ script = ExtResource( 3 ) [node name="bombona" parent="Hotspots" instance=ExtResource( 27 )] position = Vector2( 583, 414 ) script = ExtResource( 28 ) -global_id = "i_bombona" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona.esc" +global_id = "bombona" +esc_script = "res://gymkhana/rooms/trasera_cocina/esc/bombona.esc" tooltip_name = "Mirar bombona" combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 29 ) @@ -96,8 +96,8 @@ animations = null [node name="bombona2" parent="Hotspots" instance=ExtResource( 27 )] position = Vector2( 355, 409 ) script = ExtResource( 28 ) -global_id = "i_bombona2" -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_bombona2.esc" +global_id = "bombona2" +esc_script = "res://gymkhana/items/inventory/bombona2.esc" combine_when_selected_action_is_in = [ "action3" ] use_from_inventory_only = true inventory_texture = ExtResource( 29 ) @@ -120,7 +120,7 @@ tooltip_name = "Objervar sujeto" dialog_color = Color( 0, 1, 0.462745, 1 ) action1_text = "Objervar sujeto" action2_text = "Hablar" -action3_target_texts = { "i_bombona2": "Toma, un regalo", "i_caja_herramientas": "Regalar" } +action3_target_texts = { "bombona2": "Toma, un regalo", "caja_herramientas": "Regalar" } target_when_selected_action_is_in = [ "action3" ] selectable = true @@ -130,10 +130,10 @@ script = ExtResource( 3 ) global_id = "eneko_smoking" [node name="caja_herramientas" parent="." instance=ExtResource( 31 )] -esc_script = "res://gymkhana/rooms/trasera_cocina/esc/i_caja_herramientas.esc" +esc_script = "res://gymkhana/items/inventory/caja_herramientas.esc" position = Vector2( 707, 522 ) [node name="ESCLocation" type="Position2D" parent="ESCItemWithTooltip"] position = Vector2( -51, 69 ) script = ExtResource( 3 ) -global_id = "l_caja_herramientas" +global_id = "caja_herramientas"