Skip to content

Commit

Permalink
2023_09_10
Browse files Browse the repository at this point in the history 
added new animation (partner unlock animation)
added/changed some effects
fixed minor bugs
fixed major bugs
etc.
  • Loading branch information
@ABER1047
ABER1047 committed Sep 10, 2023
1 parent a5d15d2 commit 818dfb7
Show file tree
Hide file tree
Showing 48 changed files with 915 additions and 700 deletions.
49 changes: 25 additions & 24 deletions Just Wak and Beats.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
{"name":"tutorial_part4_timeline","order":6,"path":"timelines/tutorial_part4_timeline/tutorial_part4_timeline.yy",},
{"name":"spr_circle_dot_outline","order":41,"path":"sprites/spr_circle_dot_outline/spr_circle_dot_outline.yy",},
{"name":"shader","order":1,"path":"shaders/shader/shader.yy",},
{"name":"lockdown","order":24,"path":"sounds/lockdown/lockdown.yy",},
{"name":"lockdown","order":25,"path":"sounds/lockdown/lockdown.yy",},
{"name":"glow_sfx","order":9,"path":"sounds/glow_sfx/glow_sfx.yy",},
{"name":"spr_player","order":3,"path":"sprites/spr_player/spr_player.yy",},
{"name":"fukurou","order":7,"path":"sounds/fukurou/fukurou.yy",},
{"name":"fukurou","order":8,"path":"sounds/fukurou/fukurou.yy",},
{"name":"hex_to_color","order":2,"path":"scripts/hex_to_color/hex_to_color.yy",},
{"name":"send_much","order":1,"path":"scripts/send_much/send_much.yy",},
{"name":"send_all","order":2,"path":"scripts/send_all/send_all.yy",},
Expand All @@ -46,7 +46,7 @@
{"name":"Note5","order":4,"path":"notes/Note5/Note5.yy",},
{"name":"hitbox_5","order":5,"path":"objects/hitbox_5/hitbox_5.yy",},
{"name":"hitbox_14","order":15,"path":"objects/hitbox_14/hitbox_14.yy",},
{"name":"ipad","order":11,"path":"sounds/ipad/ipad.yy",},
{"name":"ipad","order":12,"path":"sounds/ipad/ipad.yy",},
{"name":"spr_star","order":33,"path":"sprites/spr_star/spr_star.yy",},
{"name":"spr_triangle","order":9,"path":"sprites/spr_triangle/spr_triangle.yy",},
{"name":"draw_text_kl_scale","order":2,"path":"scripts/draw_text_kl_scale/draw_text_kl_scale.yy",},
Expand All @@ -60,19 +60,19 @@
{"name":"hitbox_15","order":16,"path":"objects/hitbox_15/hitbox_15.yy",},
{"name":"bamguy_timeline","order":2,"path":"timelines/bamguy_timeline/bamguy_timeline.yy",},
{"name":"hitbox_11","order":12,"path":"objects/hitbox_11/hitbox_11.yy",},
{"name":"tutorial_part4","order":6,"path":"sounds/tutorial_part4/tutorial_part4.yy",},
{"name":"tutorial_part4","order":7,"path":"sounds/tutorial_part4/tutorial_part4.yy",},
{"name":"spr_list_name","order":6,"path":"sprites/spr_list_name/spr_list_name.yy",},
{"name":"obj_savepoint","order":4,"path":"objects/obj_savepoint/obj_savepoint.yy",},
{"name":"dead_sfx","order":5,"path":"sounds/dead_sfx/dead_sfx.yy",},
{"name":"minus_return_zero","order":7,"path":"scripts/minus_return_zero/minus_return_zero.yy",},
{"name":"spr_triangle_empty","order":35,"path":"sprites/spr_triangle_empty/spr_triangle_empty.yy",},
{"name":"rewind_timeline","order":10,"path":"timelines/rewind_timeline/rewind_timeline.yy",},
{"name":"Yoong","order":13,"path":"sounds/Yoong/Yoong.yy",},
{"name":"tutorial_part1","order":3,"path":"sounds/tutorial_part1/tutorial_part1.yy",},
{"name":"Yoong","order":14,"path":"sounds/Yoong/Yoong.yy",},
{"name":"tutorial_part1","order":4,"path":"sounds/tutorial_part1/tutorial_part1.yy",},
{"name":"spr_level_bar","order":11,"path":"sprites/spr_level_bar/spr_level_bar.yy",},
{"name":"isedolhyang","order":16,"path":"sounds/isedolhyang/isedolhyang.yy",},
{"name":"winter_spring","order":15,"path":"sounds/winter_spring/winter_spring.yy",},
{"name":"tutorial_part2","order":4,"path":"sounds/tutorial_part2/tutorial_part2.yy",},
{"name":"isedolhyang","order":17,"path":"sounds/isedolhyang/isedolhyang.yy",},
{"name":"winter_spring","order":16,"path":"sounds/winter_spring/winter_spring.yy",},
{"name":"tutorial_part2","order":5,"path":"sounds/tutorial_part2/tutorial_part2.yy",},
{"name":"circle_x2048","order":1,"path":"sprites/circle_x2048/circle_x2048.yy",},
{"name":"load_custom_map_num","order":3,"path":"scripts/load_custom_map_num/load_custom_map_num.yy",},
{"name":"check_distance","order":5,"path":"scripts/check_distance/check_distance.yy",},
Expand All @@ -85,7 +85,7 @@
{"name":"ipad_timeline","order":11,"path":"timelines/ipad_timeline/ipad_timeline.yy",},
{"name":"hitbox_8","order":8,"path":"objects/hitbox_8/hitbox_8.yy",},
{"name":"square_misile","order":10,"path":"objects/square_misile/square_misile.yy",},
{"name":"promise","order":19,"path":"sounds/promise/promise.yy",},
{"name":"promise","order":20,"path":"sounds/promise/promise.yy",},
{"name":"spr_spike_cylinder","order":42,"path":"sprites/spr_spike_cylinder/spr_spike_cylinder.yy",},
{"name":"rewinding_sfx","order":4,"path":"sounds/rewinding_sfx/rewinding_sfx.yy",},
{"name":"create_cylinder","order":9,"path":"scripts/create_cylinder/create_cylinder.yy",},
Expand All @@ -101,10 +101,10 @@
{"name":"wakgood_hurt","order":1,"path":"sounds/wakgood_hurt/wakgood_hurt.yy",},
{"name":"ding","order":1,"path":"sounds/ding/ding.yy",},
{"name":"wakrio_timeline","order":1,"path":"timelines/wakrio_timeline/wakrio_timeline.yy",},
{"name":"wakrio","order":1,"path":"sounds/wakrio/wakrio.yy",},
{"name":"wakrio","order":2,"path":"sounds/wakrio/wakrio.yy",},
{"name":"hitbox_9","order":9,"path":"objects/hitbox_9/hitbox_9.yy",},
{"name":"yuha","order":21,"path":"sounds/yuha/yuha.yy",},
{"name":"roki","order":22,"path":"sounds/roki/roki.yy",},
{"name":"yuha","order":22,"path":"sounds/yuha/yuha.yy",},
{"name":"roki","order":23,"path":"sounds/roki/roki.yy",},
{"name":"spr_end","order":4,"path":"sprites/spr_end/spr_end.yy",},
{"name":"spr_circle_outline","order":10,"path":"sprites/spr_circle_outline/spr_circle_outline.yy",},
{"name":"create_worm","order":7,"path":"scripts/create_worm/create_worm.yy",},
Expand All @@ -114,8 +114,8 @@
{"name":"obj_shine_ef","order":3,"path":"objects/obj_shine_ef/obj_shine_ef.yy",},
{"name":"camera_focus_on","order":6,"path":"scripts/camera_focus_on/camera_focus_on.yy",},
{"name":"Yoong_timeline","order":13,"path":"timelines/Yoong_timeline/Yoong_timeline.yy",},
{"name":"shelter","order":8,"path":"sounds/shelter/shelter.yy",},
{"name":"tutorial_part3","order":5,"path":"sounds/tutorial_part3/tutorial_part3.yy",},
{"name":"shelter","order":9,"path":"sounds/shelter/shelter.yy",},
{"name":"tutorial_part3","order":6,"path":"sounds/tutorial_part3/tutorial_part3.yy",},
{"name":"load_custom_map_files","order":4,"path":"scripts/load_custom_map_files/load_custom_map_files.yy",},
{"name":"Sprite51","order":12,"path":"sprites/Sprite51/Sprite51.yy",},
{"name":"tutorial_part2_timeline","order":4,"path":"timelines/tutorial_part2_timeline/tutorial_part2_timeline.yy",},
Expand All @@ -130,7 +130,7 @@
{"name":"spr_pipe","order":40,"path":"sprites/spr_pipe/spr_pipe.yy",},
{"name":"ding_dong","order":2,"path":"sounds/ding_dong/ding_dong.yy",},
{"name":"jururu_hurt","order":5,"path":"sounds/jururu_hurt/jururu_hurt.yy",},
{"name":"alzar","order":14,"path":"sounds/alzar/alzar.yy",},
{"name":"alzar","order":15,"path":"sounds/alzar/alzar.yy",},
{"name":"master_remix_timeline","order":18,"path":"timelines/master_remix_timeline/master_remix_timeline.yy",},
{"name":"isedolhyang_timeline","order":16,"path":"timelines/isedolhyang_timeline/isedolhyang_timeline.yy",},
{"name":"gungsirung_timeline","order":17,"path":"timelines/gungsirung_timeline/gungsirung_timeline.yy",},
Expand All @@ -142,7 +142,7 @@
{"name":"hitbox_7","order":7,"path":"objects/hitbox_7/hitbox_7.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",},
{"name":"bamguy","order":3,"path":"sounds/bamguy/bamguy.yy",},
{"name":"explosion_effect","order":2,"path":"objects/explosion_effect/explosion_effect.yy",},
{"name":"view_shake","order":3,"path":"scripts/view_shake/view_shake.yy",},
{"name":"alzar_timeline","order":14,"path":"timelines/alzar_timeline/alzar_timeline.yy",},
Expand All @@ -152,16 +152,16 @@
{"name":"spr_circle_spike","order":6,"path":"sprites/spr_circle_spike/spr_circle_spike.yy",},
{"name":"spr_gear","order":14,"path":"sprites/spr_gear/spr_gear.yy",},
{"name":"spr_square","order":20,"path":"sprites/spr_square/spr_square.yy",},
{"name":"phony","order":12,"path":"sounds/phony/phony.yy",},
{"name":"phony","order":13,"path":"sounds/phony/phony.yy",},
{"name":"convert_rank_to_num","order":4,"path":"scripts/convert_rank_to_num/convert_rank_to_num.yy",},
{"name":"circle_effect","order":4,"path":"objects/circle_effect/circle_effect.yy",},
{"name":"rewind","order":10,"path":"sounds/rewind/rewind.yy",},
{"name":"rewind","order":11,"path":"sounds/rewind/rewind.yy",},
{"name":"spr_cross_outline","order":16,"path":"sprites/spr_cross_outline/spr_cross_outline.yy",},
{"name":"cleared_sfx","order":3,"path":"sounds/cleared_sfx/cleared_sfx.yy",},
{"name":"load_none_cleared_list","order":4,"path":"scripts/load_none_cleared_list/load_none_cleared_list.yy",},
{"name":"spr_status","order":4,"path":"sprites/spr_status/spr_status.yy",},
{"name":"Sprite49","order":10,"path":"sprites/Sprite49/Sprite49.yy",},
{"name":"kinmoku","order":23,"path":"sounds/kinmoku/kinmoku.yy",},
{"name":"kinmoku","order":24,"path":"sounds/kinmoku/kinmoku.yy",},
{"name":"jing_hurt","order":6,"path":"sounds/jing_hurt/jing_hurt.yy",},
{"name":"roki_timeline","order":22,"path":"timelines/roki_timeline/roki_timeline.yy",},
{"name":"favorite_sfx","order":6,"path":"sounds/favorite_sfx/favorite_sfx.yy",},
Expand All @@ -170,9 +170,9 @@
{"name":"spr_circle","order":22,"path":"sprites/spr_circle/spr_circle.yy",},
{"name":"spr_spuare_outline","order":18,"path":"sprites/spr_spuare_outline/spr_spuare_outline.yy",},
{"name":"hitbox_10","order":11,"path":"objects/hitbox_10/hitbox_10.yy",},
{"name":"turisumo","order":9,"path":"sounds/turisumo/turisumo.yy",},
{"name":"turisumo","order":10,"path":"sounds/turisumo/turisumo.yy",},
{"name":"fukurou_timeline","order":7,"path":"timelines/fukurou_timeline/fukurou_timeline.yy",},
{"name":"gungsirung","order":17,"path":"sounds/gungsirung/gungsirung.yy",},
{"name":"gungsirung","order":18,"path":"sounds/gungsirung/gungsirung.yy",},
{"name":"yuha_timeline","order":21,"path":"timelines/yuha_timeline/yuha_timeline.yy",},
{"name":"hitbox_3","order":3,"path":"objects/hitbox_3/hitbox_3.yy",},
{"name":"spr_triangle_half","order":37,"path":"sprites/spr_triangle_half/spr_triangle_half.yy",},
Expand Down Expand Up @@ -200,7 +200,7 @@
{"name":"create_explo_square","order":2,"path":"scripts/create_explo_square/create_explo_square.yy",},
{"name":"hitbox_12","order":13,"path":"objects/hitbox_12/hitbox_12.yy",},
{"name":"get_none_cleared_list_num","order":5,"path":"scripts/get_none_cleared_list_num/get_none_cleared_list_num.yy",},
{"name":"master_remix","order":18,"path":"sounds/master_remix/master_remix.yy",},
{"name":"master_remix","order":19,"path":"sounds/master_remix/master_remix.yy",},
{"name":"common_sfx1","order":11,"path":"sounds/common_sfx1/common_sfx1.yy",},
{"name":"spr_album","order":2,"path":"sprites/spr_album/spr_album.yy",},
{"name":"obj_camera","order":2,"path":"objects/obj_camera/obj_camera.yy",},
Expand All @@ -213,11 +213,12 @@
{"name":"hitbox_16","order":17,"path":"objects/hitbox_16/hitbox_16.yy",},
{"name":"Note2","order":1,"path":"notes/Note2/Note2.yy",},
{"name":"light_font","order":1,"path":"fonts/light_font/light_font.yy",},
{"name":"gomem_mashup","order":20,"path":"sounds/gomem_mashup/gomem_mashup.yy",},
{"name":"gomem_mashup","order":21,"path":"sounds/gomem_mashup/gomem_mashup.yy",},
{"name":"spr_W324","order":7,"path":"sprites/spr_W324/spr_W324.yy",},
{"name":"spr_circle_spike2","order":7,"path":"sprites/spr_circle_spike2/spr_circle_spike2.yy",},
{"name":"obj_button","order":1,"path":"objects/obj_button/obj_button.yy",},
{"name":"hitbox_13","order":14,"path":"objects/hitbox_13/hitbox_13.yy",},
{"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":"spr_circle_outline_light","order":8,"path":"sprites/spr_circle_outline_light/spr_circle_outline_light.yy",},
Expand Down
1 change: 1 addition & 0 deletions Just Wak and Beats.yyp
View file

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

