Skip to content

Commit

Permalink
2023_12_24
Browse files Browse the repository at this point in the history 
rank bug fixed
optimizing
rank system code remake
minor bugs fixed
etc.
  • Loading branch information
@ABER1047
ABER1047 committed Dec 24, 2023
1 parent 6a7b3ae commit 7c3ba40
Show file tree
Hide file tree
Showing 33 changed files with 330 additions and 315 deletions.
1 change: 1 addition & 0 deletions Project Wak Beat.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
{"name":"tutorial_part1","order":4,"path":"sounds/tutorial_part1/tutorial_part1.yy",},
{"name":"spr_level_bar","order":13,"path":"sprites/spr_level_bar/spr_level_bar.yy",},
{"name":"isedolhyang","order":17,"path":"sounds/isedolhyang/isedolhyang.yy",},
{"name":"score_string_to_int","order":17,"path":"scripts/score_string_to_int/score_string_to_int.yy",},
{"name":"spr_hexagon_half","order":49,"path":"sprites/spr_hexagon_half/spr_hexagon_half.yy",},
{"name":"winter_spring","order":16,"path":"sounds/winter_spring/winter_spring.yy",},
{"name":"tutorial_part2","order":5,"path":"sounds/tutorial_part2/tutorial_part2.yy",},
Expand Down
1 change: 1 addition & 0 deletions Project Wak Beat.yyp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions objects/code/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ if (global.n_score_displaying > 0)
if (tmp_score > tmp_normal_score_to_int)
{
send_score = 1;
global.n_rank[global.n_map_id] = global.result_rank;
global.real_n_score[global.n_map_id] = tmp_score;
global.n_score = tmp_score;
}
Expand All @@ -52,15 +51,14 @@ if (global.n_score_displaying > 0)
if (tmp_score > tmp_hardcore_score_to_int)
{
send_score = 1;
global.n_rank_hardcore[global.n_map_id] = global.result_rank;
global.real_n_score_hardcore[global.n_map_id] = tmp_score;
global.n_score_hardcore = tmp_score;
}
}



