diff --git a/mini-game/scenes/decor/instructionsUI.gd b/mini-game/scenes/decor/instructionsUI.gd index 888d01c..ba301b2 100644 --- a/mini-game/scenes/decor/instructionsUI.gd +++ b/mini-game/scenes/decor/instructionsUI.gd @@ -1,9 +1,6 @@ extends Control - -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" +var jump_key = "dialogic_next" var jumped = false @@ -22,7 +19,7 @@ func _wait_for_jump(): hide() func _input(event): - if event.is_action_pressed("ui_accept"): + if event.is_action_pressed(jump_key): jumped = true # Called when the node enters the scene tree for the first time. diff --git a/mini-game/scenes/players/player1.tscn b/mini-game/scenes/players/player1.tscn index 7f7105c..2924149 100644 --- a/mini-game/scenes/players/player1.tscn +++ b/mini-game/scenes/players/player1.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://scripts/player1.gd" type="Script" id=1] +[ext_resource path="res://mini-game/scripts/player1.gd" type="Script" id=1] [node name="player1" type="Node2D"] script = ExtResource( 1 ) diff --git a/mini-game/scripts/player2.gd b/mini-game/scripts/player2.gd index 78e7d02..f32645f 100644 --- a/mini-game/scripts/player2.gd +++ b/mini-game/scripts/player2.gd @@ -19,6 +19,8 @@ enum { TIME } +var jump_key = "dialogic_next" + var player_enabled = false var game_mode = "score" @@ -53,7 +55,7 @@ func _physics_process(delta): func _input(event): - if player_enabled and state == RUN and event.is_action_pressed("ui_accept"): + if player_enabled and state == RUN and event.is_action_pressed(jump_key): state = JUMP diff --git a/scenes/UI.tscn b/scenes/UI.tscn index c7216a8..8b79451 100644 --- a/scenes/UI.tscn +++ b/scenes/UI.tscn @@ -52,6 +52,7 @@ margin_left = 1836.0 margin_right = 1900.0 margin_bottom = 64.0 focus_mode = 0 +mouse_default_cursor_shape = 2 enabled_focus_mode = 0 texture_normal = ExtResource( 1 ) diff --git a/scenes/typo/Button.tscn b/scenes/typo/Button.tscn index 19df09f..6a46662 100644 --- a/scenes/typo/Button.tscn +++ b/scenes/typo/Button.tscn @@ -56,6 +56,7 @@ margin_left = -1.33484 margin_top = -1.33484 margin_right = 113.665 margin_bottom = 50.6652 +mouse_default_cursor_shape = 2 custom_styles/hover = SubResource( 1 ) custom_styles/pressed = SubResource( 2 ) custom_styles/normal = SubResource( 3 )