Skip to content

Commit

Permalink
2024_01_15
Browse files Browse the repository at this point in the history
artifact bug fixed
music list bug fixed
optimizing
etc.
  • Loading branch information
ABER1047 committed Jan 14, 2024
1 parent 49b8378 commit 1dc0c8b
Show file tree
Hide file tree
Showing 17 changed files with 6,212 additions and 5,063 deletions.
Binary file not shown.
Binary file modified fonts/light_font/light_font.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,511 changes: 2,037 additions & 1,474 deletions fonts/light_font/light_font.old.yy

Large diffs are not rendered by default.

Binary file modified fonts/light_font/light_font.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,346 changes: 1,383 additions & 963 deletions fonts/light_font/light_font.yy

Large diffs are not rendered by default.

Binary file modified fonts/normal_font/normal_font.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,084 changes: 1,614 additions & 1,470 deletions fonts/normal_font/normal_font.old.yy

Large diffs are not rendered by default.

Binary file modified fonts/normal_font/normal_font.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,271 changes: 1,137 additions & 1,134 deletions fonts/normal_font/normal_font.yy

Large diffs are not rendered by default.

Binary file modified imgs/banner_img.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified imgs/roadmap.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 4 additions & 8 deletions objects/code/Create_0.gml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/// @description Insert description here
// You can write your code in this editor
global.version_real = "1.01";
global.version_real = "1.02";
global.version = "Release "+string(global.version_real);
global.beta_tester = 0;
global.streamer = 0;
Expand Down Expand Up @@ -283,7 +283,7 @@ global.none_cleared_music_num = 0
//언락된 곡 총 갯수
global.unlocked_music_num = 0