if (global.real_n_rank[global.n_map_id] == "--" || global.artifact_owned[0] == 0)
if (global.artifact_owned[0] == 0)
{
global.obtainable_type[global.n_map_id] = "완료";
global.real_n_artifact[global.n_map_id] = "완료";
Expand All @@ -70,16 +68,13 @@ if (global.n_score_displaying > 0)
{
if (tmp_score > tmp_normal_score_to_int)
{
global.n_rank[global.n_map_id] = global.result_rank;
global.custom_n_score[global.n_map_id] = tmp_score;
global.n_score = tmp_score;
}


//커스텀 맵 클리어 내역 저장
ini_open(string(global.custom_map_file_dir[global.n_map_id])+"\\map_info.ini")
ini_write_string("custom_n_rank","value",global.n_rank[global.n_map_id])
ini_write_string("n_rank_hardcore","value",global.n_rank_hardcore[global.n_map_id])
ini_write_string("custom_n_score","value",tmp_normal_score_to_int)
ini_write_string("n_score_hardcore","value",tmp_hardcore_score_to_int)

Expand All @@ -104,7 +99,7 @@ if (global.n_score_displaying > 0)



save_and_load_data(0,false)
save_and_load_data(0,1)
alarm[6] = 20

event_user(4)
Expand Down
24 changes: 9 additions & 15 deletions objects/code/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,6 @@ automatic_reload_leaderboard = 0;
global.stage_map_audio_name[i] = -4;
global.stage_bpm[i] = -4;
global.stage_map_highlight_part[i] = -4
global.n_rank[i] = "--";
global.n_rank_hardcore[i] = "--";
global.n_score[i] = "--";
global.n_score_hardcore[i] = "--";
global.n_favorite[i] = -1;
Expand All @@ -344,8 +342,6 @@ automatic_reload_leaderboard = 0;
global.real_stage_map_audio_name[i] = -4;
global.real_stage_bpm[i] = -4;
global.real_stage_map_highlight_part[i] = -4
global.real_n_rank[i] = "--";
global.real_n_rank_hardcore[i] = "--";
global.real_n_score[i] = "--";
global.real_n_score_hardcore[i] = "--";
global.real_n_favorite[i] = -1;
Expand All @@ -368,8 +364,6 @@ automatic_reload_leaderboard = 0;
global.custom_stage_map_color[i] = -4;
global.custom_stage_bpm[i] = -4;
global.custom_stage_map_highlight_part[i] = -4;
global.custom_n_rank[i] = "--";
global.custom_n_rank_hardcore[i] = "--";
global.custom_n_score[i] = "--";
global.custom_n_score_hardcore[i] = "--";
global.custom_n_artifact[i] = "X";
Expand Down Expand Up @@ -891,10 +885,10 @@ global.unlocked_player_skin_require_type[1] = 0;
global.unlocked_player_skin_require_num[1] = global.max_artifact_owned[0]+3;
global.unlocked_player_skin_name[2] = "피해를 받았을 때 보너스 점수 +5000을 얻습니다"
global.unlocked_player_skin_require_type[2] = 0;
global.unlocked_player_skin_require_num[2] = "아무 곡이나 대쉬를 사용하지 않고 S랭크 이상으로 클리어 (튜토리얼 제외)";
global.unlocked_player_skin_require_num[2] = "아무 곡이나 대쉬를 사용하지 않고\nS랭크 이상으로 클리어 (튜토리얼 제외)";
global.unlocked_player_skin_name[3] = "대쉬로 피한 탄막 갯수만큼 보너스 점수 +50를 얻습니다"
global.unlocked_player_skin_require_type[3] = 0;
global.unlocked_player_skin_require_num[3] = "'왁굳향100% 첨가'곡을 A+랭크 이상으로 클리어";
global.unlocked_player_skin_require_num[3] = "'왁굳향100% 첨가'곡을\nA+랭크 이상으로 클리어";
global.unlocked_player_skin_name[4] = "최하 랭크가 A로 고정"
global.unlocked_player_skin_require_type[4] = 1;
global.unlocked_player_skin_require_num[4] = global.max_artifact_owned[1];
Expand All @@ -910,22 +904,22 @@ global.unlocked_player_skin_require_num[7] = global.max_artifact_owned[1]+2;
global.unlocked_player_skin_name[8] = "피해를 받은 후 무적 시간이 +0.5초 증가합니다"
global.unlocked_player_skin_require_type[8] = 2;
global.unlocked_player_skin_require_num[8] = global.max_artifact_owned[2];
global.unlocked_player_skin_name[9] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[9] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[9] = 2;
global.unlocked_player_skin_require_num[9] = global.max_artifact_owned[2];
global.unlocked_player_skin_name[10] = "S랭크 이상으로 클리어시 보너스 점수 5000점을 얻습니다"
global.unlocked_player_skin_require_type[10] = 2;
global.unlocked_player_skin_require_num[10] = global.max_artifact_owned[2];
global.unlocked_player_skin_name[11] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[11] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[11] = 2;
global.unlocked_player_skin_require_num[11] = "'로키 ROKI'곡을 A+랭크 이상으로 클리어"
global.unlocked_player_skin_require_num[11] = "'로키 ROKI'곡을\nA+랭크 이상으로 클리어"
global.unlocked_player_skin_name[12] = "첫 시작 때 추가 체력 +1을 얻고 시작합니다"
global.unlocked_player_skin_require_type[12] = 3;
global.unlocked_player_skin_require_num[12] = global.max_artifact_owned[3];
global.unlocked_player_skin_name[13] = "피해를 받은 후 무적 시간이 +0.5초 증가합니다"
global.unlocked_player_skin_require_type[13] = 3;
global.unlocked_player_skin_require_num[13] = global.max_artifact_owned[3];
global.unlocked_player_skin_name[14] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[14] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[14] = 3;
global.unlocked_player_skin_require_num[14] = global.max_artifact_owned[3];
global.unlocked_player_skin_name[15] = "피해를 받았을 때 보너스 점수 +5000을 얻습니다"
Expand All @@ -940,7 +934,7 @@ global.unlocked_player_skin_require_num[17] = global.max_artifact_owned[4];
global.unlocked_player_skin_name[18] = "피해를 받은 후 무적 시간이 +0.5초 증가합니다"
global.unlocked_player_skin_require_type[18] = 4;
global.unlocked_player_skin_require_num[18] = global.max_artifact_owned[4];
global.unlocked_player_skin_name[19] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[19] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[19] = 4;
global.unlocked_player_skin_require_num[19] = global.max_artifact_owned[4]+1;
global.unlocked_player_skin_name[20] = "첫 시작 때 추가 체력 +1을 얻고 시작합니다"
Expand All @@ -949,7 +943,7 @@ global.unlocked_player_skin_require_num[20] = global.max_artifact_owned[5];
global.unlocked_player_skin_name[21] = "20% 확률로 피해를 무시합니다"
global.unlocked_player_skin_require_type[21] = 5;
global.unlocked_player_skin_require_num[21] = global.max_artifact_owned[5];
global.unlocked_player_skin_name[22] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[22] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[22] = 5;
global.unlocked_player_skin_require_num[22] = global.max_artifact_owned[5];
global.unlocked_player_skin_name[23] = "최대 체력 상태일 때 대쉬로 피한 탄막 보너스 점수 +100을 얻습니다"
Expand All @@ -964,7 +958,7 @@ global.unlocked_player_skin_require_num[25] = global.max_artifact_owned[6];
global.unlocked_player_skin_name[26] = "최대 체력 상태일 때 대쉬로 피한 탄막 보너스 점수 +100을 얻습니다"
global.unlocked_player_skin_require_type[26] = 6;
global.unlocked_player_skin_require_num[26] = global.max_artifact_owned[6];
global.unlocked_player_skin_name[27] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +150을 얻습니다"
global.unlocked_player_skin_name[27] = "대쉬 사용 쿨타임이 0.5초 증가하는 대신 대쉬로 피한 탄막 보너스 점수 +200을 얻습니다"
global.unlocked_player_skin_require_type[27] = 6;
global.unlocked_player_skin_require_num[27] = global.max_artifact_owned[6]+1;

Expand Down
13 changes: 5 additions & 8 deletions objects/code/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ if (instance_exists(obj_player) && obj_player.image_xscale > 0)


//check point
draw_text_k_scale(xx+xx_w*0.5,yy+global.converted_view_ratio*(140+global.savepoint_text_alpha*32),string(global.checkpoint_text),64,-1,global.savepoint_text_alpha*0.8,c_white,0,0,normal_font,global.converted_view_ratio/2*(global.mobile_mode*0.5+1)*global.font_ratio_resolution_xx*font_size,global.converted_view_ratio/2*(global.mobile_mode*0.5+1)*font_size,0)
draw_text_k_scale(xx+xx_w*0.5,yy+global.converted_view_ratio*(140+global.savepoint_text_alpha*32),string(global.checkpoint_text),64,-1,global.savepoint_text_alpha*0.8,c_white,0,0,normal_font,(global.mobile_mode*0.5+1)*global.font_ratio_resolution_xx*font_size,(global.mobile_mode*0.5+1)*font_size,0)
}

if (music_title_alpha > 0 && global.tutorial_played >= 0)
Expand All @@ -98,10 +98,7 @@ if (music_title_alpha > 0 && global.tutorial_played >= 0)

//music credit
var col = global.map_color
if col = c_black
{
col = c_white
}
col = (get_dis_color(col,c_white) < 7) ? c_black : c_white;
draw_text_k_scale(xx+xx_w-music_title_alpha*global.converted_view_ratio*128*font_size,yy+yy_h-global.converted_view_ratio*350*font_size,"by",64*font_size,-1,music_title_alpha,col,0,1,light_font,font_size*0.7*global.font_ratio_resolution_xx,font_size*0.7,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*256*font_size,string(global.n_music_artist),64*font_size,-1,music_title_alpha,col,0,1,light_font,font_size*0.85*global.font_ratio_resolution_xx,font_size*0.85,0)

Expand Down Expand Up @@ -433,7 +430,7 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
}

