Skip to content

Commit

Permalink
2024_01_27
Browse files Browse the repository at this point in the history 
ranking system changed
minor bugs fixed
etc.
  • Loading branch information
@ABER1047
ABER1047 committed Jan 26, 2024
1 parent 4de03a2 commit b6808fe
Show file tree
Hide file tree
Showing 23 changed files with 77 additions and 155 deletions.
2 changes: 1 addition & 1 deletion Project Wak Beat.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
{"name":"spr_status","order":5,"path":"sprites/spr_status/spr_status.yy",},
{"name":"Sprite49","order":12,"path":"sprites/Sprite49/Sprite49.yy",},
{"name":"string_digit_with_minus","order":19,"path":"scripts/string_digit_with_minus/string_digit_with_minus.yy",},
{"name":"kinmoku","order":24,"path":"sounds/kinmoku/kinmoku.yy",},
{"name":"fire_again","order":24,"path":"sounds/fire_again/fire_again.yy",},
{"name":"jing_hurt","order":6,"path":"sounds/jing_hurt/jing_hurt.yy",},
{"name":"roki_timeline","order":22,"path":"timelines/roki_timeline/roki_timeline.yy",},
{"name":"favorite_sfx","order":6,"path":"sounds/favorite_sfx/favorite_sfx.yy",},
Expand Down
2 changes: 1 addition & 1 deletion Project Wak Beat.yyp
View file

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

Binary file modified imgs/Albums/album14.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 15 additions & 1 deletion objects/code/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,23 @@ if (global.n_score_displaying > 0)
global.result_obstacle = global.crossed_obstacle_num

//온라인 랭킹 점수 등록
global.total_score_normal = 0;
global.total_score_hardcore = 0;
if (send_score == 1 && global.nickname != "")
{
set_score(global.nickname, global.result_score, global.t_selected_difficulty);
for(var i = 0; i < global.origin_total_map; i++)
{
if (string_pos("(Hardcore)", global.real_stage_map_name[i]) == 0)
{
global.total_score_normal += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0;
}
global.total_score_hardcore += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0;
}


set_score(global.nickname, global.total_score_normal+global.total_score_hardcore, 0);
get_scores(5,0);
show_debug_message("점수 전송 - ("+string(global.nickname)+")");
}


Expand Down
12 changes: 6 additions & 6 deletions objects/code/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,14 +624,14 @@ global.roki_effect1 = 0


