Skip to content

Commit

Permalink
2023_07_26
Browse files Browse the repository at this point in the history
fixed minor bugs
etc.
  • Loading branch information
ABER1047 committed Jul 25, 2023
1 parent 34f01fd commit 6f26b4f
Show file tree
Hide file tree
Showing 9 changed files with 63 additions and 40 deletions.
54 changes: 27 additions & 27 deletions objects/code/Draw_73.gml
Original file line number Diff line number Diff line change
Expand Up @@ -108,27 +108,27 @@ for(var i = 0; i <= 5; i++)
{
if global.savepoint_position[i] != -4
{
var _xx_ = xx+xx_w*0.3+font_size*32+1433.6*font_size*(global.savepoint_position[i]/global.music_duration)
var _xx_ = xx+xx_w*0.3+font_size*32+1433.6*font_size*(global.savepoint_position[i]/global.music_duration)

draw_set_color(global.map_color)
draw_set_alpha(progress_alpha_sec*0.9)
draw_line_width(_xx_,yy+font_size*50,_xx_,yy+font_size*70,4*font_size)
draw_line_width(_xx_,yy+font_size*90,_xx_,yy+font_size*110,4*font_size)
draw_set_color(global.map_color)
draw_set_alpha(progress_alpha_sec*0.9)
draw_line_width(_xx_,yy+font_size*50,_xx_,yy+font_size*70,4*font_size)
draw_line_width(_xx_,yy+font_size*90,_xx_,yy+font_size*110,4*font_size)

if global.n_progress = global.savepoint_position[i] && !audio_is_playing(cleared_sfx)
{
if abs(global.map_speed_y) > 0
{
var save_ = instance_create_depth(0,0,obj_player.depth+1,obj_savepoint)
save_.n_savepoint_position = global.savepoint_position[i]
save_.n_color = global.savepoint_color[i]
save_.image_angle = 90
var save_ = instance_create_depth(0,0,obj_player.depth+1,obj_savepoint)
save_.n_savepoint_position = global.savepoint_position[i]
save_.n_color = global.savepoint_color[i]
save_.image_angle = 90
}
else
{
var save_ = instance_create_depth(room_width,0,obj_player.depth+1,obj_savepoint)
save_.n_savepoint_position = global.savepoint_position[i]
save_.n_color = global.savepoint_color[i]
var save_ = instance_create_depth(room_width,0,obj_player.depth+1,obj_savepoint)
save_.n_savepoint_position = global.savepoint_position[i]
save_.n_color = global.savepoint_color[i]
}
}
}
Expand All @@ -137,40 +137,40 @@ for(var i = 0; i <= 5; i++)

if global.clock_alpha_1 > 0
{
var clock_scale = (2 - global.clock_alpha_1)*font_size*4
var clock_alpha = global.clock_alpha_2*global.clock_alpha_1
var clock_scale = (2 - global.clock_alpha_1)*font_size*4
var clock_alpha = global.clock_alpha_2*global.clock_alpha_1

if clock_scale <= 0
{
clock_scale = 0
clock_scale = 0
}

for(var i = -15; i <= 15; i++)
{
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha*0.02)

draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale,clock_scale,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale,clock_scale,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale,clock_scale,0,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale,clock_scale,0,c_white,clock_alpha*0.02)

draw_sprite_ext(spr_clock,0,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,0,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,0,xx+xx_w*0.5,yy+yy_h*0.5+i*font_size*global.clock_alpha_1,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha*0.02)
draw_sprite_ext(spr_clock,0,xx+xx_w*0.5+i*font_size*global.clock_alpha_1,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha*0.02)
}
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha)
draw_sprite_ext(spr_clock,1,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,0,c_white,clock_alpha)

draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale,clock_scale,0,c_white,clock_alpha*0.5)
draw_sprite_ext(spr_rewind_clock,0,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale,clock_scale,0,c_white,clock_alpha*0.5)

