2023_01_10

custom user map color bug fixed
etc.

Project Wak Beat.resource_order

@@ -16,7 +16,7 @@
     {"name":"UI&Camera","order":3,"path":"folders/스크립트/UI&Camera.yy",},
     {"name":"UserData_Load","order":1,"path":"folders/스크립트/UserData_Load.yy",},
     {"name":"hitbox_shapes","order":3,"path":"folders/스프라이트/hitbox_shapes.yy",},
-    {"name":"effects","order":54,"path":"folders/스프라이트/hitbox_shapes/effects.yy",},
+    {"name":"effects","order":56,"path":"folders/스프라이트/hitbox_shapes/effects.yy",},
     {"name":"ui","order":1,"path":"folders/스프라이트/ui.yy",},
     {"name":"시퀀스","order":10,"path":"folders/시퀀스.yy",},
     {"name":"애니메이션 곡선","order":11,"path":"folders/애니메이션 곡선.yy",},
@@ -136,6 +136,7 @@
     {"name":"spr_spuare_outline_full_mask","order":51,"path":"sprites/spr_spuare_outline_full_mask/spr_spuare_outline_full_mask.yy",},
     {"name":"hitbox_vaious_effects","order":28,"path":"objects/hitbox_vaious_effects/hitbox_vaious_effects.yy",},
     {"name":"spr_player_icon","order":11,"path":"sprites/spr_player_icon/spr_player_icon.yy",},
+    {"name":"spr_gamepad","order":54,"path":"sprites/spr_gamepad/spr_gamepad.yy",},
     {"name":"spr_beaker","order":53,"path":"sprites/spr_beaker/spr_beaker.yy",},
     {"name":"obj_player_left_hp_effect","order":8,"path":"objects/obj_player_left_hp_effect/obj_player_left_hp_effect.yy",},
     {"name":"reset_custom_map_info","order":9,"path":"scripts/reset_custom_map_info/reset_custom_map_info.yy",},
@@ -261,6 +262,7 @@
     {"name":"spr_square_laser","order":5,"path":"sprites/spr_square_laser/spr_square_laser.yy",},
     {"name":"hitbox_1","order":1,"path":"objects/hitbox_1/hitbox_1.yy",},
     {"name":"create_square_misile","order":4,"path":"scripts/create_square_misile/create_square_misile.yy",},
+    {"name":"spr_spuare_outline_bold","order":55,"path":"sprites/spr_spuare_outline_bold/spr_spuare_outline_bold.yy",},
     {"name":"spr_water","order":15,"path":"sprites/spr_water/spr_water.yy",},
     {"name":"get_fav_list_num","order":4,"path":"scripts/get_fav_list_num/get_fav_list_num.yy",},
     {"name":"result_sfx","order":14,"path":"sounds/result_sfx/result_sfx.yy",},
@@ -307,8 +309,8 @@
     {"name":"spr_alzar","order":25,"path":"sprites/spr_alzar/spr_alzar.yy",},
     {"name":"spr_square_cylinder","order":43,"path":"sprites/spr_square_cylinder/spr_square_cylinder.yy",},
     {"name":"shine_ef","order":15,"path":"sprites/shine_ef/shine_ef.yy",},
-    {"name":"camera_effect_blackout","order":20,"path":"sprites/camera_effect_blackout/camera_effect_blackout.yy",},
     {"name":"changing_hitbox_color","order":5,"path":"objects/changing_hitbox_color/changing_hitbox_color.yy",},
+    {"name":"spr_explosion","order":1,"path":"sprites/spr_explosion/spr_explosion.yy",},
     {"name":"get_dis_color","order":11,"path":"scripts/get_dis_color/get_dis_color.yy",},
     {"name":"apu","order":30,"path":"sounds/apu/apu.yy",},
     {"name":"sign_nonzero","order":15,"path":"scripts/sign_nonzero/sign_nonzero.yy",},

objects/code/Alarm_8.gml

@@ -1,6 +1,5 @@
 /// @description main menu bg
 // You can write your code in this editor
