Skip to content

Commit

Permalink
2023_01_11
Browse files Browse the repository at this point in the history
minor editor bug fixed
new projectiles added on editor
optimizing
etc.
  • Loading branch information
ABER1047 committed Jan 10, 2024
1 parent 4ca9cb6 commit 0e7a30e
Show file tree
Hide file tree
Showing 63 changed files with 414 additions and 148 deletions.
13 changes: 7 additions & 6 deletions Project Wak Beat.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
],
"ResourceOrderSettings": [
{"name":"spr_circle_cylinder","order":41,"path":"sprites/spr_circle_cylinder/spr_circle_cylinder.yy",},
{"name":"hitbox_set_map_speed","order":29,"path":"objects/hitbox_set_map_speed/hitbox_set_map_speed.yy",},
{"name":"hitbox_set_map_speed","order":30,"path":"objects/hitbox_set_map_speed/hitbox_set_map_speed.yy",},
{"name":"tutorial_part4_timeline","order":6,"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 @@ -113,7 +113,7 @@
{"name":"set_score","order":1,"path":"scripts/set_score/set_score.yy",},
{"name":"dead_explosion","order":1,"path":"objects/dead_explosion/dead_explosion.yy",},
{"name":"show_nickname_setting","order":3,"path":"scripts/show_nickname_setting/show_nickname_setting.yy",},
{"name":"hitbox_camera_zoom","order":27,"path":"objects/hitbox_camera_zoom/hitbox_camera_zoom.yy",},
{"name":"hitbox_camera_zoom","order":28,"path":"objects/hitbox_camera_zoom/hitbox_camera_zoom.yy",},
{"name":"obj_stage_clear","order":6,"path":"objects/obj_stage_clear/obj_stage_clear.yy",},
{"name":"kinmoku_timeline","order":23,"path":"timelines/kinmoku_timeline/kinmoku_timeline.yy",},
{"name":"load_musicList","order":3,"path":"scripts/load_musicList/load_musicList.yy",},
Expand All @@ -134,7 +134,7 @@
{"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":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":"hitbox_vaious_effects","order":29,"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",},
Expand Down Expand Up @@ -178,7 +178,7 @@
{"name":"spr_circle_half","order":22,"path":"sprites/spr_circle_half/spr_circle_half.yy",},
{"name":"hitbox_7","order":7,"path":"objects/hitbox_7/hitbox_7.yy",},
{"name":"create_userdata_code","order":4,"path":"scripts/create_userdata_code/create_userdata_code.yy",},
{"name":"hitbox_hitbox_color","order":25,"path":"objects/hitbox_hitbox_color/hitbox_hitbox_color.yy",},
{"name":"hitbox_hitbox_color","order":26,"path":"objects/hitbox_hitbox_color/hitbox_hitbox_color.yy",},
{"name":"ini_open_protect","order":1,"path":"scripts/ini_open_protect/ini_open_protect.yy",},
{"name":"spr_music","order":1,"path":"sprites/spr_music/spr_music.yy",},
{"name":"bamguy","order":2,"path":"sounds/bamguy/bamguy.yy",},
Expand Down Expand Up @@ -222,7 +222,7 @@
{"name":"ini_close_protect","order":2,"path":"scripts/ini_close_protect/ini_close_protect.yy",},
{"name":"spr_cross","order":2,"path":"sprites/spr_cross/spr_cross.yy",},
{"name":"spr_circle","order":21,"path":"sprites/spr_circle/spr_circle.yy",},
{"name":"hitbox_savepoint","order":26,"path":"objects/hitbox_savepoint/hitbox_savepoint.yy",},
{"name":"hitbox_savepoint","order":27,"path":"objects/hitbox_savepoint/hitbox_savepoint.yy",},
{"name":"spr_spuare_outline","order":18,"path":"sprites/spr_spuare_outline/spr_spuare_outline.yy",},
{"name":"spr_loading","order":16,"path":"sprites/spr_loading/spr_loading.yy",},
{"name":"hitbox_10","order":11,"path":"objects/hitbox_10/hitbox_10.yy",},
Expand All @@ -243,7 +243,7 @@
{"name":"stay","order":32,"path":"sounds/stay/stay.yy",},
{"name":"turisumo_timeline","order":9,"path":"timelines/turisumo_timeline/turisumo_timeline.yy",},
{"name":"Sprite69","order":4,"path":"sprites/Sprite69/Sprite69.yy",},
{"name":"hitbox_bg_color","order":24,"path":"objects/hitbox_bg_color/hitbox_bg_color.yy",},
{"name":"hitbox_bg_color","order":25,"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",},
Expand Down Expand Up @@ -298,6 +298,7 @@
{"name":"wakgoodhyang","order":1,"path":"sounds/wakgoodhyang/wakgoodhyang.yy",},
{"name":"phony_timeline","order":12,"path":"timelines/phony_timeline/phony_timeline.yy",},
{"name":"lilpa_hurt","order":3,"path":"sounds/lilpa_hurt/lilpa_hurt.yy",},
{"name":"hitbox_23","order":24,"path":"objects/hitbox_23/hitbox_23.yy",},
{"name":"spr_circle_outline_light","order":8,"path":"sprites/spr_circle_outline_light/spr_circle_outline_light.yy",},
{"name":"show_message_log","order":7,"path":"scripts/show_message_log/show_message_log.yy",},
{"name":"happysegu_timeline","order":25,"path":"timelines/happysegu_timeline/happysegu_timeline.yy",},
Expand Down
1 change: 1 addition & 0 deletions Project Wak Beat.yyp

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

11 changes: 7 additions & 4 deletions objects/code/Draw_73.gml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if (music_title_alpha > 0 && global.tutorial_played >= 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*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)
}


Expand Down Expand Up @@ -806,9 +806,12 @@ if gamestart >= 2 && global.sync_setting_alpha >= 0.01 && global.n_progress > 1

if !instance_exists(obj_album_ui)
{
draw_set_color(c_white)
draw_set_alpha(global.w_alpha)
draw_line_width(0,0,room_width,room_height,5000)
if (global.flash_effect_setting != 1 || (global.flash_effect_setting == 1 && global.t_w_alpha > 0))
{
draw_set_color(c_white)
draw_set_alpha(global.w_alpha)
draw_line_width(0,0,room_width,room_height,5000)
}


draw_set_color(c_black)
Expand Down
2 changes: 1 addition & 1 deletion objects/code/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ if (global.show_progress_bar == 1 || global.tutorial_now == 1)
{
timeline_running = true
}
global.map_color = (is_real(global.map_color_tmp)) ? global.map_color_tmp : hex_to_color(global.map_color_tmp,1);
global.map_color = (is_string(global.map_color_tmp)) ? hex_to_color(global.map_color_tmp,1) : global.map_color_tmp;
timeline_speed = 1;

show_debug_message("timeline")
Expand Down
2 changes: 1 addition & 1 deletion objects/code/Step_1.gml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (is_real(global.map_color_tmp)) ? global.map_color_tmp : hex_to_color(global.map_color_tmp,1);
global.map_color = (!is_string(global.map_color_tmp)) ? global.map_color_tmp : hex_to_color(global.map_color_tmp,1);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion objects/hitbox_2/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if (global.timeline_stop != 1)
effect_.image_alpha = 1
}

if (m_data_arg5 != 0 && m_data_arg5 < des_timer)
if (m_data_arg3 != 0 && m_data_arg3 < des_timer)
{
instance_destroy()
}
Expand Down
14 changes: 13 additions & 1 deletion objects/hitbox_21/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,19 @@ if (global.timeline_stop != 1)

if (timer > m_data_arg5)
{
instance_destroy()
if (m_data_arg6 == 1)
{
image_xscale += (-0.01 - image_xscale)*0.2;
image_yscale += (-0.01 - image_yscale)*0.2;
if (image_yscale <= 0)
{
instance_destroy();
}
}
else
{
instance_destroy();
}
}
}
else
Expand Down
20 changes: 20 additions & 0 deletions objects/hitbox_22/Alarm_1.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/// @description Insert description here
// You can write your code in this editor
if (global.map_editor != 1)
{
var tmp_ins = global.in_safe_zone;
if (!instance_exists(tmp_ins) || (instance_number(hitbox_22) > 1 && tmp_ins.w_alpha <= 10))
{
global.hp = 0;
show_message_log(instance_exists(tmp_ins) ? tmp_ins.w_alpha : -4);
}
}









1 change: 0 additions & 1 deletion objects/hitbox_22/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ t_col_changing = -1;
des_timer = 180;
image_speed = 0;
event_user(11);
image_angle = -45;
play_animation = 0;
line_width = 8;
line_angle = 315;
Expand Down
29 changes: 17 additions & 12 deletions objects/hitbox_22/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
/// @description Insert description here
// You can write your code in this editor
if (play_animation == 0)
{
draw_text_k_scale(x,y-96,"여기로\n달리세요!",64,-1,image_alpha*0.4,image_blend,0,0,normal_font,1,1,0)
}



draw_self();
var tmp = (image_xscale+scale)*256;
draw_set_color(image_blend);
draw_set_alpha(line_alpha);
draw_rectangle_rotated_width(x,y,-tmp,-tmp,tmp,tmp,line_angle,line_width)
if (w_alpha > 0)
if (global.timeline_stop != 1)
{
draw_set_alpha(w_alpha);
draw_set_color(c_white);
draw_rectangle_rotated_width(x,y,-tmp,-tmp,tmp,tmp,line_angle,line_width)
if (play_animation == 0)
{
draw_text_k_scale(x,y-96*global.converted_view_ratio,"여기로\n달리세요!",64,-1,image_alpha*0.4,image_blend,0,0,normal_font,global.font_ratio_resolution_xx*global.converted_view_ratio,global.converted_view_ratio,0)
}
var tmp = (image_xscale+scale)*256;
draw_set_color(image_blend);
draw_set_alpha(line_alpha);
draw_rectangle_rotated_width(x,y,-tmp,-tmp,tmp,tmp,image_angle-45+line_angle,line_width)
if (w_alpha > 0)
{
draw_set_alpha(w_alpha);
draw_set_color(c_white);
draw_rectangle_rotated_width(x,y,-tmp,-tmp,tmp,tmp,image_angle-45+line_angle,line_width)
}
}
2 changes: 1 addition & 1 deletion objects/hitbox_22/Draw_73.gml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ if (global.timeline_stop == 1)
var yy = y-room_height*0.5;

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)+"\nx : "+string(floor(xx))+"\ny : "+string(floor(yy))+string(des_timer)+"프레임 이후 활성화",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(image_xscale)+"\nx : "+string(floor(xx))+"\ny : "+string(floor(yy))+"\n각도 : "+string(image_angle+45)+"\n"+string(des_timer)+"프레임 이후 활성화",64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
}
}
5 changes: 4 additions & 1 deletion objects/hitbox_22/Step_0.gml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
/// @description Insert description here
// You can write your code in this editor
image_angle += 90;
if (global.timeline_stop != 1)
{
image_angle += 90;
}

