From 0e7a30ea47a6fc95c8d8a7f17adb2a2beb545c81 Mon Sep 17 00:00:00 2001 From: ABER* <1047asd44@gmail.com> Date: Thu, 11 Jan 2024 02:35:09 +0900 Subject: [PATCH] 2023_01_11 minor editor bug fixed new projectiles added on editor optimizing etc. --- Project Wak Beat.resource_order | 13 +-- Project Wak Beat.yyp | 1 + objects/code/Draw_73.gml | 11 +- objects/code/Step_0.gml | 2 +- objects/code/Step_1.gml | 2 +- objects/hitbox_2/Step_0.gml | 2 +- objects/hitbox_21/Step_0.gml | 14 ++- objects/hitbox_22/Alarm_1.gml | 20 ++++ objects/hitbox_22/Create_0.gml | 1 - objects/hitbox_22/Draw_0.gml | 29 ++--- objects/hitbox_22/Draw_73.gml | 2 +- objects/hitbox_22/Step_0.gml | 5 +- objects/hitbox_22/Step_2.gml | 87 ++++++++------- objects/hitbox_22/hitbox_22.yy | 1 + objects/hitbox_23/Create_0.gml | 5 + objects/hitbox_23/Draw_0.gml | 17 +++ objects/hitbox_23/Draw_73.gml | 17 +++ objects/hitbox_23/Step_2.gml | 17 +++ objects/hitbox_23/hitbox_23.yy | 39 +++++++ objects/map_edior_ui/Alarm_3.gml | 2 +- objects/map_edior_ui/Draw_73.gml | 34 ++++-- objects/map_edior_ui/Step_0.gml | 45 +++++++- objects/map_edior_ui/Step_1.gml | 4 + objects/obj_camera/Alarm_2.gml | 4 +- objects/obj_player/Create_0.gml | 1 + objects/obj_player/Step_2.gml | 102 +++++++++--------- objects/square_misile/Step_0.gml | 2 +- .../create_square_misile.gml | 1 - .../editor_mode_create_projectile.gml | 47 +++++--- scripts/merge_color_new/merge_color_new.gml | 4 +- scripts/set_hitbox_color/set_hitbox_color.gml | 2 +- .../0a250b23-4a90-4b5b-93b9-f82fb4f5575f.png | Bin 940 -> 983 bytes .../aa4eda13-4317-4760-9a83-f13ba104f55b.png | Bin 720 -> 1265 bytes .../8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png | Bin 940 -> 983 bytes .../8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png | Bin 720 -> 1265 bytes sprites/spr_square_line/spr_square_line.yy | 2 +- timelines/bamguy_timeline/moment_507.gml | 1 + timelines/fukurou_timeline/moment_1489.gml | 1 + timelines/fukurou_timeline/moment_1854.gml | 1 + timelines/fukurou_timeline/moment_2488.gml | 1 + timelines/phony_timeline/moment_1312.gml | 1 + timelines/phony_timeline/moment_2325.gml | 1 + timelines/phony_timeline/moment_2666.gml | 1 + timelines/phony_timeline/moment_2838.gml | 1 + timelines/phony_timeline/moment_972.gml | 1 + timelines/shelter_timeline/moment_1005.gml | 1 + timelines/shelter_timeline/moment_1275.gml | 1 + timelines/shelter_timeline/moment_1850.gml | 1 + timelines/shelter_timeline/moment_3578.gml | 1 + timelines/shelter_timeline/moment_700.gml | 1 + timelines/turisumo_timeline/moment_0.gml | 1 + timelines/turisumo_timeline/moment_170.gml | 1 + timelines/turisumo_timeline/moment_2532.gml | 1 + timelines/turisumo_timeline/moment_888.gml | 1 + .../wakgoodhyang_timeline/moment_1860.gml | 1 + .../wakgoodhyang_timeline/moment_2034.gml | 1 + .../wakgoodhyang_timeline/moment_3258.gml | 1 + .../wakgoodhyang_timeline/moment_3435.gml | 1 + .../wakgoodhyang_timeline/moment_3937.gml | 1 + timelines/wakrio_timeline/moment_1293.gml | 1 + timelines/wakrio_timeline/moment_1740.gml | 1 + timelines/wakrio_timeline/moment_2757.gml | 1 + timelines/wakrio_timeline/moment_3210.gml | 1 + 63 files changed, 414 insertions(+), 148 deletions(-) create mode 100644 objects/hitbox_22/Alarm_1.gml create mode 100644 objects/hitbox_23/Create_0.gml create mode 100644 objects/hitbox_23/Draw_0.gml create mode 100644 objects/hitbox_23/Draw_73.gml create mode 100644 objects/hitbox_23/Step_2.gml create mode 100644 objects/hitbox_23/hitbox_23.yy diff --git a/Project Wak Beat.resource_order b/Project Wak Beat.resource_order index 0fcf1e4e..e2f37fa3 100644 --- a/Project Wak Beat.resource_order +++ b/Project Wak Beat.resource_order @@ -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",}, @@ -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",}, @@ -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",}, @@ -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",}, @@ -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",}, @@ -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",}, @@ -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",}, diff --git a/Project Wak Beat.yyp b/Project Wak Beat.yyp index 53ee56f6..37446f94 100644 --- a/Project Wak Beat.yyp +++ b/Project Wak Beat.yyp @@ -343,6 +343,7 @@ {"id":{"name":"code","path":"objects/code/code.yy",},}, {"id":{"name":"phony_timeline","path":"timelines/phony_timeline/phony_timeline.yy",},}, {"id":{"name":"lilpa_hurt","path":"sounds/lilpa_hurt/lilpa_hurt.yy",},}, + {"id":{"name":"hitbox_23","path":"objects/hitbox_23/hitbox_23.yy",},}, {"id":{"name":"spr_circle_outline_light","path":"sprites/spr_circle_outline_light/spr_circle_outline_light.yy",},}, {"id":{"name":"show_message_log","path":"scripts/show_message_log/show_message_log.yy",},}, {"id":{"name":"happysegu_timeline","path":"timelines/happysegu_timeline/happysegu_timeline.yy",},}, diff --git a/objects/code/Draw_73.gml b/objects/code/Draw_73.gml index cb84f3f9..2b3deeb0 100644 --- a/objects/code/Draw_73.gml +++ b/objects/code/Draw_73.gml @@ -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) } @@ -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) diff --git a/objects/code/Step_0.gml b/objects/code/Step_0.gml index f6688d86..294c8c40 100644 --- a/objects/code/Step_0.gml +++ b/objects/code/Step_0.gml @@ -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") diff --git a/objects/code/Step_1.gml b/objects/code/Step_1.gml index a8bca511..e8be330d 100644 --- a/objects/code/Step_1.gml +++ b/objects/code/Step_1.gml @@ -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 { diff --git a/objects/hitbox_2/Step_0.gml b/objects/hitbox_2/Step_0.gml index ef0014e5..85f59643 100644 --- a/objects/hitbox_2/Step_0.gml +++ b/objects/hitbox_2/Step_0.gml @@ -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() } diff --git a/objects/hitbox_21/Step_0.gml b/objects/hitbox_21/Step_0.gml index bbbd82cc..ad96917f 100644 --- a/objects/hitbox_21/Step_0.gml +++ b/objects/hitbox_21/Step_0.gml @@ -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 diff --git a/objects/hitbox_22/Alarm_1.gml b/objects/hitbox_22/Alarm_1.gml new file mode 100644 index 00000000..09fa0008 --- /dev/null +++ b/objects/hitbox_22/Alarm_1.gml @@ -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); + } +} + + + + + + + + + diff --git a/objects/hitbox_22/Create_0.gml b/objects/hitbox_22/Create_0.gml index d706c91b..52b4a35f 100644 --- a/objects/hitbox_22/Create_0.gml +++ b/objects/hitbox_22/Create_0.gml @@ -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; diff --git a/objects/hitbox_22/Draw_0.gml b/objects/hitbox_22/Draw_0.gml index b5a9cc73..7ad6cc51 100644 --- a/objects/hitbox_22/Draw_0.gml +++ b/objects/hitbox_22/Draw_0.gml @@ -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) + } } \ No newline at end of file diff --git a/objects/hitbox_22/Draw_73.gml b/objects/hitbox_22/Draw_73.gml index c16c4c45..c33850cd 100644 --- a/objects/hitbox_22/Draw_73.gml +++ b/objects/hitbox_22/Draw_73.gml @@ -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) } } diff --git a/objects/hitbox_22/Step_0.gml b/objects/hitbox_22/Step_0.gml index b2fe1fb8..7c0bb8d2 100644 --- a/objects/hitbox_22/Step_0.gml +++ b/objects/hitbox_22/Step_0.gml @@ -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; +} diff --git a/objects/hitbox_22/Step_2.gml b/objects/hitbox_22/Step_2.gml index 423730ab..be2ceea4 100644 --- a/objects/hitbox_22/Step_2.gml +++ b/objects/hitbox_22/Step_2.gml @@ -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(); + } } } \ No newline at end of file diff --git a/objects/hitbox_22/hitbox_22.yy b/objects/hitbox_22/hitbox_22.yy index c12388b5..5448e99c 100644 --- a/objects/hitbox_22/hitbox_22.yy +++ b/objects/hitbox_22/hitbox_22.yy @@ -8,6 +8,7 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":73,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/hitbox_23/Create_0.gml b/objects/hitbox_23/Create_0.gml new file mode 100644 index 00000000..da307e78 --- /dev/null +++ b/objects/hitbox_23/Create_0.gml @@ -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); \ No newline at end of file diff --git a/objects/hitbox_23/Draw_0.gml b/objects/hitbox_23/Draw_0.gml new file mode 100644 index 00000000..56844ce0 --- /dev/null +++ b/objects/hitbox_23/Draw_0.gml @@ -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); +} \ No newline at end of file diff --git a/objects/hitbox_23/Draw_73.gml b/objects/hitbox_23/Draw_73.gml new file mode 100644 index 00000000..1ddb22cb --- /dev/null +++ b/objects/hitbox_23/Draw_73.gml @@ -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) + } +} diff --git a/objects/hitbox_23/Step_2.gml b/objects/hitbox_23/Step_2.gml new file mode 100644 index 00000000..a61dfdc5 --- /dev/null +++ b/objects/hitbox_23/Step_2.gml @@ -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(); +} \ No newline at end of file diff --git a/objects/hitbox_23/hitbox_23.yy b/objects/hitbox_23/hitbox_23.yy new file mode 100644 index 00000000..77596947 --- /dev/null +++ b/objects/hitbox_23/hitbox_23.yy @@ -0,0 +1,39 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "hitbox_23", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":73,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "hitbox", + "path": "folders/오브젝트/hitbox.yy", + }, + "parentObjectId": { + "name": "hitbox_parents", + "path": "objects/hitbox_parents/hitbox_parents.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/map_edior_ui/Alarm_3.gml b/objects/map_edior_ui/Alarm_3.gml index 63d1877a..b91e63a6 100644 --- a/objects/map_edior_ui/Alarm_3.gml +++ b/objects/map_edior_ui/Alarm_3.gml @@ -2,7 +2,7 @@ // You can write your code in this editor - +/* with(hitbox_parents) { if (other.object_index != map_edior_ui.saved_obj_num && other.x == map_edior_ui.saved_hitbox_xx && other.y == saved_hitbox_yy && other.projectile_type == global.editor_selected_type) diff --git a/objects/map_edior_ui/Draw_73.gml b/objects/map_edior_ui/Draw_73.gml index cc514963..3de2d26f 100644 --- a/objects/map_edior_ui/Draw_73.gml +++ b/objects/map_edior_ui/Draw_73.gml @@ -30,9 +30,9 @@ if (global.timeline_stop == 1) var tmp_alpha_ = fix_to_zero(1-global.tiny_value_scrolling_now); if (tmp_alpha_ > 0) { - draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.3-global.mobile_mode*0.03),"- 단축키",fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) + draw_text_k_scale(xx+xx_w*0.01,yy+yy_h*(0.27-global.mobile_mode*0.03),"- 단축키",fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) var plus_str = (custom_image_type != 2) ? "\n탄막 이미지 변경 [좌/우 방향키]" : ""; - draw_text_k_scale(xx+xx_w*0.02,yy+yy_h*(0.4-global.mobile_mode*0.03),"눈금선 위로 고정 [Shift]\n세밀한 값 조절 [Shift+스크롤 바 좌클릭]\n배치된 탄막 선택/수정 [마우스 가운데 휠 버튼]\n선택된 탄막 삭제 [Delete]\n에디터 창 열기/닫기 [Space / Enter]\n현재 타임라인 삭제 [Ctrl + Del]\n전체 타임라인 삭제 [Alt + Del]\n직접 값 입력 [스크롤 바 옆 숫자 클릭]"+string(plus_str),fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) + draw_text_k_scale(xx+xx_w*0.01,yy+yy_h*(0.3-global.mobile_mode*0.03),"눈금선 위로 고정 [Shift]\n세밀한 값 조절 [Shift+스크롤 바 좌클릭]\n배치된 탄막 선택/수정 [마우스 가운데 휠 버튼]\n선택된 탄막 삭제 [Delete]\n에디터 창 열기/닫기 [Space / Enter]\n현재 타임라인 삭제 [Ctrl + Del]\n전체 타임라인 삭제 [Alt + Del]\n직접 값 입력 [스크롤 바 옆 숫자 클릭]"+string(plus_str),fontsize2*256,-1,tmp_alpha_,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) @@ -44,7 +44,7 @@ if (global.timeline_stop == 1) } - var tmp_name = [ "이동 탄막 - 이동하는 탄막을 생성합니다", "스파이크 폭발 탄막 - 멀리서 날아와 폭발하는 탄막을 생성합니다", "레이저 탄막 - 레이저를 생성합니다", "눈꽃 탄막 - '겨울봄 (Winter Spring)'에 등장한 눈꽃 탄막을 생성합니다", "지렁이 탄막 - '매스터 리믹스 (Orchestral Edit)'에 등장한 지렁이 탄막을 생성합니다", "화살표 레이저 탄막 - 'Happy Gosegu Sencho!'에 등장한 화살표 방향으로 날아가는 탄막을 생성합니다", "원형 폭발 탄막 - 시간이 지난 뒤 등장하는 탄막을 생성합니다", "맵 밖에서 튀어나오는 탄막 - '고멤가요제 MASHUP (아이네 INE)'에 등장한 막대기 모양의 탄막을 생성합니다", "탄막색 변경 - 탄막색을 변경합니다" , "배경색 변경 - 배경색을 변경합니다" , "미사일 탄막 - '밤가이!!'에 등장한 날아가면서 탄막을 생성하는 탄막을 생성합니다" , "세이브 포인트 지정 - 현재 타임라인에 세이브 포인트를 지정합니다", "바운스 탄막 - 'Happy Gosegu Sencho!'에 등장한 맵 바깥에서 튕기며 폭발하는 탄막을 생성합니다", "카메라 효과 - 카메라 줌 정도를 조절합니다", "배경 투명도 변화 - 배경의 투명도를 조절합니다", "회전하는 탄막 자동 생성기 - 지속 시간 동안 계속 '이동 탄막'을 생성합니다", "물 이펙트 탄막 - '아이패드'에 등장한 물이 튀기는 듯한 모양의 탄막을 생성합니다", "카메라 지진 효과 - 카메라를 시점을 흔드는 효과를 줍니다", "맵 이동 효과 - '밤가이!!'에 등장한 맵이 이동하는 효과를 줍니다", "지정 위치 이동 탄막 - 특정 좌표로 이동하는 탄막을 생성합니다", "이펙트 탄막 - 피격판정이 없는 탄막을 생성합니다", "화면 플래시 효과 - 화면이 번쩍거리는 효과를 줍니다", "비 효과 - '매스터 리믹스 (Orchestral Edit)'에 등장한 비 내리는 효과를 줍니다", "특수 카메라 효과 - 몇몇 특수한 카메라 효과를 줍니다", "Unknown", "Unknown", "Unknown", "배치된 탄막 수정 ['마우스 가운데 휠 버튼'으로 바로 선택 가능]", "타임라인 플레이/일시정지" ]; + var tmp_name = [ "이동 탄막 - 이동하는 탄막을 생성합니다", "스파이크 폭발 탄막 - 멀리서 날아와 폭발하는 탄막을 생성합니다", "레이저 탄막 - 레이저를 생성합니다", "눈꽃 탄막 - '겨울봄 (Winter Spring)'에 등장한 눈꽃 탄막을 생성합니다", "지렁이 탄막 - '매스터 리믹스 (Orchestral Edit)'에 등장한 지렁이 탄막을 생성합니다", "화살표 레이저 탄막 - 'Happy Gosegu Sencho!'에 등장한 화살표 방향으로 날아가는 탄막을 생성합니다", "원형 폭발 탄막 - 시간이 지난 뒤 등장하는 탄막을 생성합니다", "맵 밖에서 튀어나오는 탄막 - '고멤가요제 MASHUP (아이네 INE)'에 등장한 막대기 모양의 탄막을 생성합니다", "탄막색 변경 - 탄막색을 변경합니다" , "배경색 변경 - 배경색을 변경합니다" , "미사일 탄막 - '밤가이!!'에 등장한 날아가면서 탄막을 생성하는 탄막을 생성합니다" , "세이브 포인트 지정 - 현재 타임라인에 세이브 포인트를 지정합니다", "바운스 탄막 - 'Happy Gosegu Sencho!'에 등장한 맵 바깥에서 튕기며 폭발하는 탄막을 생성합니다", "카메라 효과 - 카메라 줌 정도를 조절합니다", "배경 투명도 변화 - 배경의 투명도를 조절합니다", "회전하는 탄막 자동 생성기 - 지속 시간 동안 계속 '이동 탄막'을 생성합니다", "물 이펙트 탄막 - '아이패드'에 등장한 물이 튀기는 듯한 모양의 탄막을 생성합니다", "카메라 지진 효과 - 카메라를 시점을 흔드는 효과를 줍니다", "맵 이동 효과 - '밤가이!!'에 등장한 맵이 이동하는 효과를 줍니다", "지정 위치 이동 탄막 - 특정 좌표로 이동하는 탄막을 생성합니다", "이펙트 탄막 - 피격판정이 없는 탄막을 생성합니다", "화면 플래시 효과 - 화면이 번쩍거리는 효과를 줍니다", "비 효과 - '매스터 리믹스 (Orchestral Edit)'에 등장한 비 내리는 효과를 줍니다", "특수 카메라 효과 - 몇몇 특수한 카메라 효과를 줍니다", "세이프존 - 'Hardcore'모드에 등장하는 세이프존을 생성합니다", "산탄형 탄막 - 특정 각도로 특정 범위만큼 탄막을 산탄합니다.", "Unknown", "배치된 탄막 수정 ['마우스 가운데 휠 버튼'으로 바로 선택 가능]", "타임라인 플레이/일시정지" ]; if (global.editor_selected_type >= 0) { draw_text_k_scale(xx+64,yy+yy_h*0.88+32-scroll_y,string(tmp_name[global.editor_selected_type]),64,-1,1,c_white,0,-1,normal_font,fontsize2*global.font_ratio_resolution_xx,fontsize2,0) @@ -63,7 +63,7 @@ if (global.timeline_stop == 1) for(var i = 0; i <= 28; i++) //탄막이 새로 추가되면 수정해야됨 { - if (i <= 23 || i > 27) + if (i <= 25 || i > 27) { var tmp_xx = xx+(96+i*120)*global.converted_view_ratio; var tmp_yy = yy+yy_h*0.88+(160-scroll_y)*global.converted_view_ratio; @@ -199,6 +199,17 @@ if (global.timeline_stop == 1) draw_set_alpha(1); draw_line_width(t_m_x,t_m_y,room_width*0.5+global.ed_arg[3],room_height*0.5+global.ed_arg[4],3); } + else if (global.editor_selected_type == 25) + { + var tmp_angle = image_angle; + draw_set_color(c_white); + draw_set_alpha(0.2); + draw_line_width(t_m_x,t_m_y,t_m_x+lengthdir_x(256,tmp_angle),t_m_y+lengthdir_y(256,tmp_angle),1.5); + + draw_set_alpha(0.7); + draw_line_width(t_m_x,t_m_y,t_m_x+lengthdir_x(160,tmp_angle-global.ed_arg[3]/2),t_m_y+lengthdir_y(160,tmp_angle-global.ed_arg[3]/2),3); + draw_line_width(t_m_x,t_m_y,t_m_x+lengthdir_x(160,tmp_angle+global.ed_arg[3]/2),t_m_y+lengthdir_y(160,tmp_angle+global.ed_arg[3]/2),3); + } } @@ -285,7 +296,7 @@ if (global.timeline_stop == 1 && scroll_y > -639) } else if (global.ed_arg_name[i] == "설정된 효과 종류") { - tmp_string = (global.ed_arg[i] == 1) ? "카메라 웨이브" : "블랙 아웃"; + tmp_string = (global.ed_arg[i] == 1) ? "화면웨이브" : "블랙 아웃"; } else if (global.ed_arg_name[i] == "화면 흔들림 방향") { @@ -354,7 +365,18 @@ if (global.timeline_stop == 1 && scroll_y > -639) } else { - global.ed_arg_modifying[i] = ""; + if (global.ed_arg_modifying[i] != "") + { + global.ed_arg_modifying[i] = ""; + if (instance_exists(map_edior_ui) && map_edior_ui.n_selected != -4 && instance_exists(map_edior_ui.n_selected)) + { + var tmp_id = map_edior_ui.n_selected; + variable_instance_set(tmp_id,"m_data_arg"+string(i),global.ed_arg[i]); + tmp_id.editor_selected = 1; + global.revalued_projectile_save = 2; + show_message_log("값 수정됨"); + } + } } } diff --git a/objects/map_edior_ui/Step_0.gml b/objects/map_edior_ui/Step_0.gml index 1de48fa9..3a1d53ad 100644 --- a/objects/map_edior_ui/Step_0.gml +++ b/objects/map_edior_ui/Step_0.gml @@ -155,7 +155,8 @@ switch(global.editor_selected_type) image_alpha = 0.4; scroll_param_set(0,"크기",1,1024,2,100,""); scroll_param_set(1,"각도",0,359,2,0,"deg"); - scroll_param_set(2,"지속시간 (60fps = 1초, 0fps = 무한 지속)",0,3600,2,0,"fps"); + scroll_param_set(2,"속력",0,360,2,0,""); + scroll_param_set(3,"지속시간 (60fps = 1초, 0fps = 무한 지속)",0,3600,2,0,"fps"); scroll_param_set(6,"이펙트 활성화",-1,1,2,0,""); break; @@ -322,7 +323,7 @@ switch(global.editor_selected_type) case 10: //미사일 탄막 scroll_param_set(0,"크기",1,1024,2,100,""); scroll_param_set(1,"각도",0,359,2,90,"deg"); - scroll_param_set(2,"속력",24,640,2,0,""); + scroll_param_set(2,"속력",0,640,2,0,""); scroll_param_set(3,"생성된 탄막의 지속 시간 (60fps = 1초)",1,3600,2,0,"fps"); image_angle = global.ed_arg[1]; @@ -454,6 +455,7 @@ switch(global.editor_selected_type) scroll_param_set(3,"이동할 위치 (x축)",-2048,2048,2,0,""); scroll_param_set(4,"이동할 위치 (y축)",-1920,1920,2,0,""); scroll_param_set(5,"지속 시간 (60fps = 1초, 0fps = 무한 지속)",0,3600,2,0,""); + scroll_param_set(6,"삭제 애니메이션",-1,1,2,0,""); break; case 20: //이펙트 탄막 @@ -470,7 +472,7 @@ switch(global.editor_selected_type) image_blend = #7da7d9; scroll_param_set(0,"크기",1,1024,2,100,""); scroll_param_set(1,"각도",0,359,2,0,"deg"); - scroll_param_set(2,"이동 속력",0,1280,2,0,""); + scroll_param_set(2,"이동 속력",0,320,2,0,""); scroll_param_set(3,"지속 시간 (60fps = 1초, 0fps = 무한 지속)",0,3600,2,0,""); break; @@ -504,6 +506,43 @@ switch(global.editor_selected_type) scroll_param_set(0,"효과 방향",0,(global.ed_arg[6] == 1) ? 3 : 5,2,0,""); scroll_param_set(6,"설정된 효과 종류",-1,1,2,0,""); break; + + case 24: //세이프존 탄막 + if (selected_projectile_type == 1) + { + selected_projectile_type = 0; + custom_image_type = 2; + } + image_angle = global.ed_arg[1]-45; + image_alpha = 0.4; + image_xscale = global.ed_arg[0]; + image_yscale = image_xscale; + sprite_index = spr_square_line; + + scroll_param_set(0,"크기",1,1024,2,100,""); + scroll_param_set(1,"각도",0,359,2,0,"deg"); + scroll_param_set(2,"n프레임 이후 활성화 (60fps = 1초)",1,3600,2,0,"fps"); + break; + + case 25: //산탄형 탄막 + if (selected_projectile_type == 1) + { + custom_image_ind = 0; + custom_image_type = 0; + selected_projectile_type = 0; + } + image_angle = global.ed_arg[1]; + image_alpha = 0.4; + image_xscale = global.ed_arg[0]; + image_yscale = image_xscale; + + + scroll_param_set(0,"탄막 크기",1,1024,2,100,""); + scroll_param_set(1,"각도",0,359,2,0,"deg"); + scroll_param_set(2,"이동 속력",0,320,2,0,""); + scroll_param_set(3,"산탄 범위",0,359,2,0,"deg"); + scroll_param_set(4,"탄막 갯수",1,360,2,0,"개"); + break; } diff --git a/objects/map_edior_ui/Step_1.gml b/objects/map_edior_ui/Step_1.gml index 04d237ac..f86a07af 100644 --- a/objects/map_edior_ui/Step_1.gml +++ b/objects/map_edior_ui/Step_1.gml @@ -25,6 +25,8 @@ if (del_all_timeline > 0) }*/ + + if (global.revalued_projectile_save == 2) { saved_hitbox_xx = n_selected.x; @@ -72,3 +74,5 @@ if (instance_exists(n_selected)) + + diff --git a/objects/obj_camera/Alarm_2.gml b/objects/obj_camera/Alarm_2.gml index 4b9b27fd..9caff21f 100644 --- a/objects/obj_camera/Alarm_2.gml +++ b/objects/obj_camera/Alarm_2.gml @@ -4,10 +4,10 @@ if (global.play_custom_map == 1) { var tmp_col = global.custom_stage_map_color[global.n_map_id]; - global.map_color = (is_real(tmp_col)) ? tmp_col : hex_to_color(tmp_col,1); + global.map_color = (!is_string(tmp_col)) ? tmp_col : hex_to_color(tmp_col,1); } else { var tmp_col = global.stage_map_color[global.n_map_id]; - global.map_color = (is_real(tmp_col)) ? tmp_col : hex_to_color(tmp_col,1); + global.map_color = (!is_string(tmp_col)) ? tmp_col : hex_to_color(tmp_col,1); } diff --git a/objects/obj_player/Create_0.gml b/objects/obj_player/Create_0.gml index cc4fd7f5..43c8a624 100644 --- a/objects/obj_player/Create_0.gml +++ b/objects/obj_player/Create_0.gml @@ -35,6 +35,7 @@ saved_ef_ins_id = -4 global.dash_cooltime = 0 global.dashing = 0 +global.in_safe_zone = -4; w_alpha = 0 diff --git a/objects/obj_player/Step_2.gml b/objects/obj_player/Step_2.gml index 0d3ccfb7..c2c713ca 100644 --- a/objects/obj_player/Step_2.gml +++ b/objects/obj_player/Step_2.gml @@ -1,70 +1,74 @@ /// @description Insert description here // You can write your code in this editor +var i = 1; +var ii = 1; +var _placed_obj = instance_place(x+i*sign(global.hmove_speed),y+ii*sign(global.vmove_speed),hitbox_22); +global.in_safe_zone = (instance_exists(_placed_obj)) ? _placed_obj : -4; - -if (global.map_editor != 1 && global.hp > 0 && (global.w_alpha <= 0.8) && (!instance_exists(obj_stage_clear) || (instance_exists(obj_stage_clear) && obj_stage_clear.touched <= 0))) +if (global.map_editor != 1) { - var i = 1 - var ii = 1 - var _placed_obj = instance_place(x+i*sign(global.hmove_speed),y+ii*sign(global.vmove_speed),hitbox_parents) - if (instance_exists(_placed_obj) && _placed_obj.image_alpha >= 0.95 && _placed_obj.object_index != hitbox_22) + if (global.hp > 0 && (global.w_alpha <= 0.8) && (!instance_exists(obj_stage_clear) || (instance_exists(obj_stage_clear) && obj_stage_clear.touched <= 0))) { - if (invincibility_cooltime <= 0) + var _placed_obj = instance_place(x+i*sign(global.hmove_speed),y+ii*sign(global.vmove_speed),hitbox_parents); + if (instance_exists(_placed_obj) && _placed_obj.image_alpha >= 0.95 && _placed_obj.object_index != hitbox_22) { - hurt = _placed_obj - hurt_hspeed = global.hmove_speed - hurt_vspeed = global.vmove_speed - - with(obj_player_left_hp_effect) + if (invincibility_cooltime <= 0) { - image_alpha = 10; - } - + hurt = _placed_obj; + hurt_hspeed = global.hmove_speed; + hurt_vspeed = global.vmove_speed; - if (!percentage_k(global.ignore_damage)) - { - if (global.additional_hp <= 0) + with(obj_player_left_hp_effect) { - global.total_damaged ++; - global.hp -= 1; + image_alpha = 10; } - else + + + if (!percentage_k(global.ignore_damage)) { - global.additional_hp --; + if (global.additional_hp <= 0) + { + global.total_damaged ++; + global.hp -= 1; + } + else + { + global.additional_hp --; + } } - } - kirakira_effect = 1; - w_alpha = 2; - global.blackout_alpha = 1; - invincibility_cooltime = 150+global.addition_invinc_time; - show_invincibility = 1; - audio_play_sound(hit_sfx,0,false,global.master_volume*global.sfx_volume*6); + kirakira_effect = 1; + w_alpha = 2; + global.blackout_alpha = 1; + invincibility_cooltime = 150+global.addition_invinc_time; + show_invincibility = 1; + audio_play_sound(hit_sfx,0,false,global.master_volume*global.sfx_volume*6); - repeat(irandom_range(4,5)) - { - var random_x = irandom_range(-24,24) - var random_y = irandom_range(-24,24) - var effect_ = instance_create_depth(x+random_x,y+random_y,depth+1,movement_effect) - effect_.image_xscale = 0.6 - effect_.image_yscale = 0.6 - effect_.direction = point_direction(x,y,x+random_x,y+random_y) - effect_.speed = 24 - effect_.image_angle = image_angle - effect_.image_blend = global.player_color - effect_.image_alpha = 0.5; + repeat(irandom_range(4,5)) + { + var random_x = irandom_range(-24,24) + var random_y = irandom_range(-24,24) + var effect_ = instance_create_depth(x+random_x,y+random_y,depth+1,movement_effect) + effect_.image_xscale = 0.6 + effect_.image_yscale = 0.6 + effect_.direction = point_direction(x,y,x+random_x,y+random_y) + effect_.speed = 24 + effect_.image_angle = image_angle + effect_.image_blend = global.player_color + effect_.image_alpha = 0.5; + } } - } - else - { - if (global.dashing > 0 && crossed_obstacle_cooldown = 0) + else { - global.crossed_obstacle_num ++; - global.rank_display_b_alpha = 1; - crossed_obstacle_cooldown = 1; - alarm[1] = 11 + if (global.dashing > 0 && crossed_obstacle_cooldown = 0) + { + global.crossed_obstacle_num ++; + global.rank_display_b_alpha = 1; + crossed_obstacle_cooldown = 1; + alarm[1] = 11 + } } } } diff --git a/objects/square_misile/Step_0.gml b/objects/square_misile/Step_0.gml index 55c74b34..23bed8ad 100644 --- a/objects/square_misile/Step_0.gml +++ b/objects/square_misile/Step_0.gml @@ -65,7 +65,7 @@ if (global.timeline_stop != 1) first_created = 1; var laser__ = instance_create_depth(x-lengthdir_x(timer,direction),y-lengthdir_y(timer,direction),obj_player.depth-1,hitbox_9) laser__.target_time = 1 - laser__.des_time = des_time; + laser__.des_time = (variable_instance_exists(id,"m_data_arg3")) ? m_data_arg5 : des_time; laser__.shake_scale = shake_scale; laser__.shake_dir = shake_dir; laser__.image_xscale = image_xscale; diff --git a/scripts/create_square_misile/create_square_misile.gml b/scripts/create_square_misile/create_square_misile.gml index 41de5cf5..17f99ad0 100644 --- a/scripts/create_square_misile/create_square_misile.gml +++ b/scripts/create_square_misile/create_square_misile.gml @@ -23,7 +23,6 @@ function create_square_misile(argument0,argument1,argument2,argument3,argument4, laser__.image_xscale = argument6 laser__.image_yscale = argument6 laser__.t_scale = argument6 - laser__.sprite_index = spr_square; return laser__; } \ No newline at end of file diff --git a/scripts/editor_mode_create_projectile/editor_mode_create_projectile.gml b/scripts/editor_mode_create_projectile/editor_mode_create_projectile.gml index 5861df72..c6fd151e 100644 --- a/scripts/editor_mode_create_projectile/editor_mode_create_projectile.gml +++ b/scripts/editor_mode_create_projectile/editor_mode_create_projectile.gml @@ -52,7 +52,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 1: //스파이크 폭발 탄막 - var tmp_ins = create_spike_circle(argument1,argument2,room_width*0.5+argument4,room_height*0.5+argument5,argument6,0,0,argument3); + var tmp_ins = create_spike_circle(room_width*0.5+argument4,room_height*0.5+argument5,argument1,argument2,argument6,0,0,argument3); tmp_ins.projectile_type = argument0; tmp_ins.m_data_arg0 = argument3; tmp_ins.m_data_arg1 = argument4; @@ -67,7 +67,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 2: //레이저 탄막 - var tmp_ins = create_laser(argument1,argument2,argument6,argument8,0,0,argument3,argument5) + var tmp_ins = create_laser(argument1,argument2,argument6,argument7,0,0,argument3,argument5) tmp_ins.image_angle = argument4; tmp_ins.projectile_type = argument0; tmp_ins.m_data_arg0 = argument3; @@ -82,7 +82,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 3: //눈꽃 탄막 - var tmp_ins = create_explo_circle(argument1,argument2,argument6,argument8,0,0,argument3,argument5,0,0,30) + var tmp_ins = create_explo_circle(argument1,argument2,argument6,argument7,0,0,argument3,argument5,0,0,30) tmp_ins.direction = argument4; tmp_ins.image_angle = argument4; tmp_ins.sprite_index = tmp_spr___; @@ -128,15 +128,15 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 6: //원형 폭발 탄막 - var tmp_ins = create_explo_circle(argument1,argument2,argument6,argument8,0,0,argument3,0,0,0,0) + var tmp_ins = create_explo_circle(argument1,argument2,argument6,argument7,0,0,argument3,0,0,0,0) tmp_ins.image_angle = argument4; tmp_ins.direction = argument4; tmp_ins.projectile_type = argument0; tmp_ins.m_data_arg0 = argument3; tmp_ins.m_data_arg1 = argument4; - tmp_ins.m_data_arg2 = 0; + tmp_ins.m_data_arg2 = argument5; tmp_ins.m_data_arg3 = argument6; - tmp_ins.m_data_arg4 = 0; + tmp_ins.m_data_arg4 = argument7; tmp_ins.m_data_arg5 = argument8; tmp_ins.m_data_arg6 = argument9; tmp_ins.m_data_arg7 = argument10; @@ -145,7 +145,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 7: //맵 밖에서 튀어나오는 탄막 - var tmp_ins = create_cylinder(argument1,argument2,obj_player.depth-1,argument3,argument6,argument5,argument8,argument4,argument9); + var tmp_ins = create_cylinder(argument1,argument2,obj_player.depth-1,argument3,argument6,argument5,argument7,argument4,argument9); tmp_ins.projectile_type = argument0; tmp_ins.m_data_arg0 = argument3; tmp_ins.m_data_arg1 = argument4; @@ -202,7 +202,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 10: //미사일 탄막 - var tmp_ins = create_square_misile(argument1,argument2,0,argument8,0,0,argument3) + var tmp_ins = create_square_misile(argument1,argument2,0,argument7,0,0,argument3) tmp_ins.direction = argument4; tmp_ins.image_angle = argument4; tmp_ins.saved_speed = argument5; @@ -329,7 +329,7 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a break; case 15: //회전하는 탄막 자동 생성기 - var tmp_ins = create_projectile_spin(argument1,argument2,tmp_spr___,argument3,argument8,argument6,0,argument5,argument7) + var tmp_ins = create_projectile_spin(argument1,argument2,tmp_spr___,argument3,argument7,argument6,0,argument5,argument7) tmp_ins.image_angle = argument4; tmp_ins.direction = argument4; tmp_ins.projectile_type = argument0; @@ -508,8 +508,8 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a tmp_ins.m_data_arg8 = 3; break; - case 24: // - var tmp_ins = instance_create_depth(argument1,argument2,obj_player.depth+15,hitbox_vaious_effects) + case 24: //세이프존 탄막 + var tmp_ins = instance_create_depth(argument1,argument2,obj_player.depth+15,hitbox_22) tmp_ins.projectile_type = argument0; tmp_ins.m_data_arg0 = argument3; tmp_ins.m_data_arg1 = argument4; @@ -519,7 +519,30 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a tmp_ins.m_data_arg5 = argument8; tmp_ins.m_data_arg6 = argument9; tmp_ins.m_data_arg7 = argument10; - tmp_ins.m_data_arg8 = 3; + tmp_ins.m_data_arg8 = argument11; + tmp_ins.image_xscale = argument3; + tmp_ins.image_yscale = argument3; + tmp_ins.image_angle = argument4-45; + tmp_ins.des_timer = argument5; + break; + + case 25: //산탄형 탄막 + var tmp_ins = instance_create_depth(argument1,argument2,obj_player.depth+15,hitbox_23) + tmp_ins.projectile_type = argument0; + tmp_ins.m_data_arg0 = argument3; + tmp_ins.m_data_arg1 = argument4; + tmp_ins.m_data_arg2 = argument5; + tmp_ins.m_data_arg3 = argument6; + tmp_ins.m_data_arg4 = argument7; + tmp_ins.m_data_arg5 = argument8; + tmp_ins.m_data_arg6 = argument9; + tmp_ins.m_data_arg7 = argument10; + tmp_ins.m_data_arg8 = argument11; + tmp_ins.image_xscale = argument3; + tmp_ins.image_yscale = argument3; + tmp_ins.image_angle = argument4; + tmp_ins.des_timer = argument5; + tmp_ins.sprite_index = tmp_spr___; break; } } \ No newline at end of file diff --git a/scripts/merge_color_new/merge_color_new.gml b/scripts/merge_color_new/merge_color_new.gml index 6c7bab79..c3705d08 100644 --- a/scripts/merge_color_new/merge_color_new.gml +++ b/scripts/merge_color_new/merge_color_new.gml @@ -11,12 +11,12 @@ function merge_color_new(argument0,argument1,argument2) global.merge_col2 = argument1; global.merge_col3 = argument2; var has_problem_col1 = 0, has_problem_col2 = 0; - if (!is_real(global.merge_col1)) + if (is_string(global.merge_col1)) { global.merge_col1 = hex_to_color(global.merge_col1,1); } - if (!is_real(global.merge_col2)) + if (is_string(global.merge_col2)) { global.merge_col2 = hex_to_color(global.merge_col2,1); } diff --git a/scripts/set_hitbox_color/set_hitbox_color.gml b/scripts/set_hitbox_color/set_hitbox_color.gml index 53a6d748..ecb15125 100644 --- a/scripts/set_hitbox_color/set_hitbox_color.gml +++ b/scripts/set_hitbox_color/set_hitbox_color.gml @@ -11,7 +11,7 @@ function set_hitbox_color(argument0,argument1,argument2,argument3) { global.w_alpha = 0; } - global.map_color = (is_real(argument0)) ? argument0 : hex_to_color(argument0,1); + global.map_color = (!is_string(argument0)) ? argument0 : hex_to_color(argument0,1); var ins_tmp = -4; if (argument1 == 1) { diff --git a/sprites/spr_editor_button/0a250b23-4a90-4b5b-93b9-f82fb4f5575f.png b/sprites/spr_editor_button/0a250b23-4a90-4b5b-93b9-f82fb4f5575f.png index 1095a6e2961dc9e90d48885f1a4cba1021713cb5..59a1ba37216484ff3903843c5d4fdf83cb55314a 100644 GIT binary patch literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`4wT?iPNIiD8_J1de}yKIeU=iIi{ha}(2P3zvWX`R8uSSJU52Ces-YNHWYJ zl8~`#xL5sp@A-W_D>pFer7&ch&yiv@Vz{fwydy@>|F0~gQNy*m`vtGg=C9p4 z`8`k4VLQf>RE7dJgPU*8uE=COBUjPXa(0C#qYBTTZ(GxA|4uo(;xMy^5_vigbCgUe#A+dr!GY3ns8tH17;-gx@| zef0yv((A^Z7Ng;0K7b|d4KY4(}x`_uzd7}lox-%|e=df;48`0wbX`3%{YuCtt6 z{Z}`Y$z%SVFIWFfGh$q_-)hCK0^RLwE4~?<#qMO-vfjv^$)pW$c-+~*Q1kn{o!j}x z6BvT-{rh{SbXolUTl2qf`CZwtmOIw^$j9&Z?X13T{;oLT>A^{Y?LPNpZ`VKjD7%jF zLE9V-slRu3e+TI}+woeaOhu=*XtjiG|2)o?VqS)HU^w9=o-(Z{YFpnG#Hdmq67y-R zZID{Sm-7$3|4Zx!dTPZ7%No&jAN9XXG&rv-R>hRjbAv(augqGTX(t#~ty`hpr<%t* zVc)I)TMUodGHR_`qTR3gj&nis!ur}h*BSnQ{kU26O!I!bx=B+iJEB=$MFfjAhT7RT z81M(rV>sOylwWts=7*8MIa5$-S;#zNFXv-X&Q4A=Gq1ZRt5&eH?nh3H00)|WTsW(*1*(y`2tXb2Hb{{%-q!C alEmBs+9 literal 940 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`46>ERC+;(!=-0nsrKw-JZmIL%#p`8fyR6kP-|X*P-#!1{`5D%f{OVZ{nf$Ll zv6N$BEW>8=r@JM}_!fpTXqWC>VbWl}c7~O)B*PsueU`hW(aYCw<9KkVMtMhk4MXhv z{lPBm51ySDmpyRu?0j`IhWYQWchu-79DNc0)yePI<%l~h9{=0_UMuD84A#|a2yQ=n zKT$W3QDxqQciBB$52n;4?OLm;*05!=V`TQ3Scg}fJF9y=XWP47UxL<&$@$E?YffF?t)zA!^j624 zecNVmI#@M&X7|o!h*h2U&#+1DKvw8-gO^|WAF@O!ef`p($Z&aS{i9AspDFu(CjW>$ zSmDR8BbUiz--KH?%@}(US&VZ;4@gA5Us}GwmtlSQMYn=}-SY9{>P)z`=2 z+RGfLb8dOcVi8)?8omAH=2C{`Hx*0%Jvt%wo^76V;rH*X|G#{<$}nVn=Wy%GYBAx2 zwsq3~PH{49f111CT{5*2#(#!$%lB#j{$0}yOuVWkt`Q|Ei6yC4$wjF^iowXh$XM6V zNY}_9#K6+Z$k58bP}{)3%D^DaeQP3$hTQy=%(P0}8pNe|?*cVwz-=hW%uOvWNz5(4 Vt;d01hY6^M!PC{xWt~$(69CfuQV0M5 diff --git a/sprites/spr_editor_button/aa4eda13-4317-4760-9a83-f13ba104f55b.png b/sprites/spr_editor_button/aa4eda13-4317-4760-9a83-f13ba104f55b.png index 32d83ae799d43dcc896c7adf66e0771067c014c4..ce783f32e0a90edc1970d950c67842917361890e 100644 GIT binary patch delta 1135 zcmcb>`jK-&Vm7B6sa&+3N^@}3D+aU`L;5Y*&RHm{@y5Np=g8c4@ob^S066l zc79(JvryRK;r(Zw<&1I~Kcv5Xsb}22F^QpJ%H(oQ-vzgswxx(tr^$;aX5$Cei)v2gzS&%(E)rgzGE#xMGg+ppeEYsxkG^44qm@dFwM&&MuE-}RcI z^vBDH^uMt$y%<{e+r)AjEdDUvS=>=O;i)Er!qfNnmj0QpXYEk(>_NJqk}_kM+Afwv z)(!fGeO3KS^Zrj%<12u|s$5A$BQFgLZvRxns8;GV`_{u=+ElG^)dC zv+e@E*trUPzU>Zc|5R+LS5%SrYT?q>kDb3hd4Y2AkNSB+9t`TQE(HI36V}dBpy2hx zL4onj?PI%Jo>jE-v;0a9&~>OPdlSpYn`q@AYn5#NL8*tKLFI$O6o!Ud_1TBcFeoQI z6$OU6KQPoM7sw`vJo~U16y~2^v0GKEo;k&)d3>JWtEuv~H47F?9`Gvl7l>(^_acpZ zh4cDUf!!DDdx54!G_PY}P&s(1#F*LT$SKaCe-C1h`ITH}JhG{zl&7a@s_=UuvE&te z2~U%o)9Cd?2K-gNO0JDW7q>kq+ok7NDBd9E^w{5mYTiuue6;hggmm~>jF z1~2(@Z+B0qWEOXXkoNL>swR$1cNo2YG_d^Ww)%7Nw!MQ|eZy4a2+Q5if5$vzPGQR7 z_Wr@}P;&{CO77%D}*&TH+c}l9D*tf{9nkMAyJj*U%uu(9p`z+{)NM+rYrez~HT| otHb1YCUG3na}xgknLL3>N)5a2)1`Nmfz~j1y85}Sb4q9e01O@10RR91 literal 720 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`4D4&xC{1wV#DrVe3;ISh|j z1k@WWXf9N1TibB>_1CIj9Q!xD|NZj2?e89KA7O{1ISY3)<(b_6aC`$}p5fyM{7e;# zXR_A|9FSgP@S{1up?j^#AH$r6(`(FrG&A@`m409kKft+~zn+Kj&&_&?e-cb5ko@rH zBG3O%>lGS=|2eZTS!CY-zSLRZfNL19BZGLfE)(OPgI>2C81lC`aWL&Tct(-qft#_L zLc{E{+j#A^<^HbwC17)$jh;aQkAyq?Nwu1#ia*#+0V7zo#5JNMC9x#cD!C{XNHG{0 z7#Zst8tEDtgcurI85jYPwt<0_fr0Z9tvnPBx%nxXX_dG&82y}d38+B>ZbM0CZfbE! ZVr~I$J*jUt^8)oSc)I$ztaD0e0s#MR=V|}| diff --git a/sprites/spr_editor_button/layers/0a250b23-4a90-4b5b-93b9-f82fb4f5575f/8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png b/sprites/spr_editor_button/layers/0a250b23-4a90-4b5b-93b9-f82fb4f5575f/8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png index 1095a6e2961dc9e90d48885f1a4cba1021713cb5..59a1ba37216484ff3903843c5d4fdf83cb55314a 100644 GIT binary patch literal 983 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`4wT?iPNIiD8_J1de}yKIeU=iIi{ha}(2P3zvWX`R8uSSJU52Ces-YNHWYJ zl8~`#xL5sp@A-W_D>pFer7&ch&yiv@Vz{fwydy@>|F0~gQNy*m`vtGg=C9p4 z`8`k4VLQf>RE7dJgPU*8uE=COBUjPXa(0C#qYBTTZ(GxA|4uo(;xMy^5_vigbCgUe#A+dr!GY3ns8tH17;-gx@| zef0yv((A^Z7Ng;0K7b|d4KY4(}x`_uzd7}lox-%|e=df;48`0wbX`3%{YuCtt6 z{Z}`Y$z%SVFIWFfGh$q_-)hCK0^RLwE4~?<#qMO-vfjv^$)pW$c-+~*Q1kn{o!j}x z6BvT-{rh{SbXolUTl2qf`CZwtmOIw^$j9&Z?X13T{;oLT>A^{Y?LPNpZ`VKjD7%jF zLE9V-slRu3e+TI}+woeaOhu=*XtjiG|2)o?VqS)HU^w9=o-(Z{YFpnG#Hdmq67y-R zZID{Sm-7$3|4Zx!dTPZ7%No&jAN9XXG&rv-R>hRjbAv(augqGTX(t#~ty`hpr<%t* zVc)I)TMUodGHR_`qTR3gj&nis!ur}h*BSnQ{kU26O!I!bx=B+iJEB=$MFfjAhT7RT z81M(rV>sOylwWts=7*8MIa5$-S;#zNFXv-X&Q4A=Gq1ZRt5&eH?nh3H00)|WTsW(*1*(y`2tXb2Hb{{%-q!C alEmBs+9 literal 940 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`46>ERC+;(!=-0nsrKw-JZmIL%#p`8fyR6kP-|X*P-#!1{`5D%f{OVZ{nf$Ll zv6N$BEW>8=r@JM}_!fpTXqWC>VbWl}c7~O)B*PsueU`hW(aYCw<9KkVMtMhk4MXhv z{lPBm51ySDmpyRu?0j`IhWYQWchu-79DNc0)yePI<%l~h9{=0_UMuD84A#|a2yQ=n zKT$W3QDxqQciBB$52n;4?OLm;*05!=V`TQ3Scg}fJF9y=XWP47UxL<&$@$E?YffF?t)zA!^j624 zecNVmI#@M&X7|o!h*h2U&#+1DKvw8-gO^|WAF@O!ef`p($Z&aS{i9AspDFu(CjW>$ zSmDR8BbUiz--KH?%@}(US&VZ;4@gA5Us}GwmtlSQMYn=}-SY9{>P)z`=2 z+RGfLb8dOcVi8)?8omAH=2C{`Hx*0%Jvt%wo^76V;rH*X|G#{<$}nVn=Wy%GYBAx2 zwsq3~PH{49f111CT{5*2#(#!$%lB#j{$0}yOuVWkt`Q|Ei6yC4$wjF^iowXh$XM6V zNY}_9#K6+Z$k58bP}{)3%D^DaeQP3$hTQy=%(P0}8pNe|?*cVwz-=hW%uOvWNz5(4 Vt;d01hY6^M!PC{xWt~$(69CfuQV0M5 diff --git a/sprites/spr_editor_button/layers/aa4eda13-4317-4760-9a83-f13ba104f55b/8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png b/sprites/spr_editor_button/layers/aa4eda13-4317-4760-9a83-f13ba104f55b/8f8ff6a4-4857-4fe1-88ea-c2eed77ff69c.png index 32d83ae799d43dcc896c7adf66e0771067c014c4..ce783f32e0a90edc1970d950c67842917361890e 100644 GIT binary patch delta 1135 zcmcb>`jK-&Vm7B6sa&+3N^@}3D+aU`L;5Y*&RHm{@y5Np=g8c4@ob^S066l zc79(JvryRK;r(Zw<&1I~Kcv5Xsb}22F^QpJ%H(oQ-vzgswxx(tr^$;aX5$Cei)v2gzS&%(E)rgzGE#xMGg+ppeEYsxkG^44qm@dFwM&&MuE-}RcI z^vBDH^uMt$y%<{e+r)AjEdDUvS=>=O;i)Er!qfNnmj0QpXYEk(>_NJqk}_kM+Afwv z)(!fGeO3KS^Zrj%<12u|s$5A$BQFgLZvRxns8;GV`_{u=+ElG^)dC zv+e@E*trUPzU>Zc|5R+LS5%SrYT?q>kDb3hd4Y2AkNSB+9t`TQE(HI36V}dBpy2hx zL4onj?PI%Jo>jE-v;0a9&~>OPdlSpYn`q@AYn5#NL8*tKLFI$O6o!Ud_1TBcFeoQI z6$OU6KQPoM7sw`vJo~U16y~2^v0GKEo;k&)d3>JWtEuv~H47F?9`Gvl7l>(^_acpZ zh4cDUf!!DDdx54!G_PY}P&s(1#F*LT$SKaCe-C1h`ITH}JhG{zl&7a@s_=UuvE&te z2~U%o)9Cd?2K-gNO0JDW7q>kq+ok7NDBd9E^w{5mYTiuue6;hggmm~>jF z1~2(@Z+B0qWEOXXkoNL>swR$1cNo2YG_d^Ww)%7Nw!MQ|eZy4a2+Q5if5$vzPGQR7 z_Wr@}P;&{CO77%D}*&TH+c}l9D*tf{9nkMAyJj*U%uu(9p`z+{)NM+rYrez~HT| otHb1YCUG3na}xgknLL3>N)5a2)1`Nmfz~j1y85}Sb4q9e01O@10RR91 literal 720 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS3dtTpz6=aiYC!Q828LfC`4D4&xC{1wV#DrVe3;ISh|j z1k@WWXf9N1TibB>_1CIj9Q!xD|NZj2?e89KA7O{1ISY3)<(b_6aC`$}p5fyM{7e;# zXR_A|9FSgP@S{1up?j^#AH$r6(`(FrG&A@`m409kKft+~zn+Kj&&_&?e-cb5ko@rH zBG3O%>lGS=|2eZTS!CY-zSLRZfNL19BZGLfE)(OPgI>2C81lC`aWL&Tct(-qft#_L zLc{E{+j#A^<^HbwC17)$jh;aQkAyq?Nwu1#ia*#+0V7zo#5JNMC9x#cD!C{XNHG{0 z7#Zst8tEDtgcurI85jYPwt<0_fr0Z9tvnPBx%nxXX_dG&82y}d38+B>ZbM0CZfbE! ZVr~I$J*jUt^8)oSc)I$ztaD0e0s#MR=V|}| diff --git a/sprites/spr_square_line/spr_square_line.yy b/sprites/spr_square_line/spr_square_line.yy index b3559613..fcada35f 100644 --- a/sprites/spr_square_line/spr_square_line.yy +++ b/sprites/spr_square_line/spr_square_line.yy @@ -6,7 +6,7 @@ "bbox_left": 0, "bbox_right": 511, "bbox_top": 0, - "bboxMode": 0, + "bboxMode": 1, "collisionKind": 5, "collisionTolerance": 0, "DynamicTexturePage": false, diff --git a/timelines/bamguy_timeline/moment_507.gml b/timelines/bamguy_timeline/moment_507.gml index 4961f291..ce14dc89 100644 --- a/timelines/bamguy_timeline/moment_507.gml +++ b/timelines/bamguy_timeline/moment_507.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/fukurou_timeline/moment_1489.gml b/timelines/fukurou_timeline/moment_1489.gml index ecb9c444..698696ab 100644 --- a/timelines/fukurou_timeline/moment_1489.gml +++ b/timelines/fukurou_timeline/moment_1489.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5+562,room_height*0.5+332,depth ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/fukurou_timeline/moment_1854.gml b/timelines/fukurou_timeline/moment_1854.gml index 2bd202d7..4b6bd916 100644 --- a/timelines/fukurou_timeline/moment_1854.gml +++ b/timelines/fukurou_timeline/moment_1854.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5+640,room_height*0.5,depth,hit ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/fukurou_timeline/moment_2488.gml b/timelines/fukurou_timeline/moment_2488.gml index 62607f45..d1d56324 100644 --- a/timelines/fukurou_timeline/moment_2488.gml +++ b/timelines/fukurou_timeline/moment_2488.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/phony_timeline/moment_1312.gml b/timelines/phony_timeline/moment_1312.gml index a9b28887..c11e5ff0 100644 --- a/timelines/phony_timeline/moment_1312.gml +++ b/timelines/phony_timeline/moment_1312.gml @@ -16,4 +16,5 @@ var ins_tmp = instance_create_depth(room_width*0.5+640,room_height*0.5,depth,hit ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/phony_timeline/moment_2325.gml b/timelines/phony_timeline/moment_2325.gml index 2bd202d7..4b6bd916 100644 --- a/timelines/phony_timeline/moment_2325.gml +++ b/timelines/phony_timeline/moment_2325.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5+640,room_height*0.5,depth,hit ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/phony_timeline/moment_2666.gml b/timelines/phony_timeline/moment_2666.gml index f4c08268..401c1564 100644 --- a/timelines/phony_timeline/moment_2666.gml +++ b/timelines/phony_timeline/moment_2666.gml @@ -5,4 +5,5 @@ if (global.t_selected_difficulty == 0) ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; + ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/phony_timeline/moment_2838.gml b/timelines/phony_timeline/moment_2838.gml index f026d3cb..b2edba7d 100644 --- a/timelines/phony_timeline/moment_2838.gml +++ b/timelines/phony_timeline/moment_2838.gml @@ -4,4 +4,5 @@ if (global.t_selected_difficulty == 0) ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; + ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/phony_timeline/moment_972.gml b/timelines/phony_timeline/moment_972.gml index 2bb39e24..422db04c 100644 --- a/timelines/phony_timeline/moment_972.gml +++ b/timelines/phony_timeline/moment_972.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5-640,room_height*0.5,depth,hit ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/shelter_timeline/moment_1005.gml b/timelines/shelter_timeline/moment_1005.gml index 4961f291..ce14dc89 100644 --- a/timelines/shelter_timeline/moment_1005.gml +++ b/timelines/shelter_timeline/moment_1005.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/shelter_timeline/moment_1275.gml b/timelines/shelter_timeline/moment_1275.gml index 951bc1ce..25f87652 100644 --- a/timelines/shelter_timeline/moment_1275.gml +++ b/timelines/shelter_timeline/moment_1275.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5+512,depth,hit ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/shelter_timeline/moment_1850.gml b/timelines/shelter_timeline/moment_1850.gml index d07aa3d7..80dfbe73 100644 --- a/timelines/shelter_timeline/moment_1850.gml +++ b/timelines/shelter_timeline/moment_1850.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5-512,depth,hit ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/shelter_timeline/moment_3578.gml b/timelines/shelter_timeline/moment_3578.gml index 6497939c..7d9df723 100644 --- a/timelines/shelter_timeline/moment_3578.gml +++ b/timelines/shelter_timeline/moment_3578.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.3,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/shelter_timeline/moment_700.gml b/timelines/shelter_timeline/moment_700.gml index d07aa3d7..80dfbe73 100644 --- a/timelines/shelter_timeline/moment_700.gml +++ b/timelines/shelter_timeline/moment_700.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5-512,depth,hit ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/turisumo_timeline/moment_0.gml b/timelines/turisumo_timeline/moment_0.gml index a553caa3..aecfb104 100644 --- a/timelines/turisumo_timeline/moment_0.gml +++ b/timelines/turisumo_timeline/moment_0.gml @@ -32,4 +32,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/turisumo_timeline/moment_170.gml b/timelines/turisumo_timeline/moment_170.gml index bf031b79..7b78966f 100644 --- a/timelines/turisumo_timeline/moment_170.gml +++ b/timelines/turisumo_timeline/moment_170.gml @@ -4,4 +4,5 @@ if (global.t_selected_difficulty == 0) ins_tmp.image_xscale = 1.25; ins_tmp.image_yscale = 1.25; ins_tmp.des_timer = 180; + ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/turisumo_timeline/moment_2532.gml b/timelines/turisumo_timeline/moment_2532.gml index 17968a79..b042c6a3 100644 --- a/timelines/turisumo_timeline/moment_2532.gml +++ b/timelines/turisumo_timeline/moment_2532.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5-232,room_height*0.5+323,depth ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/turisumo_timeline/moment_888.gml b/timelines/turisumo_timeline/moment_888.gml index 07e1b1eb..467a250d 100644 --- a/timelines/turisumo_timeline/moment_888.gml +++ b/timelines/turisumo_timeline/moment_888.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.4,depth,hitbox_ ins_tmp.image_xscale = 0.65; ins_tmp.image_yscale = 0.65; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakgoodhyang_timeline/moment_1860.gml b/timelines/wakgoodhyang_timeline/moment_1860.gml index 6497939c..7d9df723 100644 --- a/timelines/wakgoodhyang_timeline/moment_1860.gml +++ b/timelines/wakgoodhyang_timeline/moment_1860.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.3,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakgoodhyang_timeline/moment_2034.gml b/timelines/wakgoodhyang_timeline/moment_2034.gml index 4961f291..ce14dc89 100644 --- a/timelines/wakgoodhyang_timeline/moment_2034.gml +++ b/timelines/wakgoodhyang_timeline/moment_2034.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakgoodhyang_timeline/moment_3258.gml b/timelines/wakgoodhyang_timeline/moment_3258.gml index 6497939c..7d9df723 100644 --- a/timelines/wakgoodhyang_timeline/moment_3258.gml +++ b/timelines/wakgoodhyang_timeline/moment_3258.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.3,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakgoodhyang_timeline/moment_3435.gml b/timelines/wakgoodhyang_timeline/moment_3435.gml index 0a766f64..99e30ade 100644 --- a/timelines/wakgoodhyang_timeline/moment_3435.gml +++ b/timelines/wakgoodhyang_timeline/moment_3435.gml @@ -16,4 +16,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakgoodhyang_timeline/moment_3937.gml b/timelines/wakgoodhyang_timeline/moment_3937.gml index 62607f45..d1d56324 100644 --- a/timelines/wakgoodhyang_timeline/moment_3937.gml +++ b/timelines/wakgoodhyang_timeline/moment_3937.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.5,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakrio_timeline/moment_1293.gml b/timelines/wakrio_timeline/moment_1293.gml index 4961f291..ce14dc89 100644 --- a/timelines/wakrio_timeline/moment_1293.gml +++ b/timelines/wakrio_timeline/moment_1293.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakrio_timeline/moment_1740.gml b/timelines/wakrio_timeline/moment_1740.gml index 6497939c..7d9df723 100644 --- a/timelines/wakrio_timeline/moment_1740.gml +++ b/timelines/wakrio_timeline/moment_1740.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.3,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakrio_timeline/moment_2757.gml b/timelines/wakrio_timeline/moment_2757.gml index 4961f291..ce14dc89 100644 --- a/timelines/wakrio_timeline/moment_2757.gml +++ b/timelines/wakrio_timeline/moment_2757.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.7,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file diff --git a/timelines/wakrio_timeline/moment_3210.gml b/timelines/wakrio_timeline/moment_3210.gml index 6497939c..7d9df723 100644 --- a/timelines/wakrio_timeline/moment_3210.gml +++ b/timelines/wakrio_timeline/moment_3210.gml @@ -4,4 +4,5 @@ var ins_tmp = instance_create_depth(room_width*0.3,room_height*0.5,depth,hitbox_ ins_tmp.image_xscale = 0.85; ins_tmp.image_yscale = 0.85; ins_tmp.des_timer = 180; +ins_tmp.image_angle = -45; } \ No newline at end of file