22 changes: 4 additions & 18 deletions objects/code/Alarm_1.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,10 @@ if global.n_map_list != 2

if (global.real_n_rank[global.n_map_id] == "--" || global.artifact_owned[0] == 0)
{
global.artifact_owned[global.artifact_type]++
global.obtainable_type[global.n_map_id] = "완료";
global.real_n_artifact[global.n_map_id] = "완료";
}
else
{
if (global.t_selected_difficulty == 0)
{
global.artifact_owned[global.artifact_type]++
}
}



if (global.t_selected_difficulty == 0)
Expand Down Expand Up @@ -210,24 +203,17 @@ else


//커스텀 맵 클리어 내역 저장
ini_open(string(global.custom_map_directory)+"custom_map_file_"+string(global.n_map_id+1)+".JWABMAP")
ini_open(string(global.custom_map_directory)+"custom_map_file_"+string(global.n_map_id+1)+".ini")
ini_write_string("custom_n_rank","value",global.n_rank[global.n_map_id])
ini_write_string("n_rank_hardcore","value",global.n_rank_hardcore[global.n_map_id])
ini_write_string("custom_n_score","value",global.n_score[global.n_map_id])
ini_write_string("n_score_hardcore","value",global.n_score_hardcore[global.n_map_id])

if global.custom_n_artifact[global.n_map_id] != "완료"
if (global.custom_n_artifact[global.n_map_id] != "완료")
{
global.artifact_owned[global.artifact_type]++
ini_write_string("custom_n_artifact","value","완료")
}
else
{
if global.t_selected_difficulty = 0
{
global.artifact_owned[global.artifact_type]++
}
}