87 changes: 47 additions & 40 deletions objects/hitbox_22/Step_2.gml
Original file line number Diff line number Diff line change
@@ -1,51 +1,58 @@
/// @description Insert description here
// You can write your code in this editor

if (color_changing < 0)
{
color_changing = 0;
t_col_changing = 1;
}
else if (color_changing > 765)
if (global.timeline_stop != 1)
{
color_changing = 765;
t_col_changing = -1;
}
color_changing += t_col_changing;
image_blend = make_color_rgb(fix_num_inside(color_changing-510,0,255),fix_num_inside(color_changing-255,0,255),fix_num_inside(color_changing,0,255));
if (color_changing < 0)
{
color_changing = 0;
t_col_changing = 756/(des_timer*0.5);
}
else if (color_changing > 765)
{
color_changing = 765;
t_col_changing = -756/(des_timer*0.5);
}
color_changing += t_col_changing;
image_blend = make_color_rgb(fix_num_inside(color_changing-510,0,255),fix_num_inside(color_changing-255,0,255),fix_num_inside(color_changing,0,255));

if (play_animation == 0)
{
line_alpha += (0.6 - line_alpha)*0.3;
scale -= (10/des_timer);
line_angle -= (270/des_timer);
if (scale <= 0)
if (play_animation == 0)
{
play_animation = 1;
line_alpha = 1;

if (!place_meeting(x,y,obj_player))
line_alpha += (0.6 - line_alpha)*0.3;
scale -= (10/des_timer);
line_angle -= (270/des_timer);
if (scale <= 0)
{
global.hp = 0;
play_animation = 1;
line_alpha = 1;
with(hitbox_parents)
{
if (other.object_index != hitbox_22)
{
other.w_alpha = 1;
}
else
{
other.w_alpha = 100;
}
}
w_alpha = 100;
if (global.in_safe_zone != id)
{
alarm[1] = 1;
}
}

with(hitbox_parents)
{
w_alpha = 1;
}
w_alpha = 100;
}
}
else
{
image_alpha += (-0.1 - image_alpha)*0.3
w_alpha += (-0.1 - w_alpha)*0.1;
line_alpha += (-0.1 - line_alpha)*0.1;
scale += (1.05 - scale)*0.1;
line_width += (0 - line_width)*0.1

if (w_alpha <= 0 && line_alpha <= 0)
else
{
instance_destroy();
image_alpha += (-0.1 - image_alpha)*0.3
w_alpha += (-0.1 - w_alpha)*0.1;
line_alpha += (-0.1 - line_alpha)*0.1;
scale += (1.05 - scale)*0.1;
line_width += (0 - line_width)*0.1

if (w_alpha <= 0 && line_alpha <= 0)
{
instance_destroy();
}
}
}
1 change: 1 addition & 0 deletions objects/hitbox_22/hitbox_22.yy

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