var changed_music = 0
if gamestart = 0 && global.sync_setting_alpha < 0.01 && global.title_menu_animation1 == -1
if (gamestart = 0 && global.sync_setting_alpha < 0.01 && global.title_menu_animation1 == -1 && global.can_change_music_list == 1)
{
if global.mobile_mode = 0
{
Expand Down Expand Up @@ -575,7 +572,7 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
}

//스테이지 선택완료 - 난이도 선택창 (게임 시작)
if (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.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] == "--"))
{
Expand Down Expand Up @@ -704,7 +701,7 @@ if (global.map_editor != 1 && global.rank_display_alpha > 0 && global.tutorial_p
var font_size____ = 0.5*(1+global.mobile_mode*0.3)*(1+(global.rank_display_r_alpha+global.rank_display_b_alpha)*0.5)
draw_text_kl_scale(xx+108*global.converted_view_ratio,yy+32*global.converted_view_ratio,"현재 랭크\n"+string(global.n_rank_display),70,-1,global.rank_display_alpha,temp_col,0,0,normal_font,font_size____*global.font_ratio_resolution_xx,font_size____,0)

global.n_score_displaying = fix_to_zero(((convert_rank_to_num(global.n_rank_display))*100+global.crossed_obstacle_num)*100+((global.dash_cross_bonus+global.dash_cross_bonus_maxhp)*global.crossed_obstacle_num)-global.total_death_point*5000)

draw_text_kl_scale(xx+108*global.converted_view_ratio,yy+240*global.converted_view_ratio*font_size____,string(numbers_with_comma(global.n_score_displaying)),70,-1,global.rank_display_alpha,merge_color(temp_col,c_black,0.3),0,0,normal_font,0.7*font_size____*global.font_ratio_resolution_xx,0.7*font_size____,0)
}

Expand Down
4 changes: 0 additions & 4 deletions objects/code/KeyPress_114.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ if global.dev_mode = 1
//곡 정보
for(var i = 0; i < global.total_map; i++)
{
global.n_rank[i] = "--";
global.n_rank_hardcore[i] = "--";
global.real_n_rank[i] = "--";
global.real_n_rank_hardcore[i] = "--";
global.n_artifact[i] = "X";
global.real_n_artifact[i] = "X";
global.n_score[i] = "--";
Expand Down
4 changes: 2 additions & 2 deletions objects/code/KeyPress_116.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if (global.dev_mode == 1)
var temp_highscore = (global.t_selected_difficulty == 1) ? global.real_n_score[global.n_map_id] : global.real_n_score_hardcore[global.n_map_id];
global.unlocked_music_name_new_list[check_new_song] = "Rank";
global.unlocked_music_name_new_list_color[check_new_song] = #ff1f77;
global.unlocked_music_name_new_list_rightside[check_new_song] = string(global.result_rank);
global.unlocked_music_name_new_list_rightside[check_new_song] = string(convert_score_to_rank(global.result_score,0));
global.unlocked_music_name_new_list_color_rightside[check_new_song] = c_white
check_new_song++;

Expand All @@ -26,7 +26,7 @@ if (global.dev_mode == 1)
check_new_song++;


global.unlocked_music_name_new_list[check_new_song] = "[랭크("+string(global.result_rank)+") + 대쉬로 피한 탄막(x"+string(global.result_obstacle)+") + 게임 오버 횟수 (x"+string(global.total_death_point)+") + 에 의한 점수]";
global.unlocked_music_name_new_list[check_new_song] = "[데미지 받은 횟수(x"+string(global.total_damaged)+"), 대쉬로 피한 탄막(x"+string(global.result_obstacle)+"), 게임 오버 횟수 (x"+string(global.total_death_point)+") 에 의한 점수]";
global.unlocked_music_name_new_list_color[check_new_song] = merge_color(c_white,c_black,0.2);
check_new_song++;

Expand Down
1 change: 1 addition & 0 deletions objects/code/KeyPress_45.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ if (global.map_editor != 1)
global.level = 999;
global.default_directory = working_directory;
global.custom_map_directory = string(global.default_directory)+"\\Custom map files\\";
save_and_load_data(1,1);
}
}
2 changes: 1 addition & 1 deletion objects/code/Other_11.gml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// @description n_map_list setting
// You can write your code in this editor

