diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd index 2bc06be0..c918ea60 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd +++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.gd @@ -6,9 +6,10 @@ var inventory_visible: bool = false func _ready() -> void: + $FloatingInventory/panel.rect_position.x = ProjectSettings.get_setting("display/window/size/width") - $FloatingInventory/panel.rect_size.x # Hide inventory by default - $FloatingInventory/panel.rect_position.x = \ - ProjectSettings.get_setting("display/window/size/width") + # $FloatingInventory/panel.rect_position.x = \ + # ProjectSettings.get_setting("display/window/size/width") func _on_inventory_button_pressed(): if $FloatingInventory/InventoryTween.is_active(): diff --git a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn index bd3acf99..8869c906 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island/inventory/inventory_ui.tscn @@ -7,6 +7,7 @@ [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island/images/inventory_icon.png" type="Texture" id=6] [node name="inventory_ui" type="Control"] +visible = false anchor_right = 0.4 anchor_bottom = 0.4 margin_right = 768.0 @@ -24,9 +25,6 @@ inventory_ui_container = NodePath("FloatingInventory/panel/MarginContainer/Scrol [node name="HBoxContainer" type="HBoxContainer" parent="."] anchor_right = 1.0 anchor_bottom = 1.0 -__meta__ = { -"_edit_use_anchors_": false -} [node name="inventory_button" type="TextureButton" parent="HBoxContainer"] margin_right = 1280.0 @@ -47,9 +45,6 @@ size_flags_vertical = 3 texture = ExtResource( 5 ) expand = true stretch_mode = 1 -__meta__ = { -"_edit_use_anchors_": false -} [node name="FloatingInventory" type="CanvasLayer" parent="."] diff --git a/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc b/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc index a8a7646a..4f1c9c17 100644 --- a/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc +++ b/gymkhana/rooms/trasera_cocina/esc/i_bombona.esc @@ -1,6 +1,6 @@ :action1 say player "Es naranja" [!i/i_bombona] -say player "Es el segundo bolsillo más grande que he visto" [i/i_bombona] +say player "Es el segundo bolsillo más grande que he visto nunca" [i/i_bombona] :action2 > [!i/i_bombona] diff --git a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn index 4e7e7e3a..83a9ddde 100644 --- a/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn +++ b/gymkhana/rooms/trasera_cocina/trasera_cocina.tscn @@ -62,7 +62,7 @@ script = ExtResource( 2 ) position = Vector2( 1476, 363 ) scale = Vector2( 0.634168, 0.634168 ) frames = SubResource( 2 ) -frame = 3 +frame = 1 playing = true flip_h = true @@ -70,7 +70,6 @@ flip_h = true position = Vector2( 1018, 333 ) scale = Vector2( 0.867751, 0.867751 ) frames = SubResource( 2 ) -frame = 2 playing = true offset = Vector2( -0.09375, 20.0582 )