Skip to content

Commit

Permalink
2023_12_16
Browse files Browse the repository at this point in the history 
under fixing Ranking System
minor bug fixed
more effects/projectiles added on Custom User Map editor
Discord connection bug fixed
origin of sprite bug fixed
new Custom User Map guideline added
Etc.
  • Loading branch information
@ABER1047
ABER1047 committed Dec 15, 2023
1 parent cf0848c commit 1b048d4
Show file tree
Hide file tree
Showing 108 changed files with 1,260 additions and 838 deletions.
4 changes: 4 additions & 0 deletions Project Wak Beat.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
],
"ResourceOrderSettings": [
{"name":"spr_circle_cylinder","order":41,"path":"sprites/spr_circle_cylinder/spr_circle_cylinder.yy",},
{"name":"hitbox_set_map_speed","order":27,"path":"objects/hitbox_set_map_speed/hitbox_set_map_speed.yy",},
{"name":"tutorial_part4_timeline","order":7,"path":"timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy",},
{"name":"spr_circle_dot_outline","order":40,"path":"sprites/spr_circle_dot_outline/spr_circle_dot_outline.yy",},
{"name":"shader","order":1,"path":"shaders/shader/shader.yy",},
Expand Down Expand Up @@ -121,6 +122,7 @@
{"name":"hitbox_9","order":9,"path":"objects/hitbox_9/hitbox_9.yy",},
{"name":"yuha","order":22,"path":"sounds/yuha/yuha.yy",},
{"name":"roki","order":23,"path":"sounds/roki/roki.yy",},
{"name":"clean_guide_text","order":9,"path":"scripts/clean_guide_text/clean_guide_text.yy",},
{"name":"spr_end","order":4,"path":"sprites/spr_end/spr_end.yy",},
{"name":"spr_circle_outline","order":10,"path":"sprites/spr_circle_outline/spr_circle_outline.yy",},
{"name":"create_worm","order":7,"path":"scripts/create_worm/create_worm.yy",},
Expand Down Expand Up @@ -151,6 +153,7 @@
{"name":"Note3","order":2,"path":"notes/Note3/Note3.yy",},
{"name":"kick_sfx","order":7,"path":"sounds/kick_sfx/kick_sfx.yy",},
{"name":"spr_pipe","order":39,"path":"sprites/spr_pipe/spr_pipe.yy",},
{"name":"decode_nametag","order":14,"path":"scripts/decode_nametag/decode_nametag.yy",},
{"name":"ding_dong","order":2,"path":"sounds/ding_dong/ding_dong.yy",},
{"name":"jururu_hurt","order":5,"path":"sounds/jururu_hurt/jururu_hurt.yy",},
{"name":"alzar","order":15,"path":"sounds/alzar/alzar.yy",},
Expand Down Expand Up @@ -225,6 +228,7 @@
{"name":"hitbox_bg_color","order":22,"path":"objects/hitbox_bg_color/hitbox_bg_color.yy",},
{"name":"spr_seoul_univ","order":27,"path":"sprites/spr_seoul_univ/spr_seoul_univ.yy",},
{"name":"spr_heart","order":13,"path":"sprites/spr_heart/spr_heart.yy",},
{"name":"clean_message_log","order":8,"path":"scripts/clean_message_log/clean_message_log.yy",},
{"name":"spr_wakrio","order":12,"path":"sprites/spr_wakrio/spr_wakrio.yy",},
{"name":"spr_circle_bmw","order":17,"path":"sprites/spr_circle_bmw/spr_circle_bmw.yy",},
{"name":"spr_album_outline","order":2,"path":"sprites/spr_album_outline/spr_album_outline.yy",},
Expand Down
6 changes: 5 additions & 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 added imgs/Albums/11dc06bd-36c4-4797-a153-3c2c857789f8.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.
Binary file added imgs/Artifact_icon/triangle-outline-512.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.
8 changes: 6 additions & 2 deletions objects/code/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ else
}
global.exp_w_alpha = 1

global.real_stage_playtime[global.n_map_id] ++;




