From 43474237007893d1907bd4fd9c09a3238e03ab65 Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Thu, 9 Mar 2023 11:59:00 +0100 Subject: [PATCH] Move some items to inventory folder and names cleanup --- game/translations/main_menu.de.translation | Bin 1116 -> 1112 bytes game/translations/main_menu.en.translation | Bin 1037 -> 1037 bytes game/translations/main_menu.fr.translation | Bin 1080 -> 1080 bytes .../esc/esc_action_manager_monkey.gd | 2 +- .../{I_Bombona.tscn => bombona.tscn} | 2 +- .../inventory/bombona2.esc} | 4 ++-- .../inventory/caja_herramientas.esc} | 4 ++-- ...rramientas.tscn => caja_herramientas.tscn} | 2 +- .../esc/{i_bombona.esc => bombona.esc} | 0 .../trasera_cocina/esc/entrada_cocina.esc | 4 ++-- .../trasera_cocina/esc/p_eneko_smoking.esc | 4 ++-- .../rooms/trasera_cocina/trasera_cocina.tscn | 22 +++++++++--------- 12 files changed, 22 insertions(+), 22 deletions(-) rename gymkhana/items/inventory/{I_Bombona.tscn => bombona.tscn} (95%) rename gymkhana/{rooms/trasera_cocina/esc/i_bombona2.esc => items/inventory/bombona2.esc} (80%) rename gymkhana/{rooms/trasera_cocina/esc/i_caja_herramientas.esc => items/inventory/caja_herramientas.esc} (68%) rename gymkhana/items/inventory/{I_caja_herramientas.tscn => caja_herramientas.tscn} (96%) rename gymkhana/rooms/trasera_cocina/esc/{i_bombona.esc => bombona.esc} (100%) diff --git a/game/translations/main_menu.de.translation b/game/translations/main_menu.de.translation index 5c4ed566c6d7e1fee1d336f9ea4059a04b64fea5..c23018acaaa5c353112bce9b6a453191df7d1506 100644 GIT binary patch delta 519 zcmcb^af4&S7Dmmp3=9nHK+FNeOhC*C#Qx1LON4+l8x(geJ-I<*@?A!8$sIrukV-Bf z2B`#L+m(Lb)=uVS64z7#@;ISbeWLZzVj!Cbi1~mRrh5P8B~R)n`!b13g3MrrVwkMa zv^=$f$+bY)1fUGaCXjhB*{a(dTNx&=1%3f zHXNJIzA*mB;Fp@2$KapM;9FXpnGF(en#r=nnkD8RLs))JPEux03Q&-3#?l_J7KZG6DJVEWUFp-Y+W>YEl_p`R2HNHCcFLB)QK}E-vzn@D9FGJ#cGMB z=evMxkV<6L4_8hNQJpNyES_=#Con=>{Vgf)K6f*Ka z{1Ax!vl+Y+8GK8NGqV}~1=}>uWLaX(67!GYpPSkYE*Zu1|CwA|Cof=Docx7ZvHqVc zzwaio2R}LgG5Dos<^hS))MAC;g3Qz$hJTJTe&+E1V+bxNN=(j3W%%dx+SV9oj$>4m z;!F@D*oI@%*%u&IIFr6K7mx>JN0k;G-jfWp+L3c2NO^F6XylU diff --git a/game/translations/main_menu.en.translation b/game/translations/main_menu.en.translation index 8a36c9ef7db554fe5ce11dd4a624d2c252c8d36d..0a49b1bea411d0262014207afc0c8922c1bce462 100644 GIT binary patch delta 444 zcmeC>=;he3lu>gA0|Nsq6f*&7Mj-ZYc3C0-q}iajW9i8aVw2A?ic7WvMc9Fu1BgK? zLD+Vs-?zHS{}{zJWq~{{Am#>Q^@-L;qkuFI5c2^sO!fZFOP-`nwqp{P1gT_(VwkMa zv^=%2$$3Cocc2W+ewb|4ZH}!Blji|toq)11SHontznVI6?&Nb!;+nijCaWcyp7#av zIiVP)`r*o{A?lO)n8h`FfHE*wYDEZYmts-yTNCijRGwJADXXg6H5LlX7!r+{kmz=;he3luY=ICt4pZ2hu!1%m>6U)%!Oud7?krj!9h76)4IK#V}c; zX?beQlk_8+ZHVt+T?Rg;+jB7xXEgXrspGo zd`>8aseZU}YKYuqK4x*vKA;TDm0A&k+8$U`zb?>OHfypUvpAc-H$!A<@#GR_&B}kS z0X2+vEctI(a{e<~G5qtl={@j|!7rb|FST4DJux?x;h(#)bi_XfpTxZM(!}&shQQLy z5(ekQyyVmz2A}-I6sRg^c`r^iZflmDe+*8E$=M8!1qC^k4F7_o?U{6Rt}}D}V+c+x MONA&73J!7x07Rr&IRF3v diff --git a/game/translations/main_menu.fr.translation b/game/translations/main_menu.fr.translation index 0daf0b5ea3292fa5051a51f06eb2793da0933788..9105a1752c0df1ff8866c740712f59beaf35a1f1 100644 GIT binary patch delta 509 zcmdnNv4dm77Dmkt3=9nHK+FNeOhC*C#Qx1LOZcH;An}f+CpU;szRM^sITOg^f?|+L z5Vl?E_ifT-UM6u(86b}riq$7tA58_a`G8mih+(StZ(j1Gc(N~(xFpDA7AS_v8coYn zOPpK_lnnsNpxab+n`0}(3WrxF7bWH~{AWDeDbp11-D$_7mT&E!1r)Gn z_!kV}@cd&4N-fDREn;viD98bsP{iPqn3oPT$-gv{;h(d-7pGcHXRW^%(?5oPt^ta- z86LcuymTvzE7&Zcm|t}M3~n2UyuVHFfqx9{hgaquURjiw1Jt0S!^AAUdAlMPP-UQ+ U{*HePj(K^dIY3(&f`Wsb0XGA8ivR!s delta 509 zcmdnNv4dm77DmlN1_lOpAm#vKCLm@6V*h5BB``6Nc*oL{8~7*RWfYf80P?t?7^D(} zZCCnz^PJ4fB(5m}v9)3HTA=JSpe)FRAPm#H{ngZo6_f7*-2oJ2V1{C~MAP$GKsLJS zhbyOsC{C7T7S~)3lm)q(ABeRg1hqqeG!GC905Qz$*9AJuwoHy?7O(fuX7De~WbiF5 z&MYiVWeCg9tYG-(rZ$61M)CZACbuAl|BQz_Wt!r>JMCE1@~!=|fCBam|6BtUZ!xW{^NY@(!ENL3#q^KC{qV}X!z+sta~OOQ^U{Gf{0mgm z-|>&ZF)yz)C$-3x!8s$bC_S}^;h(d-7pGcHXDwJ;P-;njX%T~CK|v14T|jA99UUfS X@y**6xqx;BLu}>w$G{L29OMiD>)>}Q 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"