From 8379e717138c619e0a501baf9f52f82f4113d9cd Mon Sep 17 00:00:00 2001 From: Eneko Nieto Date: Sun, 22 Oct 2023 22:56:14 +0200 Subject: [PATCH] bugfix: option dialog scrollbar --- .../chooser/simple.tscn | 12 ++++++------ gymkhana/characters/eneko/eneko_smoking.esc | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn index acf63543..8f0045f2 100644 --- a/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn +++ b/gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://addons/escoria-dialog-simple/chooser/simple.gd" type="Script" id=1] +[ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/chooser/simple.gd" type="Script" id=1] [ext_resource path="res://gymkhana/addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres" type="Theme" id=2] [sub_resource type="Gradient" id=1] @@ -12,16 +12,16 @@ gradient = SubResource( 1 ) [node name="text_dialog_choice" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -margin_top = 547.0 +margin_top = 520.0 margin_right = 7.0 theme = ExtResource( 2 ) script = ExtResource( 1 ) [node name="MarginContainer" type="MarginContainer" parent="."] margin_left = 20.0 -margin_top = 20.0 +margin_top = 10.0 margin_right = 1280.0 -margin_bottom = 900.0 +margin_bottom = 210.0 mouse_filter = 2 custom_constants/margin_top = 20 custom_constants/margin_left = 20 @@ -30,7 +30,7 @@ custom_constants/margin_left = 20 margin_left = 20.0 margin_top = 20.0 margin_right = 1260.0 -margin_bottom = 880.0 +margin_bottom = 200.0 scroll_horizontal_enabled = false __meta__ = { "_edit_use_anchors_": false @@ -38,7 +38,7 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer/ScrollContainer"] margin_right = 1240.0 -margin_bottom = 860.0 +margin_bottom = 180.0 size_flags_horizontal = 3 size_flags_vertical = 3 custom_constants/separation = 20 diff --git a/gymkhana/characters/eneko/eneko_smoking.esc b/gymkhana/characters/eneko/eneko_smoking.esc index 98a6131d..3d609d7b 100644 --- a/gymkhana/characters/eneko/eneko_smoking.esc +++ b/gymkhana/characters/eneko/eneko_smoking.esc @@ -2,9 +2,9 @@ say current_player "Tiene pinta de que fuma" :intro_dialog -say current_player cocina_delante_intro_dialog_player:"Egunon! Que bien se duerme en este pueblo." -say eneko_smoking cocina_delante_intro_dialog_eneko:"Mira tú, el señorito se ha dignado a aparecer." -say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de provecho o te vas a pasar toda la mañana sentado fumando porros?" +# say current_player cocina_delante_intro_dialog_player:"Egunon! Que bien se duerme en este pueblo." +# say eneko_smoking cocina_delante_intro_dialog_eneko:"Mira tú, el señorito se ha dignado a aparecer." +# say eneko_smoking cocina_delante_intro_dialog_eneko_2:"¿Piensas hacer algo de provecho o te vas a pasar toda la mañana sentado fumando porros?" ? - cocina_delante_intro_dialog_option1:"Uyuyuy, parece que alguien se ha despertado con el pie izquierdo." [!cocina_delante_intro_dialog_option1_done]