draw_sprite_ext(spr_clock,0,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha)
draw_sprite_ext(spr_clock,0,xx+xx_w*0.5,yy+yy_h*0.5,clock_scale*0.5,clock_scale*0.5,global.rewind*13,c_white,clock_alpha)



draw_set_color(c_white)
draw_set_color(c_white)
for(var i = 0; i < 16; i++)
{
for(var ii = -16; ii < 16; ii++)
{
draw_set_alpha((global.rewind*0.001+clock_alpha/(1+i))*0.02)
draw_line_width(xx,yy+global.rewind_effect_line_pos[i]-global.rewind_effect_line_angle+ii,xx+xx_w,yy+global.rewind_effect_line_pos[i]+global.rewind_effect_line_angle+ii,(i*4)*font_size)
draw_set_alpha((global.rewind*0.001+clock_alpha/(1+i))*0.02)
draw_line_width(xx,yy+global.rewind_effect_line_pos[i]-global.rewind_effect_line_angle+ii,xx+xx_w,yy+global.rewind_effect_line_pos[i]+global.rewind_effect_line_angle+ii,(i*4)*font_size)
}
}
}
Expand Down
27 changes: 25 additions & 2 deletions objects/obj_album_ui/Other_11.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
// You can write your code in this editor



var most_played_index = 0;
var most_played_playtime = 0;
var total_playtime = 0;


Expand All @@ -11,6 +12,11 @@ for(var i = 1; i < global.origin_total_map; i++)
{
total_playtime += global.real_stage_playtime[i];
show_debug_message(global.real_stage_playtime[i]);
if (most_played_playtime < global.real_stage_playtime[i])
{
most_played_index = i;
most_played_playtime = global.real_stage_playtime[i];
}
}

show_debug_message("모든 곡 총 플레이 횟수 : "+string(total_playtime));
Expand All @@ -35,4 +41,21 @@ for(var i = 1; i < global.origin_total_map; i++)
var index2 = irandom_range(0,global.origin_total_map+total_playtime*2-1)
show_debug_message("n = "+string(index2)+" / "+string(probablity[index2]));
var return_value = probablity[index2];
code.n_stage = return_value;
code.n_stage = return_value;


if (global.nickname != "")
{
var temp_nickname = string(global.nickname)
if (global.dev_mode == 1)
{
temp_nickname = temp_nickname+"[*_ABER]0";
}
else if (global.beta_tester == 1)
{
temp_nickname = temp_nickname+"[*_ABER]1";
}
LootLockerSetPlayerName(string(temp_nickname));
LootLockerSubmitScore("Most_played_map",real(most_played_index));
LootLockerSetPlayerName(string(temp_nickname));
}
4 changes: 2 additions & 2 deletions timelines/promise_timeline/moment_0.gml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

if global.t_selected_difficulty = 1
{
global.savepoint_position[0] = 2300
global.savepoint_color[0] = #344a87
global.savepoint_position[0] = 2300
global.savepoint_color[0] = #344a87
}


Expand Down
5 changes: 5 additions & 0 deletions timelines/roki_timeline/moment_1290.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
var tmp = create_laser(room_width*0.5,room_height*0.5,60,200,1,0,1,-0.9)
tmp.image_angle = 0
var tmp = create_laser(room_width*0.5,room_height*0.5,60,200,1,0,1,-0.9)
tmp.image_angle = 180

6 changes: 1 addition & 5 deletions timelines/roki_timeline/moment_1350.gml
Original file line number Diff line number Diff line change
@@ -1,5 +1 @@
var tmp = create_laser(room_width*0.5,room_height*0.5,60,200,1,0,1,-0.9)
tmp.image_angle = 0
var tmp = create_laser(room_width*0.5,room_height*0.5,60,200,1,0,1,-0.9)
tmp.image_angle = 180

square.automatic_angle = 0
1 change: 0 additions & 1 deletion timelines/roki_timeline/moment_1400.gml

This file was deleted.

File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions timelines/roki_timeline/roki_timeline.yy

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

0 comments on commit 6f26b4f

Please sign in to comment.