//금목서
global.real_stage_map_name[13] = "금목서 Kinmokusei (Cover by 비챤 VIichan)";
global.real_stage_map_artist[13] = "Original by Kujira";
global.real_stage_map_name[13] = "Fire Again (Cover by 비챤 VIichan)";
global.real_stage_map_artist[13] = "Original by Ashnikko, Grabbitz";
global.real_stage_map_difficulty[13] = "Hard";
global.real_stage_map_color[13] = #f2aca0;
global.real_stage_map_color[13] = c_black;
global.real_stage_map_duration[13] = 6474;
global.real_stage_map_audio_name[13] = "kinmoku";
global.real_stage_bpm[13] = 123;
global.real_stage_map_highlight_part[13] = 58.4;
global.real_stage_map_audio_name[13] = "fire_again";
global.real_stage_bpm[13] = 99;
global.real_stage_map_highlight_part[13] = 180;
global.real_detailed_difficulty[13] = 3;
global.real_obtainable_type[13] = 99;
global.real_requirement_level[13] = 9999;
Expand Down
4 changes: 2 additions & 2 deletions objects/code/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ if (global.select_map != 0 && instance_exists(obj_player) && abs(obj_player.imag
}

//title
if selected_me = 0
if (selected_me == 0)
{
if locked_now = 0 && dis_alpha > 0.1
if locked_now == 0 && dis_alpha > 0.1
{
var tmp_score_n = (is_real(global.n_score[i])) ? global.n_score[i] : 0;
var tmp_score_hc = (is_real(global.n_score_hardcore[i])) ? global.n_score_hardcore[i] : 0;
Expand Down
2 changes: 1 addition & 1 deletion objects/code/Other_19.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ var temp_real_name = global.nametag_script_return0;
var temp_text_code = global.nametag_script_return1;
var text_code_col = global.nametag_script_return2;
var add_nametag = global.nametag_script_return3;
var temp_score = (global.player_leaderboard_difficulty == 0) ? global.total_score_normal : global.total_score_hardcore;
var temp_score = global.total_score_normal+global.total_score_hardcore;
global.unlocked_music_name_new_list[7] = "___";
global.unlocked_music_name_new_list[8] = "[현재 내 순위 - "+string(my_ranking_num);
global.unlocked_music_name_new_list_color[8] = $FF56D2FF;
Expand Down
39 changes: 13 additions & 26 deletions objects/code/Step_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,8 @@ if (automatic_reload_player_leaderboard > 0)
show_message_log("온라인 서버 연결 중...");

show_debug_message("showing 명예의 전당 now")
var temp_difficulty_str = (global.player_leaderboard_difficulty != 0) ? "하드코어" : "노말";
global.notice_title = "명예의 전당 - "+string(temp_difficulty_str)+" 부문";
global.notice_title_sub = "< (모든 곡의 "+string(temp_difficulty_str)+"난이도 스코어 총합 기준) >";
global.notice_title = "명예의 전당";
global.notice_title_sub = "< (모든 곡의 모든 난이도 스코어 총합 기준) >";
global.show_new_songs = 1
}
automatic_reload_player_leaderboard++;
Expand All @@ -191,33 +190,21 @@ if (automatic_reload_player_leaderboard > 0)

if (automatic_reload_player_leaderboard == 3 && global.nickname != "")
{
var tmp_total_score = 0;
global.total_score_normal = 0;
global.total_score_hardcore = 0;
for(var i = 0; i < global.origin_total_map; i++)
{
if (global.player_leaderboard_difficulty == 0)
if (string_pos("(Hardcore)", global.real_stage_map_name[i]) == 0)
{
tmp_total_score += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0;
}
else
{
tmp_total_score += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0;
global.total_score_normal += (global.real_n_score[i] != "--") ? real(global.real_n_score[i]) : 0;
}
global.total_score_hardcore += (global.real_n_score_hardcore[i] != "--") ? real(global.real_n_score_hardcore[i]) : 0;
}

if (global.player_leaderboard_difficulty == 0)
{
set_score(global.nickname, (tmp_total_score < 1) ? 1 : tmp_total_score, 0);
get_scores(5,0);
show_debug_message("점수 전송 - "+string(tmp_total_score)+" ("+string(global.nickname)+")");
global.total_score_normal = tmp_total_score;
}
else
{
set_score(global.nickname, (tmp_total_score < 1) ? 1 : tmp_total_score, 1);
get_scores(5,1);
show_debug_message("점수 전송 - "+string(tmp_total_score)+" ("+string(global.nickname)+")");
global.total_score_hardcore = tmp_total_score;
}

set_score(global.nickname, global.total_score_normal+global.total_score_hardcore, 0);
get_scores(5,0);
show_debug_message("점수 전송 - ("+string(global.nickname)+")");
}


Expand Down Expand Up @@ -371,10 +358,10 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 &
check_new_song ++;


global.unlocked_music_name_new_list[check_new_song] = "대쉬 무적 판정 시간 관련 버그 수정";
global.unlocked_music_name_new_list[check_new_song] = "개발 예정 곡 변경 (Kinmokusei 금목서 -> Fire Again)";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "모바일 닉네임 입력 관련 일부 사항 수정";
global.unlocked_music_name_new_list[check_new_song] = "명예의 전당 랭크 시스템 변경 (각 난이도별 점수 -> 모든 난이도 점수 합산)";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 탄막 이미지 변경 메시지 관련 일부 사항 수정";
Expand Down
118 changes: 23 additions & 95 deletions objects/obj_album_ui/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -850,22 +850,13 @@ if (global.show_title_menu == 0)


var can_show_top_ten, tmp_target_score, tmp_val2, tmp_str2;
if (global.player_leaderboard_difficulty != 0)
{
can_show_top_ten = (global.top_ten_score_hardcore != -4) ? 1 : 0;
tmp_target_score = (global.n_score_hardcore[tmp_n_map_id] == "--") ? 0 : global.n_score_hardcore[tmp_n_map_id];
tmp_val2 = tmp_target_score/global.top_ten_score_hardcore;
tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2;
tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_hardcore - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!";
}
else
{
can_show_top_ten = (global.top_ten_score_normal != -4) ? 1 : 0;
tmp_target_score = (global.n_score[tmp_n_map_id] == "--") ? 0 : global.n_score[tmp_n_map_id];
tmp_val2 = tmp_target_score/global.top_ten_score_normal;
tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2;
tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_normal - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!";
}
can_show_top_ten = (global.top_ten_score_normal != -4) ? 1 : 0;
tmp_target_score = global.total_score_hardcore+global.total_score_normal;
tmp_val2 = tmp_target_score/global.top_ten_score_normal;
tmp_val2 = (tmp_val2 > 1) ? 1 : tmp_val2;
tmp_str2 = (tmp_val2 != 1) ? "명예의 전당 Top5까지 앞으로 "+string(numbers_with_comma(global.top_ten_score_normal - tmp_target_score))+"점!" : "명예의 전당 Top5 달성!";



if (can_show_top_ten == 1)
{
Expand Down Expand Up @@ -906,80 +897,17 @@ if (global.show_title_menu == 0)
}
}

if (global.notice_title == "Ranking")
{
global.new_unlocked_map_num = 11;
if (code.automatic_reload_leaderboard == 0)
{
if (keyboard_check_pressed(vk_left) || keyboard_check_pressed(vk_up))
{
global.t_selected_difficulty--;
global.b_loaded_ranking = -1;
audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume)

code.automatic_reload_leaderboard = 1
}
else if (keyboard_check_pressed(vk_right) || keyboard_check_pressed(vk_down))
{
global.t_selected_difficulty++;
global.b_loaded_ranking = -1;
audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume)


code.automatic_reload_leaderboard = 1
}
else if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left)))
{
global.t_b_alpha = -0.02
code.gamestart = 5
alarm[4] = 15
}
}
else
{
var tmp_alpha = (code.automatic_reload_leaderboard/30 > 1) ? 1 : code.automatic_reload_leaderboard/30;
draw_sprite_ext(spr_loading,0,middle_xx,yy+yy_h*0.52,global.font_ratio_resolution_xx,1,-5*code.automatic_reload_leaderboard,c_white,tmp_alpha)
}