var total_original_map = 26;
var total_original_map = 29;
global.origin_total_map = total_original_map;
global.total_map = total_original_map;
outside_of_window = -4
Expand Down Expand Up @@ -892,16 +892,12 @@ global.both_difficulty_num = 0;
for(var i = 0; i < global.total_map; i++)
{
var tmp_type = global.real_obtainable_type[i];
if (tmp_type == 8 || tmp_type == 17)
{
tmp_type = 5
}
else if (tmp_type > 7)
if (tmp_type >= 9)
{
tmp_type -= 9;
}

if (tmp_type <= 17)
if (tmp_type != 8 && tmp_type < 17)
{
global.max_artifact_owned[tmp_type]++;
}
Expand Down
2 changes: 1 addition & 1 deletion objects/code/Draw_73.gml
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ if global.clock_alpha_1 > 0



if global.select_map != 0 && abs(obj_player.image_xscale) < 0.1
if (global.select_map != 0 && instance_exists(obj_player) && abs(obj_player.image_xscale) < 0.1 && instance_exists(obj_album_ui))
{
for(var i = 0; i < global.total_map; i++)
{
Expand Down
4 changes: 2 additions & 2 deletions objects/code/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ if (global.show_progress_bar == 1 || global.tutorial_now == 1)
if (global.tutorial_played != 1 && global.tutorial_n_stage == 0)
{
//튜토리얼
if !instance_exists(obj_stage_clear) && global.paused != 1
if (!instance_exists(obj_stage_clear) && global.paused != 1)
{
instance_create_depth(global.c_w+128,irandom_range(global.c_y,global.c_h),obj_player.depth-1,obj_stage_clear)
}
Expand Down Expand Up @@ -500,7 +500,7 @@ if (global.show_progress_bar == 1 || global.tutorial_now == 1)
}
else //첫 튜토리얼 안 했을경우
{
if (!instance_exists(obj_stage_clear) && global.paused == 0)
if (!instance_exists(obj_stage_clear) && global.paused != 1)
{
instance_create_depth(global.c_w+128,room_height*0.5,obj_player.depth-1,obj_stage_clear)
global.t_bg_color = 1;
Expand Down
23 changes: 15 additions & 8 deletions objects/code/Step_1.gml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if (fps_real >= 58)
{
global.low_graphics = false;
}

if (global.n_music_title == "왁트모르즈비")
{
global.tutorial_now = 1;
Expand Down Expand Up @@ -357,9 +358,18 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 &
global.unlocked_music_name_new_list[check_new_song] = "Project Wak Beat 정식 출시";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "일부 곡이 보이지 않던 버그 수정 (이세돌향 100%, Kidding, 우마무스메)";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "새로운 곡 추가! - 어푸 (Cover by 주르르 Jururu)";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "모바일 화면 비율 버그(글씨 및 이미지 깨짐 현상) 수정";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 리메이크 - FightFifthDeusExMachina_Letheia();";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 시스템 리메이크 - 기존 맵 파일이 정상 작동 하지 않을 수 있음";
check_new_song ++;

Expand All @@ -377,9 +387,6 @@ if (global.b_alpha < 0.1 && global.t_b_alpha <= 0 && global.t_b_alpha != -0.02 &

global.unlocked_music_name_new_list[check_new_song] = "플래쉬 효과 끄기 기능 추가";
check_new_song ++;

global.unlocked_music_name_new_list[check_new_song] = "커스텀 맵 리메이크 - FightFifthDeusExMachina_Letheia();";
check_new_song ++;
}

if (global.saved_notice_title != "새로운 소식!")
Expand Down Expand Up @@ -604,19 +611,19 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1
{
if (global.n_map_list == 0)
{
global.n_map_id = n_stage
global.n_map_id = fix_num_inside(n_stage,0,255);
}
else if (global.n_map_list == 1)
{
global.n_map_id = global.fav_map_id[n_stage]
global.n_map_id = fix_num_inside(global.fav_map_id[n_stage],0,255);
}
else if (global.n_map_list == 2)
{
global.n_map_id = n_stage
global.n_map_id = fix_num_inside(n_stage,0,255);
}
else if (global.n_map_list == 3 || global.n_map_list == 4 || global.n_map_list == 5)
{
global.n_map_id = global.map_id_origin[n_stage]
global.n_map_id = fix_num_inside(global.map_id_origin[n_stage],0,255);
}

if (global.n_map_id <= 0)
Expand Down Expand Up @@ -794,7 +801,7 @@ global.rank_display_b_alpha += (0 - global.rank_display_b_alpha)*0.1

if gamestart = 2 && global.show_progress_bar = 0 && global.n_progress > 1000
{
if !instance_exists(obj_stage_clear) && global.paused != 1
if (!instance_exists(obj_stage_clear) && global.paused != 1)
{
instance_create_depth(global.c_w+128,irandom_range(global.c_y,global.c_h),obj_player.depth-1,obj_stage_clear)
}
Expand Down
10 changes: 8 additions & 2 deletions objects/obj_savepoint/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ if image_angle = 0

if (global.n_progress >= global.music_duration && global.map_editor != 1)
{
instance_create_depth(room_width+128,irandom_range(0,room_height),obj_player.depth-1,obj_stage_clear)
if (!instance_exists(obj_stage_clear) && global.paused != 1)
{
instance_create_depth(room_width+128,irandom_range(0,room_height),obj_player.depth-1,obj_stage_clear)
}
global.show_progress_bar = 0

instance_destroy(hitbox_parents)
Expand Down Expand Up @@ -47,7 +50,10 @@ else

if global.n_progress >= global.music_duration
{
instance_create_depth(irandom_range(0,room_width),-128,obj_player.depth-1,obj_stage_clear)
if (!instance_exists(obj_stage_clear) && global.paused != 1)
{
instance_create_depth(irandom_range(0,room_width),-128,obj_player.depth-1,obj_stage_clear)
}
global.show_progress_bar = 0

instance_destroy(hitbox_parents)
Expand Down
12 changes: 11 additions & 1 deletion objects/obj_stage_clear/Step_0.gml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
/// @description Insert description here
// You can write your code in this editor
if (global.play_custom_map != 1)
if (global.play_custom_map != 1 && global.n_map_list != 2)
{
var tmp_val = global.real_obtainable_type[global.n_map_id];
var tmp_artifact_type = (tmp_val >= 9) ? tmp_val-9 : tmp_val;
if (tmp_artifact_type == 8)
{
global.artifact_type = irandom_range(1,6);
}
else
{
global.artifact_type = tmp_artifact_type;
}
image_index = (sprite_index == spr_player) ? global.artifact_type*7 : global.artifact_type;
}

Expand Down

0 comments on commit 1dc0c8b

Please sign in to comment.