-
 global.background_color = merge_color_new(global.map_color,c_black,0.9)
 if (global.background_color == c_black)
 {

objects/code/Draw_73.gml

@@ -90,6 +90,10 @@ if (music_title_alpha > 0 && global.tutorial_played >= 0)
 	{
 		draw_text_k_scale(xx+xx_w-music_title_alpha*global.converted_view_ratio*128*font_size,yy+yy_h-global.converted_view_ratio*640*font_size,"Boss",64,-1,music_title_alpha,#bf1a5c,0,1,normal_font,font_size*global.font_ratio_resolution_xx*0.6,font_size*0.6,0)
 	}
+	else if (global.play_custom_map == 1)
+	{
+		draw_text_k_scale(xx+xx_w-music_title_alpha*global.converted_view_ratio*128*font_size,yy+yy_h-global.converted_view_ratio*640*font_size,"Custom User Map",64,-1,music_title_alpha,#bf1a5c,0,1,normal_font,font_size*global.font_ratio_resolution_xx*0.6,font_size*0.6,0)
+	}
 
 
 	draw_text_k_scale(xx+xx_w-music_title_alpha*global.converted_view_ratio*128*font_size,yy+yy_h-global.converted_view_ratio*608*font_size,global.n_music_title,64,-1,music_title_alpha*0.3,c_black,0,1,normal_font,font_size*2*global.font_ratio_resolution_xx,font_size*2,0)
@@ -574,10 +578,10 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
 		//스테이지 선택완료 - 난이도 선택창 (게임 시작)
 		if (global.can_change_music_list == 1 && global.show_new_songs <= 0 && global.t_b_alpha != -0.02 && global.sync_setting_alpha < 0.01 && global.title_menu_animation1 == -1 && global.level >= global.requirement_level[n_stage] && go_play)
 		{
-			if (global.real_stage_map_difficulty[global.n_map_id] == "Tutorial" || (string_pos("(Boss)", global.stage_map_difficulty[global.n_map_id]) != 0 && global.n_score[global.n_map_id] == "--"))
+			if (global.real_stage_map_difficulty[global.n_map_id] == "Tutorial" || (string_pos("(Boss)", global.stage_map_difficulty[global.n_map_id]) != 0 && global.n_score[global.n_map_id] == "--") || (global.play_custom_map == 1))
 			{
 				gamestart = 1;
-				window_set_cursor(cr_none)
+				window_set_cursor(cr_none);
 				global.t_selected_difficulty = 1;
 				audio_play_sound(ding_dong,0,false,global.master_volume*global.sfx_volume*2)
 				if (string_pos("(Boss)", global.stage_map_difficulty[global.n_map_id]) != 0 && global.n_score[global.n_map_id] == "--")
@@ -592,17 +596,25 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
 			else if (string_pos("(Hardcore)", global.stage_map_difficulty[global.n_map_id]) != 0)
 			{
 				gamestart = 1;
-				window_set_cursor(cr_none)
+				window_set_cursor(cr_none);
 				global.t_selected_difficulty = 0;
 				audio_play_sound(ding_dong,0,false,global.master_volume*global.sfx_volume*2)
 				global.boss_battle = 0;
 			}
+			else if (global.play_custom_map == 1)
+			{
+				gamestart = 1;
+				window_set_cursor(cr_none);
+				global.t_selected_difficulty = 1;
+				audio_play_sound(ding_dong,0,false,global.master_volume*global.sfx_volume*2)
+				global.boss_battle = 0;
+			}
 			else
 			{
-				gamestart = 1.1
-				window_set_cursor(cr_default)
-				global.selected_difficulty = 0.5
-				global.t_select_difficulty = 1
+				gamestart = 1.1;
+				window_set_cursor(cr_default);
+				global.selected_difficulty = 0.5;
+				global.t_select_difficulty = 1;
 				audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume)
 				global.boss_battle = 0;
 			}

objects/code/Other_10.gml

@@ -1,6 +1,9 @@
 /// @description Reset discord presence
 // You can write your code in this editor
-
+if (global.n_map_list != 2)
+{
+	load_musicList(global.n_map_list);
+}
 camera_focus_on(-4,-4,1)
 var tmp_str = "모든 곡";
 if (global.n_map_list == 1)
@@ -65,7 +68,7 @@ global.scroll_n_m_xx = -4
 global.joystick_xx = -4
 global.scroll_n_m_yy = -4
 global.joystick_yy = -4
-load_musicList(global.n_map_list);
+
 instance_destroy(hitbox_parents);
 
 

objects/code/Step_0.gml

@@ -32,7 +32,7 @@ if (global.notice_title == "" && global.show_new_songs <= 0 && string_length(glo
 
 //에디터 모드
 global.play_custom_map = (global.n_map_list == 2) ? 1 : 0;
-if (global.play_custom_map = 1)
+if (global.play_custom_map == 1)
 {
 	if ((global.show_progress_bar == 1 || global.map_editor == 1) && custom_map_loading >= 0)
 	{
@@ -402,7 +402,7 @@ if (global.show_progress_bar == 1 || global.tutorial_now == 1)
 						{
 							timeline_running = true
 						}
-						global.map_color = global.map_color_tmp;
+						global.map_color = (is_real(global.map_color_tmp)) ? global.map_color_tmp : hex_to_color(global.map_color_tmp,1);
 						timeline_speed = 1;
 
 						show_debug_message("timeline")

objects/code/Step_1.gml

@@ -63,7 +63,7 @@ if (instance_exists(obj_album_ui))
 {
 	if (get_dis_color(global.map_color,global.map_color_tmp) < 7)
 	{
-		global.map_color = global.map_color_tmp;
+		global.map_color = (is_real(global.map_color_tmp)) ? global.map_color_tmp : hex_to_color(global.map_color_tmp,1);
 	}
 	else
 	{
@@ -316,6 +316,29 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 &
 		global.unlocked_music_name_new_list_color[check_new_song] = c_gray;
 		check_new_song ++
 	}
+	else if (global.saved_notice_title == "온라인 모드")
+	{
+		global.unlocked_music_name_new_list[check_new_song] = "온라인 모드는 다른 유저들과 함께 스테이지를 클리어하는 '멀티플레이 모드' 입니다.";
+		global.unlocked_music_name_new_list_color[check_new_song] = c_white;
+		check_new_song ++
+
+		global.unlocked_music_name_new_list[check_new_song] = "현재는 사용할 수 없는 기능이며, 추후 추가되지 않을 수도 있습니다.";
+		global.unlocked_music_name_new_list_color[check_new_song] = #dc809a;
+		check_new_song ++
+
+		global.unlocked_music_name_new_list[check_new_song] = "";
+		global.unlocked_music_name_new_list_color[check_new_song] = c_white;
+		check_new_song ++
+
+		global.unlocked_music_name_new_list[check_new_song] = "";
+		global.unlocked_music_name_new_list_color[check_new_song] = c_white;
+		check_new_song ++
+
+		global.unlocked_music_name_new_list[check_new_song] = "(혹시 반응이 좋으면 추가될지도..?)";
+		global.unlocked_music_name_new_list_color[check_new_song] = c_gray;
+		check_new_song ++
+	}
+
 
 	for(var i = 0; i < check_new_song; i++)
 	{
@@ -394,7 +417,8 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
 	//메인매뉴 돌아가기
 	if (global.back_to_game > 90)
 	{
-		alarm[8] = 5
+		event_user(0);
+		alarm[8] = 5;
 		global.t_bg_color_alpha = 0
 		global.t_bg_color = 1
 		global.w_alpha = global.w_alpha < 1 ? 1 : global.w_alpha
@@ -423,7 +447,6 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
 		audio_stop_sound(global.n_music_instance)
 		timeline_running = false;
 		global.custom_map_timeline = false;
-		event_user(0)
 		instance_destroy(hitbox_parents)
 		instance_destroy(obj_savepoint)
 		instance_destroy(obj_savepoint)
@@ -449,7 +472,7 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
 			global.overtime_highlight_song = 0
 		}
 
-		alarm[8] = 5
+		alarm[8] = 5;
 	}
 
 
@@ -525,24 +548,29 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
 
 
 	// global.n_map_list setting
-	if gamestart = 0
+	if (gamestart == 0)
 	{
-		if global.n_map_list = 0
+		if (global.n_map_list == 0)
 		{
 			global.n_map_id = n_stage
 		}
-		else if global.n_map_list = 1
+		else if (global.n_map_list == 1)
 		{
 			global.n_map_id = global.fav_map_id[n_stage]
 		}
-		else if global.n_map_list = 2
+		else if (global.n_map_list == 2)
 		{
 			global.n_map_id = n_stage
 		}
 		else if (global.n_map_list == 3 || global.n_map_list == 4 || global.n_map_list == 5)
 		{
 			global.n_map_id = global.map_id_origin[n_stage]
 		}
+
+		if (global.n_map_id <= 0)
+		{
+			global.n_map_id = 0;
+		}
 
 
 		if keyboard_check_pressed(vk_anykey)

objects/map_edior_ui/Draw_73.gml

@@ -30,7 +30,7 @@ if (global.timeline_stop == 1)
 	var tmp_alpha_ = fix_to_zero(1-global.tiny_value_scrolling_now);
 	if (tmp_alpha_ > 0)
 	{
-		draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.35-global.mobile_mode*0.03),"- 단축키",fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
+		draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.3-global.mobile_mode*0.03),"- 단축키",fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
 		var plus_str = (custom_image_type != 2) ? "\n탄막 이미지 변경 [좌/우 방향키]" : "";
 		draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.4-global.mobile_mode*0.03),"눈금선 위로 고정 [Shift]\n세밀한 값 조절 [Shift+스크롤 바 좌클릭]\n배치된 탄막 선택/수정 [마우스 가운데 휠 버튼]\n선택된 탄막 삭제 [Delete]\n에디터 창 열기/닫기 [Space / Enter]\n현재 타임라인 삭제 [Ctrl + Del]\n전체 타임라인 삭제 [Alt + Del]\n직접 값 입력 [스크롤 바 옆 숫자 클릭]"+string(plus_str),fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
 
@@ -225,6 +225,85 @@ if (global.timeline_stop == 1 && scroll_y > -639)
 			//보정된 값으로 출력
 			var tmp_val = string(global.ed_arg[i])+string(global.ed_arg_tagname[i]);
 			var tmp_string = string(tmp_val);
+
+			//현재 설정값 문자열 표기
+			if (i == 6)
+			{
+				tmp_string = (tmp_val == 1) ? "활성화됨" : "비활성화됨";
+			}
+
+
+
+			if (global.ed_arg_name[i] == "효과 방향")
+			{
+				if (global.ed_arg[6] == 1)
+				{
+					if (global.ed_arg[i] == 0)
+					{
+						tmp_string = "효과 해제";
+					}
+					else if (global.ed_arg[i] == 1)
+					{
+						tmp_string = "좌우로만";
+					}
+					else if (global.ed_arg[i] == 2)
+					{
+						tmp_string = "상하로만";
+					}
+					else
+					{
+						tmp_string = "좌우상하";
+					}
+				}
+				else
+				{
+					if (global.ed_arg[i] == 0)
+					{
+						tmp_string = "효과 해제";
+					}
+					else if (global.ed_arg[i] == 1)
+					{
+						tmp_string = "중심";
+					}
+					else if (global.ed_arg[i] == 2)
+					{
+						tmp_string = "상단";
+					}
+					else if (global.ed_arg[i] == 3)
+					{
+						tmp_string = "우측";
+					}
+					else if (global.ed_arg[i] == 4)
+					{
+						tmp_string = "좌측";
+					}
+					else
+					{
+						tmp_string = "하단";
+					}
+				}
+			}
+			else if (global.ed_arg_name[i] == "설정된 효과 종류")
+			{
+				tmp_string = (global.ed_arg[i] == 1) ? "카메라 웨이브" : "블랙 아웃";
+			}
+			else if (global.ed_arg_name[i] == "화면 흔들림 방향")
+			{
+				if (global.ed_arg[i] == 0)
+				{
+					tmp_string = "좌우상하";
+				}
+				else if (global.ed_arg[i] == 1)
+				{
+					tmp_string = "좌우로만";
+				}
+				else
+				{
+					tmp_string = "상하로만";
+				}
+			}
+			/////////////////////////////////////////////////////////////////////////////
+
 			var tmp_alpha = 1;
 			with(obj_button)
 			{
@@ -265,7 +344,7 @@ if (global.timeline_stop == 1 && scroll_y > -639)
 				global.ed_arg[i] = modified_value;
 			}
 
-			if (mouse_check_button_released(mb_left) || keyboard_check_released(vk_enter))
+			if (i < 6 && (mouse_check_button_released(mb_left) || keyboard_check_released(vk_enter)))
 			{
 				if (abs(mouse_x-tmp_xx2) <= 52 && abs(mouse_y-tmp_yy2) <= 18)
 				{

objects/map_edior_ui/Step_0.gml

@@ -323,7 +323,7 @@ switch(global.editor_selected_type)
 		scroll_param_set(0,"크기",1,1024,2,100,"");
 		scroll_param_set(1,"각도",0,359,2,90,"deg");
 		scroll_param_set(2,"속력",24,640,2,0,"");
-		scroll_param_set(3,"생성된 탄막의 지속 시간 (60fps = 1초)",1,3600,2,0,"");
+		scroll_param_set(3,"생성된 탄막의 지속 시간 (60fps = 1초)",1,3600,2,0,"fps");
 
 		image_angle = global.ed_arg[1];
 		image_xscale = global.ed_arg[0];
@@ -391,7 +391,7 @@ switch(global.editor_selected_type)
 		scroll_param_set(0,"크기",1,1024,2,100,"");
 		scroll_param_set(1,"첫 발사 탄막 각도",0,359,2,0,"deg");
 		scroll_param_set(2,"속력",24,640,2,0,"");
-		scroll_param_set(3,"회전 방향",-50,50,2,10,"");
+		scroll_param_set(3,"회전 방향",-50,50,2,10,"deg");
 		scroll_param_set(4,"프레임당 탄막 생성 속도",1,720,2,0,"fps");
 		scroll_param_set(5,"지속 시간 (60fps = 1초)",1,3600,2,0,"");
 	break;
@@ -481,7 +481,7 @@ switch(global.editor_selected_type)
 			custom_image_type = 2;
 		}
 		image_alpha = 1;
-		scroll_param_set(0,"플래시 밝기",1,100,2,100,"px");
+		scroll_param_set(0,"플래시 밝기",1,100,2,100,"");
 	break;
 
 	case 22: //비효과
@@ -501,7 +501,7 @@ switch(global.editor_selected_type)
 			custom_image_type = 2;
 		}
 		image_alpha = 1;
-		scroll_param_set(0,"효과 방향",0,(global.ed_arg[6] == 1) ? 3 : 4,2,0,"");
+		scroll_param_set(0,"효과 방향",0,(global.ed_arg[6] == 1) ? 3 : 5,2,0,"");
 		scroll_param_set(6,"설정된 효과 종류",-1,1,2,0,"");
 	break;
 }

objects/map_edior_ui/Step_2.gml

@@ -26,6 +26,8 @@ if (keyboard_check_pressed(ord("W")))
 
 if (global.timeline_stop == 1)
 {
+	global.automatic_camera_movement = 0;
+	global.blackout_effect = 0;
 	global.camera_target_x = -4;
 	global.camera_target_y = -4;
 	global.master_remix_effect = 0;