if global.t_selected_difficulty > 1
{
global.t_selected_difficulty = 0
}
else if global.t_selected_difficulty < 0
{
global.t_selected_difficulty = 1
}

if (tmp_n_map_id >= 0 && string_pos("(Hardcore)", global.stage_map_difficulty[tmp_n_map_id]) != 0)
{
global.t_selected_difficulty = 0
}
}
else if (global.notice_title == "명예의 전당")
if (string_last_pos("명예의 전당",global.notice_title) != 0)
{
if (code.automatic_reload_player_leaderboard == 0)
{
if (keyboard_check_pressed(vk_left) || keyboard_check_pressed(vk_up))
{
global.player_leaderboard_difficulty--
audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume)

code.automatic_reload_player_leaderboard = 1;
}
else if (keyboard_check_pressed(vk_right) || keyboard_check_pressed(vk_down))
{
global.player_leaderboard_difficulty++
audio_play_sound(common_sfx1,0,false,0.2*global.master_volume*global.sfx_volume)


code.automatic_reload_player_leaderboard = 1;
}
else if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left)))
global.player_leaderboard_difficulty = 0;
if (global.b_alpha >= 0.85 && (keyboard_check_pressed(vk_anykey) || mouse_check_button_pressed(mb_left)))
{
global.t_b_alpha = -0.02
code.gamestart = 5
alarm[4] = 15
global.t_b_alpha = -0.02;
code.gamestart = 5;
alarm[4] = 15;
}
}
else
Expand All @@ -991,11 +919,11 @@ if (global.show_title_menu == 0)

if global.player_leaderboard_difficulty > 1
{
global.player_leaderboard_difficulty = 0
global.player_leaderboard_difficulty = 0;
}
else if global.player_leaderboard_difficulty < 0
{
global.player_leaderboard_difficulty = 1
global.player_leaderboard_difficulty = 1;
}
}
else if (global.notice_title == "게임을 시작하기 전...")
Expand Down Expand Up @@ -1027,7 +955,7 @@ if (global.show_title_menu == 0)

if (keyboard_check_released(vk_space))
{
holding_now = 0
holding_now = 0;
}
}

Expand All @@ -1043,7 +971,7 @@ if (global.show_title_menu == 0)

if (string_length(global.nickname) <= 15)
{
global.nickname = string_replace_all(global.nickname," ","")
global.nickname = string_replace_all(global.nickname," ","");
}
else
{
Expand All @@ -1052,8 +980,8 @@ if (global.show_title_menu == 0)

if (global.mobile_mode == 1 && (keyboard_string == "\n" || keyboard_string == "\r"))
{
keyboard_input_display = 999
keyboard_virtual_hide()
keyboard_input_display = 999;
keyboard_virtual_hide();
}

keyboard_string = "";
Expand All @@ -1073,7 +1001,7 @@ if (global.show_title_menu == 0)
}


if holding_now > 90
if (holding_now > 90)
{
global.nickname = string_replace_all(global.nickname," ","")
global.t_b_alpha = -0.02
Expand Down Expand Up @@ -1104,9 +1032,9 @@ if (global.show_title_menu == 0)
}
else
{
global.t_b_alpha = -0.02
code.gamestart = 5
alarm[4] = 15
global.t_b_alpha = -0.02;
code.gamestart = 5;
alarm[4] = 15;
}
}

Expand Down
9 changes: 1 addition & 8 deletions scripts/convert_score_to_rank/convert_score_to_rank.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ function convert_score_to_rank(argument0,argument1)
var tmp_score = real(argument0)/10000;
if (argument1 == 1)
{
if (global.player_leaderboard_difficulty == 0)
{
tmp_score /= (global.both_difficulty_num);
}
else
{
tmp_score /= (global.both_difficulty_num+global.hardcore_only_num);
}
tmp_score /= (global.both_difficulty_num*2+global.hardcore_only_num);
}

if (tmp_score >= 15)
Expand Down
Binary file added sounds/fire_again/fire_again.mp3
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions sounds/kinmoku/kinmoku.yy → sounds/fire_again/fire_again.yy
View file

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

Binary file removed sounds/kinmoku/kinmoku.wav
View file
Binary file not shown.
Binary file removed sprites/Sprite86/2efb0cf5-f2a9-4989-92db-481609ea6694.png
View file
Binary file not shown.
Loading

0 comments on commit b6808fe

Please sign in to comment.