Skip to content

Commit dcab348

Browse files
wjtwjt
committed
Input HUD: Use consistent input button icons
Previously we had a mixture of outline and filled icons; and of colour and monochrome icons for Xbox and PlayStation. Refactor the way that these icons are assigned so that they are stored in the same JoypadButtonTextures resource as directional inputs. This means that the textures for a device type can be configured all in one place. Consistently use outline icons. Consistently use monochrome icons for Xbox. It is true that official Xbox controllers do have colours on the A/B/X/Y buttons but looking at some photos in an image search, the colours are either used for the text (not the surrounding button), or are printed as a little directional key in between the four buttons. I own two Xbox-style controllers made by 8BitDo; they use the XBox RB/RT labels for shoulder buttons rather than R1/R2 so the use of xbox textures for generic controllers seems appropriate, but they do not use colours. Similarly, use monochrome icons for PlayStation. Some PlayStation controllers have coloured buttons, but many more do not, and I don't think the colours are the strongest association. Some of the Switch button textures were inconsistent with the input map; fix these in the process. Unfortunately I was unable to pair my Switch 2 JoyCons with my laptop so I can't actually test these. (If we wanted to support Switch controllers "properly", IMO we should swap the mappings so that the Switch "A" button is interact, but that's one for another lifetime.) For champ_stealth, rather than adding these champ_specific actions to the global input map, make interact_input.gd skip the per-device mapping if it is not provided, which improves on the previous behaviour of showing blank icons when using a controller. For Sueños Nocturnos, which has a custom "Saltar cinemática." hint, use the "interact" button (matching the previous hardcoded button textures), and adjust the action it looks for to match so that joypad buttons actually work.
1 parent ca635e7 commit dcab348

19 files changed

Lines changed: 164 additions & 132 deletions

‎scenes/game_elements/props/hint/input_key/interact_input.gd‎

Lines changed: 15 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,30 @@
33
extends TextureRect
44

55
@export var action_name: StringName
6-
@export var keyboard_texture: Texture2D
7-
@export var xbox_controller_texture: Texture2D
8-
@export var playstation_controller_texture: Texture2D
9-
@export var nintendo_controller_texture: Texture2D
10-
@export var steam_controller_texture: Texture2D
6+
@export var alternative: bool = false
7+
@export var devices: InputHintManager
118

129

13-
func _physics_process(_delta: float) -> void:
10+
func _process(_delta: float) -> void:
1411
if Input.is_action_pressed(action_name):
1512
modulate = Color.GRAY
1613
else:
1714
modulate = Color.WHITE
1815

1916

2017
func _ready() -> void:
21-
InputHelper.device_changed.connect(_on_input_device_changed)
22-
_on_input_device_changed(InputHelper.device, InputHelper.device_index)
18+
if devices:
19+
InputHelper.device_changed.connect(_on_input_device_changed)
20+
_on_input_device_changed(InputHelper.device, InputHelper.device_index)
21+
else:
22+
push_warning("%s: Per-device textures not configured" % get_path())
2323

2424

2525
func _on_input_device_changed(device: String, _device_index: int) -> void:
26-
visible = true # Always visible (hybrid)
27-
28-
match device:
29-
InputHelper.DEVICE_KEYBOARD:
30-
if keyboard_texture:
31-
texture = keyboard_texture
32-
33-
InputHelper.DEVICE_XBOX_CONTROLLER:
34-
texture = xbox_controller_texture
35-
36-
InputHelper.DEVICE_PLAYSTATION_CONTROLLER:
37-
texture = playstation_controller_texture
38-
39-
InputHelper.DEVICE_SWITCH_CONTROLLER:
40-
texture = nintendo_controller_texture
41-
42-
InputHelper.DEVICE_STEAMDECK_CONTROLLER:
43-
texture = steam_controller_texture
44-
45-
_:
46-
texture = xbox_controller_texture
26+
var textures := devices.device_map[InputHelper.device]
27+
if alternative:
28+
texture = textures.get(action_name + "_alt")
29+
visible = texture != null
30+
else:
31+
texture = textures.get(action_name)
32+
visible = true

‎scenes/game_elements/props/hint/resources/joypadButtonTextures.gd‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,35 @@ extends Resource
1010
## Textures for the [code]aim_*[/code] actions
1111
@export var aim: DirectionalInputTextures
1212

13+
## Texture for the [code]running[/code] action
14+
@export var running: Texture2D
15+
16+
## Texture for the [code]interact[/code] action
17+
@export var interact: Texture2D
18+
19+
## Texture for the [code]repel[/code] action
20+
@export var repel: Texture2D
21+
22+
## Alternative texture for the [code]repel[/code] action (i.e. the keyboard key
23+
## as opposed to mouse button)
24+
@export var repel_alt: Texture2D
25+
26+
## Texture for the [code]throw[/code] action
27+
@export var throw: Texture2D
28+
29+
## Alternative texture for the [code]throw[/code] action (i.e. the keyboard key
30+
## as opposed to mouse button)
31+
@export var throw_alt: Texture2D
32+
33+
## Texture for the [code]sokoban_undo[/code] action
34+
@export var sokoban_undo: Texture2D
35+
36+
## Texture for the [code]sokoban_reset[/code] action
37+
@export var sokoban_reset: Texture2D
38+
39+
## Texture for the [code]sokoban_skip[/code] action
40+
@export var sokoban_skip: Texture2D
41+
1342

1443
## Returns the texture for a directional action. For instance, to get the
1544
## correct texture for the [code]aim_left[/code] action, use:

‎scenes/game_elements/props/hint/resources/keyboard.tres‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
[ext_resource type="Texture2D" uid="uid://bc8ffgelnq2nn" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_arrows_none.tres" id="4_8ua6o"]
88
[ext_resource type="Script" uid="uid://dhgm1dl0ohox5" path="res://scenes/game_elements/props/hint/resources/directional_input_textures.gd" id="4_ixpgq"]
99
[ext_resource type="Texture2D" uid="uid://bgcopu7b0q6iy" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_arrows_up_outline.tres" id="5_4b2ex"]
10+
[ext_resource type="Texture2D" uid="uid://c6fggds355rko" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_space_outline.tres" id="7_xgsrv"]
11+
[ext_resource type="Texture2D" uid="uid://dsre3bn521s4n" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/mouse_right_outline.tres" id="8_7o4sm"]
12+
[ext_resource type="Texture2D" uid="uid://bko5l0he6rf5o" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_z_outline.tres" id="9_nexuq"]
13+
[ext_resource type="Texture2D" uid="uid://00rpvlvvuems" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_shift_icon_outline.tres" id="10_jffwy"]
14+
[ext_resource type="Texture2D" uid="uid://c88qkrdjmolti" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_r_outline.tres" id="12_ac6oh"]
15+
[ext_resource type="Texture2D" uid="uid://cl3gxcavxrefq" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_x_outline.tres" id="13_12qfk"]
16+
[ext_resource type="Texture2D" uid="uid://dug86v7cum1kf" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/mouse_left_outline.tres" id="14_gs4lw"]
1017

1118
[sub_resource type="Resource" id="Resource_j5qbp"]
1219
script = ExtResource("4_ixpgq")
@@ -20,4 +27,13 @@ right = ExtResource("3_j5qbp")
2027
script = ExtResource("1_cfqun")
2128
move = SubResource("Resource_j5qbp")
2229
aim = SubResource("Resource_j5qbp")
30+
running = ExtResource("10_jffwy")
31+
interact = ExtResource("7_xgsrv")
32+
repel = ExtResource("8_7o4sm")
33+
repel_alt = ExtResource("9_nexuq")
34+
throw = ExtResource("14_gs4lw")
35+
throw_alt = ExtResource("13_12qfk")
36+
sokoban_undo = ExtResource("9_nexuq")
37+
sokoban_reset = ExtResource("12_ac6oh")
38+
sokoban_skip = ExtResource("13_12qfk")
2339
metadata/_custom_type_script = "uid://c0haweg5svww1"

‎scenes/game_elements/props/hint/resources/playstation.tres‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
[ext_resource type="Texture2D" uid="uid://dspkrq3jsh26x" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_stick_r.tres" id="5_jo447"]
1313
[ext_resource type="Texture2D" uid="uid://b5k4atvuhf6xp" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_dpad_up_outline.tres" id="5_oi6ek"]
1414
[ext_resource type="Texture2D" uid="uid://d2fkhf81x8u6d" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_stick_r_up.tres" id="6_q44m7"]
15+
[ext_resource type="Texture2D" uid="uid://cjhshus64ytpq" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_button_cross_outline.tres" id="7_kkpem"]
16+
[ext_resource type="Texture2D" uid="uid://c8cfu7jw7nnbs" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_trigger_r1_outline.tres" id="13_rd2vx"]
17+
[ext_resource type="Texture2D" uid="uid://co0m0w1t84na8" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_trigger_l1_outline.tres" id="14_wqnvl"]
18+
[ext_resource type="Texture2D" uid="uid://dltoru1w8ue7w" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_button_square_outline.tres" id="16_y4fr0"]
19+
[ext_resource type="Texture2D" uid="uid://d3rhotqp5gg7h" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_button_triangle_outline.tres" id="17_8wf4n"]
20+
[ext_resource type="Texture2D" uid="uid://7qdppn7p05b1" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_button_circle_outline.tres" id="18_0nat0"]
21+
[ext_resource type="Texture2D" uid="uid://df8vlifau6x6w" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/playstation/playstation_trigger_r2_outline.tres" id="19_khsdn"]
1522

1623
[sub_resource type="Resource" id="Resource_emb5i"]
1724
script = ExtResource("4_cghs7")
@@ -35,4 +42,11 @@ metadata/_custom_type_script = "uid://dhgm1dl0ohox5"
3542
script = ExtResource("1_omqst")
3643
move = SubResource("Resource_kkpem")
3744
aim = SubResource("Resource_emb5i")
45+
running = ExtResource("14_wqnvl")
46+
interact = ExtResource("7_kkpem")
47+
repel = ExtResource("13_rd2vx")
48+
throw = ExtResource("19_khsdn")
49+
sokoban_undo = ExtResource("18_0nat0")
50+
sokoban_reset = ExtResource("16_y4fr0")
51+
sokoban_skip = ExtResource("17_8wf4n")
3852
metadata/_custom_type_script = "uid://c0haweg5svww1"

‎scenes/game_elements/props/hint/resources/steamdeck.tres‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
[ext_resource type="Texture2D" uid="uid://bsxgtg4k28e61" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_dpad_up_outline.tres" id="5_1ctii"]
1313
[ext_resource type="Texture2D" uid="uid://b01qu3gqd3ctu" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_stick_r.tres" id="5_3pkdl"]
1414
[ext_resource type="Texture2D" uid="uid://7ob6261vwokk" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_stick_r_up.tres" id="6_poinc"]
15+
[ext_resource type="Texture2D" uid="uid://d223ajwmavjy8" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_a_outline.tres" id="7_wb6ss"]
16+
[ext_resource type="Texture2D" uid="uid://b7rygdiqbuuik" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_r1_outline.tres" id="13_enqan"]
17+
[ext_resource type="Texture2D" uid="uid://c2dy27tlmsigy" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_l1_outline.tres" id="14_hxnoe"]
18+
[ext_resource type="Texture2D" uid="uid://rrbih026ixaf" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_x_outline.tres" id="16_va1ks"]
19+
[ext_resource type="Texture2D" uid="uid://dn8vx333yunpe" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_y_outline.tres" id="17_vbsy4"]
20+
[ext_resource type="Texture2D" uid="uid://b2f4prnfhd1k1" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_b_outline.tres" id="18_otkfu"]
21+
[ext_resource type="Texture2D" uid="uid://jp3e3lyaan40" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/steam-deck/steamdeck_button_r2_outline.tres" id="19_c7evk"]
1522

1623
[sub_resource type="Resource" id="Resource_domy7"]
1724
script = ExtResource("4_3qkoy")
@@ -35,4 +42,11 @@ metadata/_custom_type_script = "uid://dhgm1dl0ohox5"
3542
script = ExtResource("1_aumst")
3643
move = SubResource("Resource_wb6ss")
3744
aim = SubResource("Resource_domy7")
45+
running = ExtResource("14_hxnoe")
46+
interact = ExtResource("7_wb6ss")
47+
repel = ExtResource("13_enqan")
48+
throw = ExtResource("19_c7evk")
49+
sokoban_undo = ExtResource("18_otkfu")
50+
sokoban_reset = ExtResource("16_va1ks")
51+
sokoban_skip = ExtResource("17_vbsy4")
3852
metadata/_custom_type_script = "uid://c0haweg5svww1"

‎scenes/game_elements/props/hint/resources/switch.tres‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
[ext_resource type="Texture2D" uid="uid://bk5kfa10mmwlb" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_stick_r.tres" id="5_3yvyh"]
1313
[ext_resource type="Texture2D" uid="uid://cbfuj8bkq6seu" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_dpad_up_outline.tres" id="5_mujfa"]
1414
[ext_resource type="Texture2D" uid="uid://cnnufqepabnm2" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_stick_r_up.tres" id="6_0s2bm"]
15+
[ext_resource type="Texture2D" uid="uid://cw4b0a55wdndp" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_b_outline.tres" id="7_nqwbi"]
16+
[ext_resource type="Texture2D" uid="uid://cren16wfvch5p" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_r_outline.tres" id="13_x12kq"]
17+
[ext_resource type="Texture2D" uid="uid://bfestobnif7sl" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_l_outline.tres" id="14_lbflk"]
18+
[ext_resource type="Texture2D" uid="uid://bkeqno6623dcj" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_y_outline.tres" id="16_yfmui"]
19+
[ext_resource type="Texture2D" uid="uid://cdgyk384ou7gp" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_x_outline.tres" id="17_buody"]
20+
[ext_resource type="Texture2D" uid="uid://bxvdat8x7qdm0" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_a_outline.tres" id="18_poutv"]
21+
[ext_resource type="Texture2D" uid="uid://dawyfturb2nwq" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/nintendo_switch/switch_button_zr_outline.tres" id="19_h0ie6"]
1522

1623
[sub_resource type="Resource" id="Resource_mv42c"]
1724
script = ExtResource("4_56m3b")
@@ -34,4 +41,11 @@ right = ExtResource("3_c5mv4")
3441
script = ExtResource("1_feeyu")
3542
move = SubResource("Resource_c5mv4")
3643
aim = SubResource("Resource_mv42c")
44+
running = ExtResource("14_lbflk")
45+
interact = ExtResource("7_nqwbi")
46+
repel = ExtResource("13_x12kq")
47+
throw = ExtResource("19_h0ie6")
48+
sokoban_undo = ExtResource("18_poutv")
49+
sokoban_reset = ExtResource("16_yfmui")
50+
sokoban_skip = ExtResource("17_buody")
3751
metadata/_custom_type_script = "uid://c0haweg5svww1"

‎scenes/game_elements/props/hint/resources/xbox.tres‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@
1212
[ext_resource type="Texture2D" uid="uid://ci1j0k8leqa3o" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_stick_r.tres" id="5_g15f5"]
1313
[ext_resource type="Texture2D" uid="uid://bcwquyrkyor4j" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_dpad_up_outline.tres" id="5_kariy"]
1414
[ext_resource type="Texture2D" uid="uid://b45ky4pi3jety" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_stick_r_up.tres" id="6_tv03i"]
15+
[ext_resource type="Texture2D" uid="uid://csbx81u4w37rp" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_button_a_outline.tres" id="7_tskv1"]
16+
[ext_resource type="Texture2D" uid="uid://m1fgpc7ru2b5" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_rb_outline.tres" id="13_fvgft"]
17+
[ext_resource type="Texture2D" uid="uid://dvkwc3688asij" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_lb_outline.tres" id="14_pukp1"]
18+
[ext_resource type="Texture2D" uid="uid://b8oqqn2re8bb4" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_button_x_outline.tres" id="16_5vyqi"]
19+
[ext_resource type="Texture2D" uid="uid://dk1g11haycllj" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_button_y_outline.tres" id="17_snkap"]
20+
[ext_resource type="Texture2D" uid="uid://cpafwyrjkngt3" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_button_b_outline.tres" id="18_0iss4"]
21+
[ext_resource type="Texture2D" uid="uid://bowdggq0c1ir4" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/xbox/xbox_rt_outline.tres" id="19_21ad5"]
1522

1623
[sub_resource type="Resource" id="Resource_cci5c"]
1724
script = ExtResource("1_qwpf8")
@@ -34,4 +41,11 @@ right = ExtResource("3_nh82o")
3441
script = ExtResource("1_bisyu")
3542
move = SubResource("Resource_qwpf8")
3643
aim = SubResource("Resource_cci5c")
44+
running = ExtResource("14_pukp1")
45+
interact = ExtResource("7_tskv1")
46+
repel = ExtResource("13_fvgft")
47+
throw = ExtResource("19_21ad5")
48+
sokoban_undo = ExtResource("18_0iss4")
49+
sokoban_reset = ExtResource("16_5vyqi")
50+
sokoban_skip = ExtResource("17_snkap")
3751
metadata/_custom_type_script = "uid://c0haweg5svww1"

‎scenes/quests/story_quests/champ/3_stealth/champ_stealth.tscn‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
[ext_resource type="Resource" uid="uid://dl6n1ifa5ktnp" path="res://scenes/quests/story_quests/champ/3_stealth/stealth_components/champ_incomplete_stealth_movement_hint.dialogue" id="28_fqjr6"]
5555
[ext_resource type="PackedScene" uid="uid://drew54gcfpekn" path="res://scenes/quests/story_quests/champ/3_stealth/stealth_components/champ_water_rock/champ_water_rock.tscn" id="29_rik0t"]
5656
[ext_resource type="Script" uid="uid://cbj0406q05dly" path="res://scenes/game_elements/props/hint/input_key/interact_input.gd" id="30_nyycj"]
57+
[ext_resource type="Texture2D" uid="uid://br1wan0y8n7xk" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_c.tres" id="31_8k5n0"]
58+
[ext_resource type="Texture2D" uid="uid://bb6we8crwtfua" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_f.tres" id="33_1n21b"]
5759
[ext_resource type="Resource" uid="uid://bmharix12w26t" path="res://scenes/quests/story_quests/champ/3_stealth/stealth_components/champ_blink.dialogue" id="34_g76pt"]
58-
[ext_resource type="Texture2D" uid="uid://djen1whwwin1w" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_f_outline.tres" id="37_yfmpo"]
59-
[ext_resource type="Texture2D" uid="uid://c63g4rx3fvw4o" path="res://assets/third_party/inputs/atlas_kenney_input_prompts_1.4/keyboard/keyboard_c_outline.tres" id="38_wbd51"]
6060
[ext_resource type="Texture2D" uid="uid://h606ovawbm0x" path="res://scenes/quests/story_quests/champ/3_stealth/stealth_components/BlinkMarker.png" id="44_onp74"]
6161
[ext_resource type="Script" uid="uid://hqdquinbimce" path="res://scenes/game_elements/props/teleporter/teleporter.gd" id="46_8k5n0"]
6262
[ext_resource type="Resource" uid="uid://cxjgjjb44ssnm" path="res://scenes/quests/story_quests/champ/3_stealth/stealth_components/champ_walking_on_water.dialogue" id="55_rosy4"]
@@ -1752,7 +1752,7 @@ layout_mode = 2
17521752

17531753
[node name="Interaction_hint" type="TextureRect" parent="ScreenOverlay/Hint/Blink_Hint" unique_id=207495647]
17541754
layout_mode = 2
1755-
texture = ExtResource("38_wbd51")
1755+
texture = ExtResource("31_8k5n0")
17561756
script = ExtResource("30_nyycj")
17571757
action_name = &"champ_blink"
17581758

@@ -1765,7 +1765,7 @@ layout_mode = 2
17651765

17661766
[node name="Water_hint" type="TextureRect" parent="ScreenOverlay/Hint/walking_on_water" unique_id=506122502]
17671767
layout_mode = 2
1768-
texture = ExtResource("37_yfmpo")
1768+
texture = ExtResource("33_1n21b")
17691769
script = ExtResource("30_nyycj")
17701770
action_name = &"champ_walk_on_water"
17711771

‎scenes/quests/story_quests/shjourney/0_IntroVideo/saltar_video.gd‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
extends VideoStreamPlayer
44

55
func _input(event):
6-
if event.is_action_pressed("ui_select"):
7-
get_tree().change_scene_to_file("res://scenes/quests/story_quests/shjourney/1_IntroAnimacion/SleepingBros.tscn")
6+
if event.is_action_pressed(&"interact"):
7+
SceneSwitcher.change_to_file(
8+
"res://scenes/quests/story_quests/shjourney/1_IntroAnimacion/SleepingBros.tscn"
9+
)

‎scenes/quests/story_quests/shjourney/1_IntroAnimacion/saltar_escena.gd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
extends AnimatedSprite2D
44

55
func _input(event):
6-
if event.is_action_pressed("ui_select"):
7-
get_tree().change_scene_to_file("res://scenes/quests/story_quests/shjourney/2_shjourney_intro/template_intro.tscn")
6+
if event.is_action_pressed("interact"):
7+
SceneSwitcher.change_to_file("res://scenes/quests/story_quests/shjourney/2_shjourney_intro/template_intro.tscn")

0 commit comments

Comments
 (0)