Version 4 update (#12)

* Multi key config (#11)

* various menu changes

* update ctrl_any_pressed

* use global control manager

* update readme

* fix get label for key config

* multi key config working

* added other controls to key config demo

* simplify handle_key_config_discovery

* update gird and nested menus

* fix menu step events

* fixed nested menus

* update build

* fix get_value

* add locked bindings, array_find

* renamed variables

* add way to cancel key config discovery mode

* minor fix

* update editor version

* add a way to remove bindings

* add reset all bindings

* control bindings can only be changed by the same control source

* add menu dividers

* add visual key prompts

* add gamepad icons

* added control icons to key config items

* update package and version number

Author: mstop4

current-scripts/Demos/useful-scripts/notes/info/info.txt

@@ -1 +1 @@
-Version: 3.1.1
+Version: 4.2.0

current-scripts/Demos/useful-scripts/notes/info/info.yy

@@ -3,27 +3,9 @@ var _x = x + cursor_padding;
 
 for (var i=view_area.x; i<=view_area.y; i++) {
 	var _item = items[| i];
-	var _type = _item.types[| ds_list_size(_item.types)-1];
-
 	var _y = y + (item_height + line_spacing) * (i - view_area.x);
 
-	switch (_type) {
-		case "item":
-		case "selectable":
-			draw_text(_x, _y, _item.label);
-			break;
-			
-		case "spinner":
-			draw_text(_x, _y, _item.get_full_label());
-			break;
-			
-		case "keyconfig":
-			draw_text(_x, _y, _item.get_full_label());
-			break;
-		
-		default:
-			draw_text(_x, _y, _item.label);
-	}
+	self.menu_base_draw_item(_item, _x, _y);
 }
 
 if (enabled) {

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Draw_0.gml

@@ -1,37 +1,66 @@
-if (keyboard_check_pressed(vk_anykey)) {
-	if (active_key_config != noone) {
-		self.handle_key_config_change(active_key_config);
-	}
-}
-
 if (!enabled) exit;
 
 control_state.poll_input();
 
+if (active_key_config != noone && discovery_mode == MENU_DISCOVERY_MODE.DISCOVERING) {
+	self.handle_key_config_discovery();
+	exit;
+}
+
 if (control_state.pressed_state[MENU_CONTROLS.UP]) {
-	pos = wrap(pos-1, 0, num_items);
-	self.column_menu_update_view();	
-	audio_play_sound(cursor_move_sfx, 1, false);
+	if (active_key_config == noone) {
+		var _cur_pos = pos;
+		var _item = -1;
+	
+		do {
+			pos = wrap(pos-1, 0, num_items);
+			_item = items[| pos];
+		} until ((is_struct(_item)
+			&& ds_list_find_index(_item.types, "divider") == -1)
+			|| _cur_pos == pos)
+		
+		self.column_menu_update_view();	
+		audio_play_sound(cursor_move_sfx, 1, false);
+	}
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.DOWN]) {
-	pos = wrap(pos+1, 0, num_items);
-	self.column_menu_update_view();	
-	audio_play_sound(cursor_move_sfx, 1, false);
+	if (active_key_config == noone) {
+		var _cur_pos = pos;
+		var _item = -1;
+	
+		do {
+			pos = wrap(pos+1, 0, num_items);
+			_item = items[| pos];
+		} until ((is_struct(_item)
+			&& ds_list_find_index(_item.types, "divider") == -1)
+			|| _cur_pos == pos)		
+		
+		self.column_menu_update_view();	
+		audio_play_sound(cursor_move_sfx, 1, false);
+	}
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.LEFT]) {
 	var _item = items[| pos];
 
 	if (ds_list_find_index(_item.types, "spinner") != -1)
 		self.handle_spinner_change(_item, -1);
+		
+	else if (ds_list_find_index(_item.types, "keyconfig") != -1
+		&& active_key_config == _item)
+		self.handle_key_config_select(_item, -1);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.RIGHT]) {
 	var _item = items[| pos];
 
 	if (ds_list_find_index(_item.types, "spinner") != -1)
 		self.handle_spinner_change(_item, 1);
+		
+	else if (ds_list_find_index(_item.types, "keyconfig") != -1
+		&& active_key_config == _item)
+		self.handle_key_config_select(_item, 1);
 }
 
 if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
@@ -44,5 +73,19 @@ if (control_state.pressed_state[MENU_CONTROLS.CONFIRM]) {
 		self.handle_selectable_confirm(_item);
 
 	else if (ds_list_find_index(_item.types, "keyconfig") != -1)
-		self.handle_key_config_change(_item);
+		self.handle_key_config_confirm(_item);
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.CANCEL]) {
+	var _item = items[| pos];	
+		
+	if (ds_list_find_index(_item.types, "keyconfig") != -1)
+		self.handle_key_config_cancel();
+}
+
+if (control_state.pressed_state[MENU_CONTROLS.DELETE_BINDING]) {
+	var _item = items[| pos];	
+		
+	if (ds_list_find_index(_item.types, "keyconfig") != -1)
+		self.handle_key_config_delete(_item);
 }

