"ui_" inputs added (:

project.godot

@@ -160,6 +160,90 @@ texture={
 
 [input]
 
+ui_accept={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_select={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_cancel={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_focus_next={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_focus_prev={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_left={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_right={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_page_up={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_page_down={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_home={
+"deadzone": 0.5,
+"events": [  ]
+}
+ui_end={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777224,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_yes={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":75,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":88,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_no={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":74,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":67,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_pause={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+ ]
+}
 up={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
@@ -210,15 +294,6 @@ action={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":67,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
-pause={
-"deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
- ]
-}
 screenshot={
 "deadzone": 0.5,
 "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777252,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
@@ -226,8 +301,7 @@ screenshot={
 }
 debug_refresh={
 "deadzone": 0.5,
-"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777255,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777235,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777235,"physical_scancode":0,"unicode":0,"echo":false,"script":null)
  ]
 }
 

src/autoload/Pause.gd

@@ -41,17 +41,17 @@ func _physics_process(delta):
 
 func _input(event):
 	if clock == 0 and Shared.is_in_game and !Wipe.is_wipe:
-		if event.is_action_pressed("pause"):
+		if event.is_action_pressed("ui_pause"):
 			toggle_pause()
 		if is_paused:
 			
-			if event.is_action_pressed("action"):
+			if event.is_action_pressed("ui_no"):
 				toggle_pause()
-			elif event.is_action_pressed("jump"):
+			elif event.is_action_pressed("ui_yes"):
 				select()
 			else:
-				var up = event.is_action_pressed("up")# or event.is_action_pressed("left")
-				var down = event.is_action_pressed("down")# or event.is_action_pressed("right")
+				var up = event.is_action_pressed("ui_up")# or event.is_action_pressed("left")
+				var down = event.is_action_pressed("ui_down")# or event.is_action_pressed("right")
 				if up or down:
 					set_cursor(cursor + (-1 if up else 1))
 					Audio.play("menu_scroll", 0.8, 1.2)

src/autoload/UI.tscn

@@ -335,7 +335,7 @@ custom_constants/separation = 3
 [node name="Key" parent="Center/Control/Top/P" instance=ExtResource( 7 )]
 margin_top = 2.0
 margin_bottom = 9.0
-action = "pause"
+action = "ui_pause"
 
 [node name="Desc" type="Label" parent="Center/Control/Top/P"]
 margin_left = 10.0

src/autoload/touch_screen.tscn

@@ -210,7 +210,7 @@ margin_bottom = 15.0
 [node name="Button" type="TouchScreenButton" parent="Control/HBoxTop/Pause/Control"]
 shape = SubResource( 5 )
 shape_centered = false
-action = "pause"
+action = "ui_pause"
 visibility_mode = 1
 
 [node name="Circle" type="Sprite" parent="Control/HBoxTop/Pause/Control"]

src/map/1-3.tscn

@@ -218,7 +218,7 @@ custom_constants/separation = 3
 [node name="Key" parent="Center/X" instance=ExtResource( 10 )]
 margin_right = 31.0
 rect_min_size = Vector2( 31, 7 )
-action = "pause"
+action = "ui_pause"
 text = "enter"
 
 [node name="Desc" type="Label" parent="Center/X"]

src/menu/Creator.gd

@@ -49,30 +49,30 @@ func _ready():
 func _input(event):
 	if !is_input or Wipe.is_wipe: return
 	
-	var btnx = btn.p("right") - btn.p("left")
-	var btny = btn.p("down") - btn.p("up")
-	var is_jump = event.is_action_pressed("jump")
-	var is_action = event.is_action_pressed("action")
+	var btnx = btn.p("ui_right") - btn.p("ui_left")
+	var btny = btn.p("ui_down") - btn.p("ui_up")
+	var is_yes = event.is_action_pressed("ui_yes")
+	var is_no = event.is_action_pressed("ui_no")
 	
 	if btny != 0:
 		if (cursor_y == 4 and btny == 1) or (cursor_y == 9 and btny == -1): cursor_x = 4
 		move_cursor(cursor_x, cursor_y + btny)
 	elif cursor_y == 0:
-		if is_jump:
+		if is_yes:
 			name_label.text = Shared.generate_username()
 			Audio.play("menu_random", 0.8, 1.2)
 			for i in 4:
 				set_color(i, randi() % 14)
 				fill_swatches(i)
-		elif is_action:
+		elif is_no:
 			is_input = false
 			Shared.wipe_scene(Shared.main_menu_path)
 			Audio.play("menu_scroll2", 0.8, 1.2)
 	elif cursor_y == clamp(cursor_y, 1, 4):
-		if btnx != 0 or is_jump or is_action:
+		if btnx != 0 or is_yes or is_no:
 			var c = btnx
 			if btnx == 0:
-				c = 1 if is_action else -1
+				c = 1 if is_no else -1
 			set_color(cursor_y - 1, colors[cursor_y - 1] + c)
 			fill_swatches()
 			Audio.play("menu_scroll3", 0.8, 1.2)
@@ -80,27 +80,27 @@ func _input(event):
 		if btnx != 0:
 			move_cursor(cursor_x + btnx)
 		# erase letter
-		if is_action:
+		if is_no:
 			var s = name_label.text
 			s.erase(s.length() - 1, 1)
 			name_label.text = s
 			Audio.play("menu_exit", 0.8, 1.2)
 		
 		# write letter
-		elif is_jump:
+		elif is_yes:
 			var s = rows[cursor_y][cursor_x].get_child(0).text
 			var l = name_label.text
 			name_label.text = (l + s).substr(0, 16)
 			Audio.play("menu_yes", 0.8, 1.2)
 	elif cursor_y == rows.size() - 1:
-		if is_jump:
+		if is_yes:
 			is_input = false
 			Shared.username = name_label.text.to_lower()
 			Shared.player_colors = colors.duplicate()
 			Shared.is_save = true
 			Shared.wipe_scene(Shared.level_select_path)
 			Audio.play("menu_bell", 0.8, 1.2)
-		elif is_action:
+		elif is_no:
 			Audio.play("menu_scroll2", 0.8, 1.2)
 
 func move_cursor(_x := cursor_x, _y = cursor_y):

src/menu/StartMenu.gd

@@ -77,7 +77,7 @@ func setup_slots():
 func _input(event):
 	if !is_input or Wipe.is_wipe or switch_clock > 0.0: return
 	
-	if event.is_action_pressed("action"):
+	if event.is_action_pressed("ui_no"):
 		if menu_items == open_items:
 			Player.set_palette(demo_player_mat, Shared.pick_player_colors())
 		var s = "main"
@@ -86,11 +86,11 @@ func _input(event):
 			open_items: s = "slot"
 			erase_items: s = "open"
 		switch_menu(s)
-	elif event.is_action_pressed("jump"):
+	elif event.is_action_pressed("ui_yes"):
 		menu_select()
 	else:
-		var up = event.is_action_pressed("up") or event.is_action_pressed("left")
-		var down = event.is_action_pressed("down") or event.is_action_pressed("right")
+		var up = event.is_action_pressed("ui_up")# or event.is_action_pressed("ui_left")
+		var down = event.is_action_pressed("ui_down")# or event.is_action_pressed("ui_right")
 		if up or down:
 			self.cursor += -1 if up else 1
 			Audio.play("menu_scroll", 0.8, 1.2)

src/menu/credits.gd

@@ -3,6 +3,6 @@ extends Node2D
 func _input(event):
 	if Wipe.is_wipe: return
 	
-	if event.is_action_pressed("action"):
+	if event.is_action_pressed("ui_no"):
 		Shared.wipe_scene(Shared.main_menu_path)
 		Audio.play("menu_back", 0.9, 1.1)

src/menu/options/Fullscreen.gd

@@ -14,7 +14,7 @@ func deselect():
 
 # HTML5 fullscreen fix
 func _input(event):
-	if is_selected and event.is_action_pressed("jump"):
+	if is_selected and event.is_action_pressed("ui_yes"):
 		var is_full = OS.window_fullscreen
 		OS.window_fullscreen = !is_full
 		Shared.set_window_scale()

src/menu/options/Key.gd

@@ -85,7 +85,6 @@ func set_action(arg := action):
 	
 	if action != "" and InputMap.has_action(action):
 		var l = InputMap.get_action_list(action)
-		print("l")
 		var e = null
 		
 		for i in l:

src/menu/options/KeyMenu.gd

@@ -17,7 +17,14 @@ export var keys_action := {
 "right": "right",
 "jump" : "jump",
 "action" : "lift",
-"pause": "menu",
+
+"ui_pause": "pause",
+"ui_up" : "menu up",
+"ui_down" : "menu down",
+"ui_left" : "menu left",
+"ui_right" : "menu right",
+"ui_yes" : "menu yes",
+"ui_no" : "menu no",
 }
 
 func _ready():
@@ -54,7 +61,7 @@ func _ready():
 func _input(event):
 	if !is_open or Wipe.is_wipe: return
 	
-	if event.is_action_pressed("action"):
+	if event.is_action_pressed("ui_no"):
 		open(false)
 		OptionsMenu.open(true)
 

src/menu/options/KeyMenu.tscn

@@ -24,10 +24,10 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 
 [node name="VBox" type="VBoxContainer" parent="Control"]
-margin_left = 51.0
-margin_top = 32.0
-margin_right = 178.0
-margin_bottom = 102.0
+margin_left = 48.0
+margin_top = 25.0
+margin_right = 175.0
+margin_bottom = 95.0
 
 [node name="Guide" type="HBoxContainer" parent="Control/VBox"]
 margin_right = 127.0

src/menu/options/OptionsMenu.gd

@@ -16,13 +16,13 @@ func _ready():
 func _input(event):
 	if !is_open or Wipe.is_wipe or input_clock > 0: return
 	
-	var up = event.is_action_pressed("up")
-	var down = event.is_action_pressed("down")
-	var left = event.is_action_pressed("left")
-	var right = event.is_action_pressed("right")
+	var up = event.is_action_pressed("ui_up")
+	var down = event.is_action_pressed("ui_down")
+	var left = event.is_action_pressed("ui_left")
+	var right = event.is_action_pressed("ui_right")
 	
-	var yes = event.is_action_pressed("jump")
-	var no = event.is_action_pressed("action")
+	var yes = event.is_action_pressed("ui_yes")
+	var no = event.is_action_pressed("ui_no")
 	
 	if up or down:
 		select_item(cursor + (-1 if up else 1))

src/menu/select.gd

@@ -100,24 +100,24 @@ func _input(event):
 	if !is_input or Wipe.is_wipe:
 		return
 	
-	if event.is_action_pressed("action"):
+	if event.is_action_pressed("ui_no"):
 		Shared.wipe_scene(Shared.main_menu_path)
 		is_input = false
 		Audio.play("menu_back", 0.9, 1.1)
-	elif event.is_action_pressed("jump"):
+	elif event.is_action_pressed("ui_yes"):
 		if open_map():
 			Audio.play("menu_pick", 0.9, 1.1)
 			is_input = false
 			is_load = false
 		else:
 			Audio.play("menu_random", 0.8, 1.2)
-	elif event.is_action_pressed("pause"):
+	elif event.is_action_pressed("ui_pause"):
 		show_score = posmod(show_score + 1, 3)
 		print("show_score: ", show_score)
 		show_scoreboard()
 	else:
-		var btnx = btn.p("right") - btn.p("left")
-		var btny = btn.p("down") - btn.p("up")
+		var btnx = btn.p("ui_right") - btn.p("ui_left")
+		var btny = btn.p("ui_down") - btn.p("ui_up")
 		if input_count == 0 and (btnx or btny):
 			input_count = input_wait
 			scroll(btnx + (btny * columns))