5 changes: 5 additions & 0 deletions objects/hitbox_23/Create_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// @description Insert description here
// You can write your code in this editor
image_speed = 0;
image_alpha = 0.5;
event_user(11);
17 changes: 17 additions & 0 deletions objects/hitbox_23/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/// @description Insert description here
// You can write your code in this editor



draw_self();
if (global.timeline_stop == 1)
{
var tmp_angle = image_angle;
draw_set_color(c_white);
draw_set_alpha(0.2);
draw_line_width(x,y,x+lengthdir_x(256,tmp_angle),y+lengthdir_y(256,tmp_angle),1.5);

draw_set_alpha(0.7);
draw_line_width(x,y,x+lengthdir_x(160,tmp_angle-m_data_arg3/2),y+lengthdir_y(160,tmp_angle-m_data_arg3/2),3);
draw_line_width(x,y,x+lengthdir_x(160,tmp_angle+m_data_arg3/2),y+lengthdir_y(160,tmp_angle+m_data_arg3/2),3);
}
17 changes: 17 additions & 0 deletions objects/hitbox_23/Draw_73.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/// @description Insert description here
// You can write your code in this editor


if (global.timeline_stop == 1)
{
draw_sprite_ext(spr_editor_mode_hitbox,0,x,y,1+editor_selected*0.5,1+editor_selected*0.5,(editor_selected == 1) ? global.selected_animation : 0,c_white,0.5+editor_selected*0.5);

if (global.editor_hitbox == 1 && editor_selected == 1)
{
var xx = x-room_width*0.5;
var yy = y-room_height*0.5;

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)+"\nx : "+string(floor(xx))+"\ny : "+string(floor(yy))+"\n각도 : "+string(floor(image_angle))+"\n산탄 범위 : "+string(floor(m_data_arg3))+"\n탄막 갯수 : "+string(floor(m_data_arg4)),64,-1,1,c_white,0,0,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0)
}
}
17 changes: 17 additions & 0 deletions objects/hitbox_23/Step_2.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/// @description Insert description here
// You can write your code in this editor

if (global.timeline_stop != 1 && m_data_arg4 != 0)
{
//크기 / 앵글 / 속도 / 범위 / 탄막 갯수
var radius = m_data_arg3;
for(var i = 0; i <= radius; i += radius/m_data_arg4)
{
create_projectile(x,y,image_xscale,sign_nonzero(image_angle),lengthdir_y(m_data_arg2,image_angle+i-radius*0.5),lengthdir_x(m_data_arg2,image_angle+i-radius*0.5),0,0,sprite_index);
if (radius == 0)
{
break;
}
}
instance_destroy();
}
Loading

0 comments on commit 0e7a30e

Please sign in to comment.