if (global.title_menu_animation1 == -1)
if (global.title_menu_animation1 == -1 && global.can_change_music_list == 1)
{
global.reload_n_map_list_value = 0
if keyboard_check_pressed(vk_left)
Expand Down
9 changes: 7 additions & 2 deletions objects/code/Other_18.gml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/// @description Reset all of map info
/// @description 맵 정보 초기화 (일반 사망)
// You can write your code in this editor
global.t_b_alpha = -0.01
global.t_w_alpha = 0
Expand All @@ -15,6 +15,12 @@ global.gomem_mashup_effect = 0
global.run_shake_effect = 0;
global.blackout_effect = 0;
global.turisumo_effect_3 = 0
global.t_shake_x = 0;
global.shake_x = 0;
global.real_shake_x = 0;
global.t_shake_y = 0;
global.real_shake_y = 0;
global.shake_y = 0;
turisumo_bpm_timer = 0
turisumo_road_sign_delay = 0
global.ipad_random_xx = -4
Expand Down Expand Up @@ -89,4 +95,3 @@ global.minimum_rank = check_player_skin(4)*6; //단위 rank
global.addition_invinc_time = check_player_skin(8)*60+check_player_skin(13)*60+check_player_skin(18)*60+check_player_skin(24)*60; //단위 frame
global.clear_bonus_score = check_player_skin(10)*5000+check_player_skin(25)*5000; //단위 score
global.damaged_bonus_score = check_player_skin(2)*5000+check_player_skin(15)*5000;
global.total_death_point = 0;
28 changes: 28 additions & 0 deletions objects/code/Other_22.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/// @description 맵 정보 초기화 (리와인드)
// You can write your code in this editor

global.dashed = 0;
global.start_point = 0;
global.restart_stage = 0;
global.respawn_point_xx = room_width*0.5;
global.respawn_point_yy = room_height*0.5;
global.total_died_here = 0;
global.total_damaged = 0;
global.crossed_obstacle_num = 0;
global.total_death_point = 0;
global.check_died = 0;
global.n_progress = 0;


obj_camera.v_x = obj_camera.tv_x;
obj_camera.v_y = obj_camera.tv_y;


if (global.play_custom_map == 1)
{
global.map_color = global.custom_stage_map_color[global.n_map_id];
}
else
{
global.map_color = global.stage_map_color[global.n_map_id];
}
2 changes: 1 addition & 1 deletion objects/code/Other_62.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ for(var i = 0; i < 2; i++)

if !ds_list_empty(global.gmscoreboard_scores[i])
{
var tmp_list = ds_list_find_value(global.gmscoreboard_scores[global.player_leaderboard_difficulty], ds_list_size(global.gmscoreboard_scores[i])-1);
var tmp_list = ds_list_find_value(global.gmscoreboard_scores[i], ds_list_size(global.gmscoreboard_scores[i])-1);
var temp_score = tmp_list[? "score"];
if (temp_score == "" || temp_score == " " || temp_score == "0" || temp_score == "1" || temp_score == 1 || temp_score == 0)
{
Expand Down
Loading

0 comments on commit 7c3ba40

Please sign in to comment.