ini_close()
}

Expand Down
11 changes: 10 additions & 1 deletion objects/code/Alarm_11.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@ if global.dev_mode != 1
}
else
{
global.custom_map_directory = string(working_directory)+"\\Custom map files\\";
var directory_tmp = program_directory
if (!directory_exists(program_directory))
{
directory_tmp = temp_directory
}
if (!directory_exists(temp_directory))
{
directory_tmp = working_directory
}
global.custom_map_directory = string(directory_tmp)+"\\Custom map files\\";
}

42 changes: 21 additions & 21 deletions objects/code/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,67 +163,67 @@ global.acquired_skin = -4

global.unlocked_player_skin_name[0] = "우왁굳"
global.unlocked_player_skin_require_type[0] = 0;
global.unlocked_player_skin_require_num[0] = 4;
global.unlocked_player_skin_require_num[0] = 1;
global.unlocked_player_skin_name[1] = "ㅁ거"
global.unlocked_player_skin_require_type[1] = 0;
global.unlocked_player_skin_require_num[1] = 4;
global.unlocked_player_skin_require_num[1] = 6;
global.unlocked_player_skin_name[2] = "우왁굳 (왁굳향100%)"
global.unlocked_player_skin_require_type[2] = 0;
global.unlocked_player_skin_require_num[2] = 1;
global.unlocked_player_skin_require_num[2] = 2;
global.unlocked_player_skin_name[3] = "아이네 (엔젤)"
global.unlocked_player_skin_require_type[3] = 1;
global.unlocked_player_skin_require_num[3] = 2;
global.unlocked_player_skin_name[4] = "아이네"
global.unlocked_player_skin_require_type[4] = 1;
global.unlocked_player_skin_require_num[4] = 2;
global.unlocked_player_skin_name[5] = "아이네 (X-Mas)"
global.unlocked_player_skin_require_num[4] = 1;
global.unlocked_player_skin_name[5] = "아이네 (산타)"
global.unlocked_player_skin_require_type[5] = 1;
global.unlocked_player_skin_require_num[5] = 2;
global.unlocked_player_skin_require_num[5] = 3;
global.unlocked_player_skin_name[6] = "비챤"
global.unlocked_player_skin_require_type[6] = 2;
global.unlocked_player_skin_require_num[6] = 2;
global.unlocked_player_skin_require_num[6] = 1;
global.unlocked_player_skin_name[7] = "비챤 (테디 베어)"
global.unlocked_player_skin_require_type[7] = 2;
global.unlocked_player_skin_require_num[7] = 2;
global.unlocked_player_skin_name[8] = "비챤 (X-Mas)"
global.unlocked_player_skin_name[8] = "비챤 (산타)"
global.unlocked_player_skin_require_type[8] = 2;
global.unlocked_player_skin_require_num[8] = 2;
global.unlocked_player_skin_require_num[8] = 3;
global.unlocked_player_skin_name[9] = "고세구 (메이드)"
global.unlocked_player_skin_require_type[9] = 3;
global.unlocked_player_skin_require_num[9] = 2;
global.unlocked_player_skin_name[10] = "고세구"
global.unlocked_player_skin_require_type[10] = 3;
global.unlocked_player_skin_require_num[10] = 2;
global.unlocked_player_skin_name[11] = "고세구 (X-Mas)"
global.unlocked_player_skin_require_num[10] = 1;
global.unlocked_player_skin_name[11] = "고세구 (산타)"
global.unlocked_player_skin_require_type[11] = 3;
global.unlocked_player_skin_require_num[11] = 2;
global.unlocked_player_skin_require_num[11] = 3;
global.unlocked_player_skin_name[12] = "릴파 (수녀)"
global.unlocked_player_skin_require_type[12] = 4;
global.unlocked_player_skin_require_num[12] = 2;
global.unlocked_player_skin_name[13] = "릴파"
global.unlocked_player_skin_require_type[13] = 4;
global.unlocked_player_skin_require_num[13] = 2;
global.unlocked_player_skin_name[14] = "릴파 (X-Mas)"
global.unlocked_player_skin_require_num[13] = 1;
global.unlocked_player_skin_name[14] = "릴파 (산타)"
global.unlocked_player_skin_require_type[14] = 4;
global.unlocked_player_skin_require_num[14] = 2;
global.unlocked_player_skin_require_num[14] = 3;
global.unlocked_player_skin_name[15] = "주르르"
global.unlocked_player_skin_require_type[15] = 5;
global.unlocked_player_skin_require_num[15] = 2;
global.unlocked_player_skin_require_num[15] = 1;
global.unlocked_player_skin_name[16] = "주르르 (셔츠)"
global.unlocked_player_skin_require_type[16] = 5;
global.unlocked_player_skin_require_num[16] = 2;
global.unlocked_player_skin_name[17] = "주르르 (X-Mas)"
global.unlocked_player_skin_name[17] = "주르르 (산타)"
global.unlocked_player_skin_require_type[17] = 5;
global.unlocked_player_skin_require_num[17] = 2;
global.unlocked_player_skin_require_num[17] = 3;
global.unlocked_player_skin_name[18] = "징버거 (여름)"
global.unlocked_player_skin_require_type[18] = 6;
global.unlocked_player_skin_require_num[18] = 2;
global.unlocked_player_skin_name[19] = "징버거"
global.unlocked_player_skin_require_type[19] = 6;
global.unlocked_player_skin_require_num[19] = 2;
global.unlocked_player_skin_name[20] = "징버거 (X-Mas)"
global.unlocked_player_skin_require_num[19] = 1;
global.unlocked_player_skin_name[20] = "징버거 (산타)"
global.unlocked_player_skin_require_type[20] = 6;
global.unlocked_player_skin_require_num[20] = 2;
global.unlocked_player_skin_require_num[20] = 3;


for(var i = 0; i <= 11; i++)
Expand Down
Loading

0 comments on commit 818dfb7

Please sign in to comment.