current-scripts/Demos/useful-scripts/objects/obj_column_menu/Step_1.gml

@@ -1,11 +1,18 @@
+my_player = inst_control_manager.get_player(0);
+
 menu = instance_create_layer(32, 64, layer, obj_column_menu);
 menu.column_menu_init({
+	player_controller: my_player,
 	font: fnt_demo,
 	view_height: 0,
 	cursor_spr: spr_arrow, 
 	cursor_move_sfx: snd_menu_move,
 	cursor_change_sfx: snd_menu_move,
 	cursor_confirm_sfx: -1,
+	use_control_icons: false,
+	keyboard_icons: [],
+	gamepad_icons: [],
+	control_icons_scale: 1,
 });
 
 menu.column_menu_add_selectable({ 

current-scripts/Demos/useful-scripts/objects/obj_column_menu/obj_column_menu.yy

@@ -0,0 +1,3 @@
+for (var i=0; i<num_players; i++) {
+	players[| i].clear_all_input();
+}

current-scripts/Demos/useful-scripts/objects/obj_column_menu_demo/Create_0.gml

@@ -16,42 +16,13 @@ control_prompts[CONTROLS.JUMP] = [5, 13, 20];
 control_prompts[CONTROLS.INTERACT] = [6, 14, 21];
 control_prompts[CONTROLS.ITEM] = [7, 15, 23];
 
-num_controls = CONTROLS.MAX;
+num_controls = 8;
 
-control_manager = instance_create_layer(0, 0, layer, obj_control_manager);
-var _player_index = control_manager.add_player();
-my_player = control_manager.get_player(_player_index);
-
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.UP, 0, vk_up);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.DOWN, 0, vk_down);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.LEFT, 0, vk_left);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.RIGHT, 0, vk_right);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.SHOOT, 0, ord("Z"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.JUMP, 0, ord("X"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.INTERACT, 0, ord("C"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.ITEM, 0, ord("V"));
-
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.UP, 1, ord("W"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.DOWN, 1, ord("S"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.LEFT, 1, ord("A"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.RIGHT, 1, ord("D"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.SHOOT, 1, ord("L"));
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.JUMP, 1, vk_semicolon);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.INTERACT, 1, vk_single_quote);
-my_player.set_binding(CONTROL_TYPE.KEYBOARD, CONTROL_SOURCE.KEYBOARD, CONTROLS.ITEM, 1, ord("P"));
-
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.UP, 0,  gp_padu);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.DOWN, 0,  gp_padd);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.LEFT, 0, gp_padl);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.RIGHT, 0, gp_padr);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.SHOOT, 0, gp_face3);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.JUMP, 0, gp_face1);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.INTERACT, 0, gp_face2);
-my_player.set_binding(CONTROL_TYPE.GAMEPAD, CONTROL_SOURCE.GAMEPAD, CONTROLS.ITEM, 0, gp_face4);
+my_player = inst_control_manager.get_player(0);
 
 num_controllers_connected = 0;
-current_gamepad_index = control_manager.is_on_steam_deck()
-	? control_manager.get_steam_deck_gamepad_index()
+current_gamepad_index = inst_control_manager.is_on_steam_deck()
+	? inst_control_manager.get_steam_deck_gamepad_index()
 	: 0;
 device_count = gamepad_get_device_count();
 

current-scripts/Demos/useful-scripts/objects/obj_column_menu_demo/obj_column_menu_demo.yy

@@ -0,0 +1,5 @@
+current_gamepad_index = inst_control_manager.is_on_steam_deck()
+	? inst_control_manager.get_steam_deck_gamepad_index()
+	: 0;
+	
+my_player.set_gamepad_slot(current_gamepad_index);

current-scripts/Demos/useful-scripts/objects/obj_control_manager/Other_5.gml

@@ -10,6 +10,7 @@ rooms = [
 	room_column_menu_demo,
 	room_grid_menu_demo,
 	room_nested_menu_demo,
+	room_key_config_menu_demo,
 	room_strings_demo,
 	room_web_demo,
 	room_system_info
@@ -28,19 +29,25 @@ room_names = [
 	"Column Menu",
 	"Grid Menu",
 	"Nested Menu",
+	"Control Config Menu",
 	"Strings",
 	"Web",
 	"System Info"
 ];
 
 menu = instance_create_layer(32, 64, layer, obj_column_menu);
 menu.column_menu_init({
+	player_controller: inst_control_manager.get_player(0),
 	font: fnt_demo,
 	view_height: 0,
 	cursor_spr: spr_arrow, 
 	cursor_move_sfx: snd_menu_move,
 	cursor_change_sfx: -1,
 	cursor_confirm_sfx: -1,
+	use_control_icons: false,
+	keyboard_icons: [],
+	gamepad_icons: [],
+	control_icons_scale: 1,
 });
 menu.line_spacing = 8;