Expand All @@ -37,6 +37,8 @@ global.real_stage_playtime[global.n_map_id] ++;

if global.n_map_list != 2
{
global.real_stage_playtime[global.n_map_id] ++;

var converted_rank_to_num = convert_rank_to_num(target_rank)
var temp_score = ((converted_rank_to_num)*100+global.crossed_obstacle_num)*100+((global.dash_cross_bonus+global.dash_cross_bonus_maxhp)*global.crossed_obstacle_num)+((converted_rank_to_num >= 12) ? global.clear_bonus_score : 0)
if (global.t_selected_difficulty == 1)
Expand Down Expand Up @@ -152,7 +154,9 @@ global.result_score = temp_score
global.result_obstacle = global.crossed_obstacle_num



//랭킹에 점수 전송
global.total_score_normal = 0;
global.total_score_hardcore = 0;



Expand Down
19 changes: 15 additions & 4 deletions objects/code/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
// You can write your code in this editor
global.version_real = "6.2";
global.version = "Beta "+string(global.version_real);
global.beta_tester = 1
global.beta_tester = 1;
global.streamer = 0;
global.custom_mapper = 0;
surf_screen = -4;
music_title_alpha = 0
global.blackout_alpha = 0;
Expand Down Expand Up @@ -53,6 +55,9 @@ global.b_n_progress = 0;
global.tmp_str_map_data = "";
global.play_custom_map = 0

global.c_spr_center_origin_num = 0;
global.c_spr_top_origin_num = 0;

//닉네임 강제 초기화는 b_force_wipe_nickname 값을 수정하면 가능
b_force_wipe_nickname = 0

Expand Down Expand Up @@ -100,6 +105,8 @@ global.custom_proj_top_spr[0] = spr_circle_cylinder;
global.custom_proj_top_spr[1] = spr_spike_cylinder;
global.custom_proj_top_spr[2] = spr_square_cylinder;

custom_map_loading = 0;

////////////////////////////////////////////////
//show_debug_overlay(true)

Expand All @@ -112,14 +119,16 @@ ready = false;
discord_presence_update = 0
if (!np_initdiscord(DISCORD_APP_ID, true, np_steam_app_id_empty))
{
show_message_log("디스코드 연결 실패!");
//show_error("NekoPresence init fail.", true);
}



//전체 랭킹 리더보드
setup_gmscoreboard("a70d65f34511fece65808739de70d212");
setup_gmscoreboard("a70d65f34511fece65808739de70d212","134126fa6426e417e2b28e18f146f280");
automatic_reload_player_leaderboard = 0;
automatic_leaderboard_cancle = 0;
global.player_leaderboard_difficulty = 0
global.total_score_normal = 0;
global.total_score_hardcore = 0;
Expand Down Expand Up @@ -225,8 +234,10 @@ global.n_select_skin = 0
global.t_n_select_skin = 0
global.acquired_skin = -4



global.nametag_script_return0 = 0;
global.nametag_script_return1 = 0;
global.nametag_script_return2 = 0;
global.nametag_script_return3 = 0;


for(var i = 0; i < sprite_get_number(spr_illustrationCG); i++)
Expand Down
21 changes: 12 additions & 9 deletions objects/code/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,17 @@ if global.tutorial_now != 1 && global.show_rank = 0 && (is_string(global.map_col
draw_sprite_ext(spr_player,global.player_skin*7,xx+xx_w*0.29+global.converted_view_ratio*32+global.converted_view_ratio*(1433.6*max_player_pos),yy+global.converted_view_ratio*80,global.converted_view_ratio*0.5,global.converted_view_ratio*0.5,0,c_white,progress_alpha_sec*0.9)

//progress bar icon
if (global.low_graphics == false)
if (global.low_graphics == false && global.w_alpha < 1)
{
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1430*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1436*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*78*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*84*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
var tmp_ind = global.obtainable_type[global.n_map_id];
tmp_ind = (is_real(tmp_ind)) ? tmp_ind : 0;
draw_sprite_ext(spr_W,tmp_ind,xx+xx_w*0.3+progress_icon_alpha*1430*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,tmp_ind,xx+xx_w*0.3+progress_icon_alpha*1436*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,tmp_ind,xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*78*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)
draw_sprite_ext(spr_W,tmp_ind,xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*84*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha*0.15)

draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha)
}
draw_sprite_ext(spr_W,global.obtainable_type[global.n_map_id],xx+xx_w*0.3+progress_icon_alpha*1433*global.converted_view_ratio,yy+global.converted_view_ratio*81*progress_icon_alpha,0.13*global.converted_view_ratio,0.13*global.converted_view_ratio,0,c_white,progress_icon_alpha)
}


Expand Down Expand Up @@ -693,12 +696,12 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1

if (global.map_editor != 1 && global.rank_display_alpha > 0 && global.tutorial_played > 0 && ((instance_exists(obj_stage_clear) && obj_stage_clear.play_unlock_animation > 0) || !instance_exists(obj_stage_clear)))
{
var temp_col = merge_color(merge_color(c_white,#bf1a5c,global.rank_display_r_alpha),global.player_color,global.rank_display_b_alpha);
var temp_col = merge_color(merge_color((get_dis_color(global.background_color,c_white) < 7) ? c_black : c_white,#bf1a5c,global.rank_display_r_alpha),global.player_color,global.rank_display_b_alpha);
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_k_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*global.converted_view_ratio,font_size____*global.converted_view_ratio,0)
draw_text_k_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)

var temp_score = ((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)
draw_text_k_scale(xx+108*global.converted_view_ratio,yy+240*global.converted_view_ratio*font_size____,string(numbers_with_comma(temp_score)),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*global.converted_view_ratio,0.7*font_size____*global.converted_view_ratio,0)
draw_text_k_scale(xx+108*global.converted_view_ratio,yy+240*global.converted_view_ratio*font_size____,string(numbers_with_comma(temp_score)),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
11 changes: 11 additions & 0 deletions objects/code/KeyPress_18.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/// @description Insert description here
// You can write your code in this editor




for(var i = 0; i < 50; i++)
{
set_score("Unknown"+string(i), 1, 0);
set_score("Unknown"+string(i), 1, 1);
}
1 change: 1 addition & 0 deletions objects/code/Other_10.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ global.check_died = 0
global.tutorial_now = 0
global.timeline_stop = -1;
global.show_rank = 0;
custom_map_loading = 0;
global.random_seed = -4
global.map_editor = 0;
global.rewind = 0;
Expand Down
8 changes: 4 additions & 4 deletions objects/code/Other_15.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ for(var i = 0; i < 11; i++)
}
show_debug_message(temp_name);
var certain_text_code_inserted = string_pos("[*_ABER]",temp_name)
var certain_text_code_inserted = string_pos("3S4n92jfA",temp_name)
var add_nametag = "";
if (certain_text_code_inserted != 0)
{
var temp_real_name = string_replace(temp_name,"[*_ABER]","");
var temp_real_name = string_replace(temp_name,"3S4n92jfA","");
var temp_text_code = string_delete(temp_real_name,1,string_length(temp_real_name)-1);
show_debug_message("textcode : "+string(temp_text_code))
temp_real_name = string_delete(temp_real_name,string_length(temp_real_name),1);
Expand Down Expand Up @@ -92,10 +92,10 @@ for(var i = 0; i < 11; i++)
var temp_name = global.nickname;
show_debug_message(temp_name);
var add_nametag = "";
var certain_text_code_inserted = string_pos("[*_ABER]",temp_name)
var certain_text_code_inserted = string_pos("3S4n92jfA",temp_name)
if (certain_text_code_inserted != 0)
{
var temp_real_name = string_replace(temp_name,"[*_ABER]","");
var temp_real_name = string_replace(temp_name,"3S4n92jfA","");
var temp_text_code = string_delete(temp_real_name,1,string_length(temp_real_name)-1);
show_debug_message("textcode : "+string(temp_text_code))
temp_real_name = string_delete(temp_real_name,string_length(temp_real_name),1);
Expand Down
Loading

0 comments on commit 1b048d4

Please sign in to comment.