Skip to content

Commit

Permalink
2023_01_12
Browse files Browse the repository at this point in the history 
minor bug fixed
editor default value system added
editor timeline bug fixed
etc.
  • Loading branch information
@ABER1047
ABER1047 committed Jan 11, 2024
1 parent 0e7a30e commit 586c770
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 5 deletions.
2 changes: 1 addition & 1 deletion objects/hitbox_2/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ des = 0
center_destroy = 0
des_timer = 0
event_user(11)

effect_projectile = 0;

circle_ef_xscale = 4
circle_w_alpha = 1.5
2 changes: 1 addition & 1 deletion objects/hitbox_2/Draw_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (sprite_index == spr_circle_spike2)

if (image_alpha > 0)
{
if (!variable_instance_exists(id,"none_color_change") && circle_w_alpha > 0 && sprite_index != spr_rain)
if (!variable_instance_exists(id,"none_color_change") && circle_w_alpha > 0 && sprite_index != spr_rain && effect_projectile != 1)
{
draw_sprite_ext(spr_circle,image_index,x,y,(image_xscale*circle_ef_xscale)/16,(image_yscale*circle_ef_xscale)/16,image_angle,merge_color_new(image_blend,(get_dis_color(global.background_color,c_white) < 7) ? c_black : c_white,fix_num(circle_w_alpha)),1)
}
Expand Down
4 changes: 4 additions & 0 deletions objects/hitbox_2/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ if (global.timeline_stop != 1)
{
speed = speed_;
image_alpha = saved_alpha;
if (saved_alpha < 1)
{
effect_projectile = 1;
}
}
}
else
Expand Down
136 changes: 135 additions & 1 deletion objects/map_edior_ui/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ else
}
}
}
else
{
if (keyboard_check_pressed(vk_left) || keyboard_check_pressed(vk_right))
{
show_message_log("해당 탄막은 이미지를 변경할 수 없습니다!");
}
}
}
}

Expand Down Expand Up @@ -150,6 +157,13 @@ switch(global.editor_selected_type)
custom_image_ind = 0;
custom_image_type = 0;
selected_projectile_type = 0;

//defalut value
global.ed_arg[0] = 0.16;
global.ed_arg[1] = 0;
global.ed_arg[2] = 14;
global.ed_arg[3] = 0;
global.ed_arg[6] = -1;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -168,6 +182,11 @@ switch(global.editor_selected_type)
custom_image_ind = 4;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.18;
global.ed_arg[1] = 0;
global.ed_arg[2] = 0;
global.ed_arg[3] = 60;
}
image_alpha = 0.4;
scroll_param_set(0,"크기",1,1024,2,100,"");
Expand All @@ -184,6 +203,12 @@ switch(global.editor_selected_type)
{
custom_image_type = 2;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 1;
global.ed_arg[1] = 0;
global.ed_arg[2] = 0;
global.ed_arg[3] = 60;
global.ed_arg[4] = 15;
}
image_alpha = 0.4;
image_angle = global.ed_arg[1];
Expand All @@ -202,6 +227,13 @@ switch(global.editor_selected_type)
custom_image_ind = 9;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 0;
global.ed_arg[3] = 60;
global.ed_arg[4] = 0.3;
global.ed_arg[5] = 320;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -221,6 +253,12 @@ switch(global.editor_selected_type)
custom_image_ind = 6;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 24;
global.ed_arg[3] = 5;
global.ed_arg[4] = 3;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -239,6 +277,12 @@ switch(global.editor_selected_type)
{
custom_image_type = 2;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 128;
global.ed_arg[3] = 60;
global.ed_arg[6] = 1;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -257,6 +301,11 @@ switch(global.editor_selected_type)
custom_image_ind = 1;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 60;
global.ed_arg[3] = 25;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -275,6 +324,13 @@ switch(global.editor_selected_type)
selected_projectile_type = 0;
custom_image_ind = 0;
custom_image_type = 1;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 64;
global.ed_arg[3] = 60;
global.ed_arg[4] = 180;
global.ed_arg[6] = -1;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand All @@ -295,6 +351,11 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = irandom_range(0,255);
global.ed_arg[1] = irandom_range(0,255);
global.ed_arg[2] = irandom_range(0,255);
global.ed_arg[6] = 1;
}
image_blend = make_color_rgb(global.ed_arg[0],global.ed_arg[1],global.ed_arg[2]);
scroll_param_set(0,"R",0,255,2,0,"");
Expand All @@ -311,6 +372,11 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = irandom_range(0,255);
global.ed_arg[1] = irandom_range(0,255);
global.ed_arg[2] = irandom_range(0,255);
global.ed_arg[6] = 1;
}
image_blend = merge_color_new(c_black,make_color_rgb(global.ed_arg[0],global.ed_arg[1],global.ed_arg[2]),fix_num(global.ed_arg[3]));
scroll_param_set(0,"R",0,255,2,0,"");
Expand All @@ -331,6 +397,11 @@ switch(global.editor_selected_type)
image_yscale = image_xscale;
if (selected_projectile_type == 1)
{
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 24;
global.ed_arg[3] = 25;
selected_projectile_type = 0;
custom_image_ind = 0;
custom_image_type = 0;
Expand All @@ -346,6 +417,11 @@ switch(global.editor_selected_type)
image_yscale = image_xscale;
if (selected_projectile_type == 1)
{
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 24;
global.ed_arg[3] = choose(-5,5);
selected_projectile_type = 0;
custom_image_ind = 13;
custom_image_type = 0;
Expand All @@ -361,18 +437,24 @@ switch(global.editor_selected_type)
case 13: //카메라 효과
if (selected_projectile_type == 1)
{
//defalut value
global.ed_arg[0] = 1;
global.ed_arg[1] = 0;
global.ed_arg[6] = -1;
selected_projectile_type = 0;
custom_image_type = 2;
}

scroll_param_set(0,"줌 정도 설정",55,115,2,100,"");
scroll_param_set(0,"줌 정도 설정 (값이 클수록 축소, 1이 기본값)",55,115,2,100,"");
scroll_param_set(1,"프레임당 천천히 줌되는 비율 (값이 클수록 빠르게 변화합니다)",-20,20,2,10,"");
scroll_param_set(6,"포커스 활성화 (카메라 시점이 '카메라 효과'가 배치된 위치로 고정됨)",-1,1,2,0,"");
break;

case 14: //배경 투명도 변화
if (selected_projectile_type == 1)
{
//defalut value
global.ed_arg[0] = 0;
selected_projectile_type = 0;
custom_image_type = 2;
}
Expand All @@ -382,6 +464,13 @@ switch(global.editor_selected_type)
case 15: //회전하는 탄막 자동 생성기
if (selected_projectile_type == 1)
{
//defalut value
global.ed_arg[0] = 0.16;
global.ed_arg[1] = 0;
global.ed_arg[2] = 14;
global.ed_arg[3] = 5;
global.ed_arg[4] = 5;
global.ed_arg[5] = 60;
selected_projectile_type = 0;
custom_image_ind = 0;
custom_image_type = 0;
Expand All @@ -403,6 +492,12 @@ switch(global.editor_selected_type)
selected_projectile_type = 0;
custom_image_ind = 0;
custom_image_type = 1;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 16;
global.ed_arg[3] = 4;
global.ed_arg[6] = -1;
}
image_xscale = global.ed_arg[0];
image_yscale = image_xscale;
Expand All @@ -420,6 +515,9 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = 16;
global.ed_arg[1] = 0;
}

scroll_param_set(0,"화면 흔들림 정도",1,64,2,0,"");
Expand All @@ -431,6 +529,10 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = 16;
global.ed_arg[1] = 0;
global.ed_arg[6] = 1;
}

