Skip to content

Commit

Permalink
2023_12_22
Browse files Browse the repository at this point in the history 
minor bugs fixed
new functions added on custom map edior
description about projectiles added on custom map editor
optimizing
new song list added
major bugs fixed
etc.
  • Loading branch information
@ABER1047
ABER1047 committed Dec 22, 2023
1 parent b145f03 commit 7e86b34
Show file tree
Hide file tree
Showing 44 changed files with 644 additions and 210 deletions.
7 changes: 5 additions & 2 deletions Project Wak Beat.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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":2,"path":"folders/스프라이트/hitbox_shapes.yy",},
{"name":"effects","order":48,"path":"folders/스프라이트/hitbox_shapes/effects.yy",},
{"name":"effects","order":49,"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",},
Expand Down Expand Up @@ -127,10 +127,11 @@
{"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",},
{"name":"spr_spuare_outline_full_mask","order":47,"path":"sprites/spr_spuare_outline_full_mask/spr_spuare_outline_full_mask.yy",},
{"name":"spr_spuare_outline_full_mask","order":48,"path":"sprites/spr_spuare_outline_full_mask/spr_spuare_outline_full_mask.yy",},
{"name":"hitbox_vaious_effects","order":27,"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":"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",},
{"name":"spr_jururu","order":11,"path":"sprites/spr_jururu/spr_jururu.yy",},
{"name":"get_unlocked_list_num","order":6,"path":"scripts/get_unlocked_list_num/get_unlocked_list_num.yy",},
{"name":"percentage_k","order":1,"path":"scripts/percentage_k/percentage_k.yy",},
Expand Down Expand Up @@ -185,6 +186,7 @@
{"name":"spr_hitbox_color","order":23,"path":"sprites/spr_hitbox_color/spr_hitbox_color.yy",},
{"name":"hitbox_19","order":20,"path":"objects/hitbox_19/hitbox_19.yy",},
{"name":"hitbox_2","order":2,"path":"objects/hitbox_2/hitbox_2.yy",},
{"name":"spr_trash","order":27,"path":"sprites/spr_trash/spr_trash.yy",},
{"name":"spr_circle_spike","order":6,"path":"sprites/spr_circle_spike/spr_circle_spike.yy",},
{"name":"line_effect","order":7,"path":"objects/line_effect/line_effect.yy",},
{"name":"spr_gear","order":14,"path":"sprites/spr_gear/spr_gear.yy",},
Expand Down Expand Up @@ -250,6 +252,7 @@
{"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",},
{"name":"create_explo_square","order":3,"path":"scripts/create_explo_square/create_explo_square.yy",},
{"name":"spr_X","order":47,"path":"sprites/spr_X/spr_X.yy",},
{"name":"hitbox_12","order":13,"path":"objects/hitbox_12/hitbox_12.yy",},
{"name":"happysegu","order":26,"path":"sounds/happysegu/happysegu.yy",},
{"name":"Sprite68","order":3,"path":"sprites/Sprite68/Sprite68.yy",},
Expand Down
3 changes: 3 additions & 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.

20 changes: 13 additions & 7 deletions objects/code/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ global.version_real = "7.01";
global.version = "Beta "+string(global.version_real);
global.beta_tester = 1;
global.streamer = 0;
global.custom_mapper = 0;
global.dev_mode = 0;
devmode_activate = 0;
global.custom_mapper = 0;
surf_screen = -4;
music_title_alpha = 0
global.blackout_alpha = 0;
Expand All @@ -27,7 +27,6 @@ global.overtime_highlight_song = 1;
global.automatic_load_ranking = 0;
global.cannot_connect = 0;
global.show_credit = 1;
global.beta_tester = 0;
var file_name = (global.dev_mode == 1) ? "PWB_Beta.ini" : "PWB_OpenBeta.ini"
ini_open_protect(file_name)
var tmp = ini_read_real("tutorial_played","none",0)
Expand Down Expand Up @@ -261,7 +260,7 @@ for(var i = 0; i <= 11; i++)
global.guide_showed[i] = 0;
}

global.custom_map_file_dir = array_create(999,"");

global.custom_map_num = 0;


Expand Down Expand Up @@ -294,12 +293,14 @@ automatic_reload_leaderboard = 0;


//곡 정보
for(var i = 0; i < 99; i++)
for(var i = 0; i < 255; i++)
{
//좋아요 한 곡
global.fav_map_id[i] = -4;
//해금된 곡
global.unlocked_map_id[i] = -4;
//해당 곡의 원래 오리지널 id값
global.map_id_origin[i] = -4;




//새로운 곡 표시에 포함될 곡 (커스텀 곡은 제외)
Expand Down Expand Up @@ -378,6 +379,7 @@ automatic_reload_leaderboard = 0;
global.custom_stage_album[i] = -4;
global.custom_audio_asset[i] = -4;
global.custom_stage_mapper[i] = -4;
global.custom_map_file_dir[i] = "";
}


Expand Down Expand Up @@ -540,6 +542,9 @@ master_movement_timer = 0
global.master_remix_effect5 = 0


