diff --git a/gymkhana/addons/escoria-ui-2verbs/verbs_menu.tscn b/gymkhana/addons/escoria-ui-2verbs/verbs_menu.tscn index 7c3755c8..d1650ad7 100644 --- a/gymkhana/addons/escoria-ui-2verbs/verbs_menu.tscn +++ b/gymkhana/addons/escoria-ui-2verbs/verbs_menu.tscn @@ -13,113 +13,25 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="open" type="Button" parent="."] +[node name="action1" type="Button" parent="."] margin_right = 161.0 margin_bottom = 85.0 size_flags_horizontal = 3 size_flags_vertical = 3 toggle_mode = true -text = "Open" +text = "Left click" __meta__ = { "_edit_use_anchors_": false } -[node name="pickup" type="Button" parent="."] +[node name="action2" type="Button" parent="."] margin_left = 165.0 margin_right = 326.0 margin_bottom = 85.0 size_flags_horizontal = 3 size_flags_vertical = 3 toggle_mode = true -text = "Pick up2" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="push" type="Button" parent="."] -margin_left = 330.0 -margin_right = 491.0 -margin_bottom = 85.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Push" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="close" type="Button" parent="."] -margin_top = 89.0 -margin_right = 161.0 -margin_bottom = 174.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Close" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="look" type="Button" parent="."] -margin_left = 165.0 -margin_top = 89.0 -margin_right = 326.0 -margin_bottom = 174.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Look at" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="pull" type="Button" parent="."] -margin_left = 330.0 -margin_top = 89.0 -margin_right = 491.0 -margin_bottom = 174.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Pull" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="give" type="Button" parent="."] -margin_top = 178.0 -margin_right = 161.0 -margin_bottom = 263.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Give" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="use" type="Button" parent="."] -margin_left = 165.0 -margin_top = 178.0 -margin_right = 326.0 -margin_bottom = 263.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Use" -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="talk" type="Button" parent="."] -margin_left = 330.0 -margin_top = 178.0 -margin_right = 491.0 -margin_bottom = 263.0 -size_flags_horizontal = 3 -size_flags_vertical = 3 -toggle_mode = true -text = "Talk" +text = "Right click" __meta__ = { "_edit_use_anchors_": false } diff --git a/gymkhana/rooms/home/esc/wall_item.esc b/gymkhana/rooms/home/esc/wall_item.esc index 699df6a7..d03fedc6 100755 --- a/gymkhana/rooms/home/esc/wall_item.esc +++ b/gymkhana/rooms/home/esc/wall_item.esc @@ -1,4 +1,4 @@ -:look +:action2 > [eq dialog_advance 0] say player ROOM1_look_wall_item_1:"I don't know what that stuff is." set_global dialog_advance 1 diff --git a/gymkhana/rooms/home/room01.tscn b/gymkhana/rooms/home/room01.tscn index 01589b6a..8e9a0389 100644 --- a/gymkhana/rooms/home/room01.tscn +++ b/gymkhana/rooms/home/room01.tscn @@ -107,7 +107,7 @@ script = ExtResource( 5 ) global_id = "r1_wall_item1" esc_script = "res://gymkhana/rooms/home/esc/wall_item.esc" tooltip_name = "Artwork" -default_action = "look" +default_action = "action2" combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 10 ) dialog_color = Color( 1, 1, 1, 1 ) @@ -144,7 +144,7 @@ script = ExtResource( 5 ) global_id = "r1_wall_item2" esc_script = "res://gymkhana/rooms/home/esc/wall_item_popupdialog.esc" tooltip_name = "Artwork 2" -default_action = "look" +default_action = "action2" combine_when_selected_action_is_in = [ ] inventory_texture = ExtResource( 9 ) dialog_color = Color( 1, 1, 1, 1 )