scroll_param_set(0,"x축 속도",-64,64,2,0,"");
Expand All @@ -446,6 +548,15 @@ switch(global.editor_selected_type)
custom_image_ind = 0;
custom_image_type = 0;
selected_projectile_type = 0;

//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 128;
global.ed_arg[3] = 0;
global.ed_arg[4] = 0;
global.ed_arg[5] = 300;
global.ed_arg[6] = 1;
}
image_angle = global.ed_arg[1]-180;
image_alpha = 0.4;
Expand All @@ -466,6 +577,11 @@ switch(global.editor_selected_type)
custom_image_ind = 0;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 12;
global.ed_arg[3] = 60;
}
image_angle = global.ed_arg[1];
image_alpha = 0.5;
Expand All @@ -481,6 +597,8 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = 1;
}
image_alpha = 1;
scroll_param_set(0,"플래시 밝기",1,100,2,100,"");
Expand All @@ -491,6 +609,8 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[6] = 1;
}
image_alpha = 1;
scroll_param_set(6,"비 이펙트",-1,1,2,0,"");
Expand All @@ -501,6 +621,10 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
var random_effect = choose(-1,1);
global.ed_arg[0] = (random_effect == 1) ? 3 : 1;
global.ed_arg[6] = random_effect;
}
image_alpha = 1;
scroll_param_set(0,"효과 방향",0,(global.ed_arg[6] == 1) ? 3 : 5,2,0,"");
Expand All @@ -512,6 +636,10 @@ switch(global.editor_selected_type)
{
selected_projectile_type = 0;
custom_image_type = 2;
//defalut value
global.ed_arg[0] = 0.5;
global.ed_arg[1] = 0;
global.ed_arg[2] = 180;
}
image_angle = global.ed_arg[1]-45;
image_alpha = 0.4;
Expand All @@ -530,6 +658,12 @@ switch(global.editor_selected_type)
custom_image_ind = 0;
custom_image_type = 0;
selected_projectile_type = 0;
//defalut value
global.ed_arg[0] = 0.16;
global.ed_arg[1] = 0;
global.ed_arg[2] = 14;
global.ed_arg[3] = 359;
global.ed_arg[4] = 5;
}
image_angle = global.ed_arg[1];
image_alpha = 0.4;
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_button/Mouse_50.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if (global.n_setting_button = -4 || global.n_setting_button = button_id) && spri
}
else if (button_id == 7)
{
global.n_progress = floor((scroll_value/100)*global.music_duration);
global.n_progress = fix_num_inside(floor((scroll_value/100)*global.music_duration),1,global.music_duration);
timeline_position = global.n_progress+floor(global.music_sync_offset*3*60);

if (global.timeline_stop == -1 && !audio_is_playing(global.n_music_instance))
Expand Down
3 changes: 2 additions & 1 deletion scripts/editor_mode_create_projectile/editor_mode_create_projectile.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,12 +458,13 @@ function editor_mode_create_projectile(argument0,argument1,argument2,argument3,a
tmp_ins.m_data_arg6 = argument9;
tmp_ins.m_data_arg7 = argument10;
tmp_ins.m_data_arg8 = argument11;
tmp_ins.saved_alpha = 0.4;
tmp_ins.saved_alpha = 0.5;
tmp_ins.w_alpha = 0;
tmp_ins.keep_spin_angle = 0;
tmp_ins.image_xscale = argument3;
tmp_ins.image_yscale = argument3;
tmp_ins.sprite_index = tmp_spr___;
tmp_ins.image_angle = argument4;
break;

case 21: //카메라 플래시 효과
Expand Down

0 comments on commit 586c770

Please sign in to comment.