//곡 필터링 - 우왁굳
global.filter_song_wakgood = [ 0, 8 ];

//후쿠로우
global.real_stage_map_name[9] = "부엉이 (Cover by 아이네 INE)";
global.real_stage_map_artist[9] = "Original by KOKIA / Inst by Kupon";
Expand Down Expand Up @@ -824,7 +829,8 @@ global.real_detailed_difficulty[25] = 1.5;
global.real_obtainable_type[25] = 99;
global.real_requirement_level[25] = 9999;


//곡 필터링 - 이세돌
global.filter_song_isedol = [ 9 , 25 ];



Expand Down
17 changes: 10 additions & 7 deletions objects/code/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -373,31 +373,31 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
if (global.obtainable_type[i] != 99)
{
draw_sprite_ext(spr_lock,0,xx_+96*dis_real,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+246*dis_real,yy_-64*dis_real,"해금 조건",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0)
draw_text_kl_scale(xx_+246*dis_real,yy_-64*dis_real,"해금 조건",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0)

draw_sprite_ext(spr_lock,0,xx_+276*dis_real,yy_+32*dis_real,global.font_ratio_resolution_xx*0.15*dis_real,0.15*dis_real,20,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+320*dis_real,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,dis_real*0.5*global.font_ratio_resolution_xx,dis_real*0.5,0)
draw_text_kl_scale(xx_+320*dis_real,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,dis_real*0.5*global.font_ratio_resolution_xx,dis_real*0.5,0)
}
else
{
draw_sprite_ext(spr_lock,0,xx_+96*dis_real,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+246*dis_real,yy_-64*dis_real,"개발 예정...",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0)
draw_text_kl_scale(xx_+246*dis_real,yy_-64*dis_real,"개발 예정...",64,-1,dis_alpha,global.map_color,0,-1,normal_font,0.5*dis_real*global.font_ratio_resolution_xx,0.5*dis_real,0)
}
}
else
{
if (global.obtainable_type[i] != 99)
{
draw_sprite_ext(spr_lock,0,xx_+1080,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+1156,yy_-64,"해금 조건",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
draw_text_kl_scale(xx_+1156,yy_-64,"해금 조건",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)

//draw_sprite_ext(spr_W,global.obtainable_type[i],xx_+1236,yy_+32,global.font_ratio_resolution_xx*0.15,0.15,20,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+1200,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
draw_text_kl_scale(xx_+1200,yy_,string(global.requirement_level[i])+"레벨 이상",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
}
else
{
draw_sprite_ext(spr_lock,0,xx_+1080,yy_,global.font_ratio_resolution_xx*0.25*dis_real,0.25*dis_real,0,c_white,global.ui_alpha*dis_real)
draw_text_k_scale(xx_+1156,yy_-64,"개발 예정...",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
draw_text_kl_scale(xx_+1156,yy_-64,"개발 예정...",64,-1,dis_alpha,c_white,0,-1,normal_font,0.5*global.font_ratio_resolution_xx,0.5,0)
}
}
}
Expand Down Expand Up @@ -464,7 +464,10 @@ if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
if global.scroll_activated != -1
{
global.scroll_n_m_xx = device_mouse_x(global.scroll_activated)
global.scroll_n_m_yy = device_mouse_y(global.scroll_activated)
if (global.scroll_n_m_xx >= room_width*0.5)
{
global.scroll_n_m_yy = device_mouse_y(global.scroll_activated)
}

global.t_select_map += (global.joystick_yy - global.scroll_n_m_yy)/1080
global.reload_n_map_list_value = (global.joystick_xx - global.scroll_n_m_xx)/512
Expand Down
16 changes: 9 additions & 7 deletions objects/code/KeyPress_45.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
// You can write your code in this editor



devmode_activate += 0.08;
if (devmode_activate > 1)
if (global.map_editor != 1)
{
global.dev_mode = 1;
show_message_log("개발자 모드가 활성화 되었습니다!");
global.default_directory = working_directory;
global.custom_map_directory = string(global.default_directory)+"\\Custom map files\\";
devmode_activate += 0.08;
if (devmode_activate > 1)
{
global.dev_mode = 1;
show_message_log("개발자 모드가 활성화 되었습니다!");
global.default_directory = working_directory;
global.custom_map_directory = string(global.default_directory)+"\\Custom map files\\";
}
}
25 changes: 24 additions & 1 deletion objects/code/Other_10.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,31 @@
// You can write your code in this editor

camera_focus_on(-4,-4,1)
var tmp_str = "모든 곡";
if (global.n_map_list == 1)
{
tmp_str = "좋아요 한 곡";
}
else if (global.n_map_list == 2)
{
tmp_str = "유저 제작 커스텀 곡";
}
else if (global.n_map_list == 3)
{
tmp_str = "해금 된 곡";
}
else if (global.n_map_list == 4)
{
tmp_str = "[곡 필터링] 우왁굳";
}
else if (global.n_map_list == 5)
{
tmp_str = "[곡 필터링] 이세계아이돌";
}


np_setpresence_more("", "메인 매뉴", false);
np_setpresence("메인 매뉴", "", "type0", "");
np_setpresence(string(tmp_str), "메인 매뉴", "type0", "");
automatic_loading_cancel = 0
window_set_cursor(cr_default)
instance_destroy(map_edior_ui);
Expand Down
9 changes: 5 additions & 4 deletions objects/code/Other_11.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,15 @@ if (global.title_menu_animation1 == -1)
}
}

if global.n_map_list < 0
var tmp_max_list = 5;
if (global.n_map_list < 0)
{
global.n_map_list = 3
global.n_map_list = tmp_max_list;
}

if global.n_map_list > 3
if (global.n_map_list > tmp_max_list)
{
global.n_map_list = 0
global.n_map_list = 0;
}


Expand Down
4 changes: 2 additions & 2 deletions objects/code/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ if global.joystick_activated != -1

if global.mobile_mode = 1 && global.sync_setting = 0
{
for(var i = 0; i < 4; i++)
for(var i = 0; i < 6; i++)
{
var is_click = device_mouse_check_button_pressed(i, mb_left);
if device_mouse_check_button(i, mb_left)
Expand Down Expand Up @@ -236,7 +236,7 @@ if global.mobile_mode = 1 && global.sync_setting = 0
global.hmove = 0
}

if is_clicked_scroll
if (is_clicked_scroll)
{
global.t_select_map = round(global.t_select_map)
global.scroll_activated = -1
Expand Down
9 changes: 5 additions & 4 deletions objects/code/Step_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -515,18 +515,19 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
{
global.n_map_id = n_stage
}
if global.n_map_list = 1
else if global.n_map_list = 1
{
global.n_map_id = global.fav_map_id[n_stage]
}
if global.n_map_list = 2
else if global.n_map_list = 2
{
global.n_map_id = n_stage
}
if global.n_map_list = 3
else if (global.n_map_list == 3 || global.n_map_list == 4 || global.n_map_list == 5)
{
global.n_map_id = global.unlocked_map_id[n_stage]
global.n_map_id = global.map_id_origin[n_stage]
}


if keyboard_check_pressed(vk_anykey)
{
Expand Down
2 changes: 1 addition & 1 deletion objects/hitbox_15/Draw_73.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ if (global.timeline_stop == 1 && my_id == 0)
draw_line_width(x,y,x+lengthdir_x(320,direction),y+lengthdir_y(320,direction),3);

var fontsize2 = (0.45*(1+global.mobile_mode*0.3))*global.converted_view_ratio;
draw_text_k_scale(x,y+64,"Size : "+string(image_xscale*sprite_get_width(sprite_index))+"px"+"\nx : "+string(floor(x))+"\ny : "+string(floor(y))+"\n몸통 갯수 : "+string(body_num)+"\n좌우 회전 속도 : "+string(auto_shake),64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
draw_text_k_scale(x,y+64,"Size : "+string(floor(image_xscale*sprite_get_width(sprite_index)))+"px"+"\nx : "+string(floor(x))+"\ny : "+string(floor(y))+"\n몸통 갯수 : "+string(body_num)+"\n좌우 회전 속도 : "+string(auto_shake),64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
}
}
14 changes: 12 additions & 2 deletions objects/hitbox_15/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ w_alpha += (0 - w_alpha)*0.3

if (global.timeline_stop != 1)
{
image_alpha = 1;
if (my_id != 0)
{
var target = parent_id.id_num[my_id-1];
Expand Down Expand Up @@ -40,5 +41,14 @@ if (global.timeline_stop != 1)
des_time += (image_xscale/sprite_width)/5
}
}


else
{
if (my_id == 0)
{
image_alpha = 0.5;
}
else
{
image_alpha = 0;
}
}
11 changes: 7 additions & 4 deletions objects/map_edior_ui/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@ if (global.n_setting_button == -4 && global.timeline_stop == 1)
}
else
{
//탄막 타입 기준으로 탄막 생성
editor_mode_create_projectile(global.editor_selected_type,t_m_x,t_m_y,global.ed_arg[0],(global.editor_selected_type == 11) ? 1 : global.ed_arg[1],global.ed_arg[2],global.ed_arg[3],global.ed_arg[4],global.ed_arg[5],global.ed_arg[6],custom_image_type,custom_image_ind);
with(code)
if (is_real(global.editor_selected_type) && global.editor_selected_type >= 0)
{
event_user(10);
//탄막 타입 기준으로 탄막 생성
editor_mode_create_projectile(global.editor_selected_type,t_m_x,t_m_y,global.ed_arg[0],(global.editor_selected_type == 11) ? 1 : global.ed_arg[1],global.ed_arg[2],global.ed_arg[3],global.ed_arg[4],global.ed_arg[5],global.ed_arg[6],custom_image_type,custom_image_ind);
with(code)
{
event_user(10);
}
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions objects/map_edior_ui/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ keep_pressing = 0
custom_image_type = 2;
custom_image_ind = 0;
selected_projectile_type = 0;
del_current_timeline = 0
del_all_timeline = 0
global.tiny_value_scrolling_now = 0;
for(var i = 0; i < 7; i++)
{
Expand Down
Loading

0 comments on commit 7e86b34

Please sign in to comment.