Skip to content

Commit

Permalink
2023_12_24
Browse files Browse the repository at this point in the history
  • Loading branch information
ABER1047 committed Dec 24, 2023
1 parent 87b12b8 commit 6a7b3ae
Show file tree
Hide file tree
Showing 16 changed files with 303 additions and 15 deletions.
18 changes: 11 additions & 7 deletions Project Wak Beat.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{"name":"UI&Camera","order":3,"path":"folders/스크립트/UI&Camera.yy",},
{"name":"UserData_Load","order":1,"path":"folders/스크립트/UserData_Load.yy",},
{"name":"hitbox_shapes","order":2,"path":"folders/스프라이트/hitbox_shapes.yy",},
{"name":"effects","order":52,"path":"folders/스프라이트/hitbox_shapes/effects.yy",},
{"name":"effects","order":53,"path":"folders/스프라이트/hitbox_shapes/effects.yy",},
{"name":"ui","order":1,"path":"folders/스프라이트/ui.yy",},
{"name":"시퀀스","order":10,"path":"folders/시퀀스.yy",},
{"name":"애니메이션 곡선","order":11,"path":"folders/애니메이션 곡선.yy",},
Expand All @@ -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":28,"path":"objects/hitbox_set_map_speed/hitbox_set_map_speed.yy",},
{"name":"hitbox_set_map_speed","order":29,"path":"objects/hitbox_set_map_speed/hitbox_set_map_speed.yy",},
{"name":"tutorial_part4_timeline","order":7,"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",},
Expand Down Expand Up @@ -103,14 +103,16 @@
{"name":"square_misile","order":10,"path":"objects/square_misile/square_misile.yy",},
{"name":"promise","order":20,"path":"sounds/promise/promise.yy",},
{"name":"spr_hexagon","order":48,"path":"sprites/spr_hexagon/spr_hexagon.yy",},
{"name":"spr_square_line","order":52,"path":"sprites/spr_square_line/spr_square_line.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":"hitbox_22","order":23,"path":"objects/hitbox_22/hitbox_22.yy",},
{"name":"create_cylinder","order":9,"path":"scripts/create_cylinder/create_cylinder.yy",},
{"name":"shelter_timeline","order":9,"path":"timelines/shelter_timeline/shelter_timeline.yy",},
{"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":26,"path":"objects/hitbox_camera_zoom/hitbox_camera_zoom.yy",},
{"name":"hitbox_camera_zoom","order":27,"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":24,"path":"timelines/kinmoku_timeline/kinmoku_timeline.yy",},
{"name":"load_musicList","order":3,"path":"scripts/load_musicList/load_musicList.yy",},
Expand All @@ -130,7 +132,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":27,"path":"objects/hitbox_vaious_effects/hitbox_vaious_effects.yy",},
{"name":"hitbox_vaious_effects","order":28,"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":"obj_player_left_hp_effect","order":8,"path":"objects/obj_player_left_hp_effect/obj_player_left_hp_effect.yy",},
{"name":"reset_custom_map_info","order":9,"path":"scripts/reset_custom_map_info/reset_custom_map_info.yy",},
Expand Down Expand Up @@ -159,6 +161,7 @@
{"name":"spr_pipe","order":39,"path":"sprites/spr_pipe/spr_pipe.yy",},
{"name":"decode_nametag","order":14,"path":"scripts/decode_nametag/decode_nametag.yy",},
{"name":"ding_dong","order":2,"path":"sounds/ding_dong/ding_dong.yy",},
{"name":"draw_rectangle_rotated_width","order":11,"path":"scripts/draw_rectangle_rotated_width/draw_rectangle_rotated_width.yy",},
{"name":"jururu_hurt","order":5,"path":"sounds/jururu_hurt/jururu_hurt.yy",},
{"name":"alzar","order":15,"path":"sounds/alzar/alzar.yy",},
{"name":"master_remix_timeline","order":19,"path":"timelines/master_remix_timeline/master_remix_timeline.yy",},
Expand All @@ -171,7 +174,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":24,"path":"objects/hitbox_hitbox_color/hitbox_hitbox_color.yy",},
{"name":"hitbox_hitbox_color","order":25,"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":3,"path":"sounds/bamguy/bamguy.yy",},
Expand Down Expand Up @@ -212,7 +215,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":25,"path":"objects/hitbox_savepoint/hitbox_savepoint.yy",},
{"name":"hitbox_savepoint","order":26,"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",},
Expand All @@ -232,7 +235,7 @@
{"name":"gomem_mashup_timeline","order":21,"path":"timelines/gomem_mashup_timeline/gomem_mashup_timeline.yy",},
{"name":"turisumo_timeline","order":10,"path":"timelines/turisumo_timeline/turisumo_timeline.yy",},
{"name":"Sprite69","order":4,"path":"sprites/Sprite69/Sprite69.yy",},
{"name":"hitbox_bg_color","order":23,"path":"objects/hitbox_bg_color/hitbox_bg_color.yy",},
{"name":"hitbox_bg_color","order":24,"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",},
Expand Down Expand Up @@ -304,5 +307,6 @@
{"name":"map_edior_ui","order":3,"path":"objects/map_edior_ui/map_edior_ui.yy",},
{"name":"LootLockerLeaderboardsDocumentation","order":3,"path":"notes/LootLockerLeaderboardsDocumentation/LootLockerLeaderboardsDocumentation.yy",},
{"name":"spr_korea_univ","order":28,"path":"sprites/spr_korea_univ/spr_korea_univ.yy",},
{"name":"fix_num_inside","order":16,"path":"scripts/fix_num_inside/fix_num_inside.yy",},
],
}
4 changes: 4 additions & 0 deletions Project Wak Beat.yyp

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

5 changes: 0 additions & 5 deletions objects/code/KeyPress_18.gml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,3 @@



for(var i = 0; i < 50; i++)
{
set_score("Unknown"+string(i), 1, 0);
set_score("Unknown"+string(i), 1, 1);
}
15 changes: 15 additions & 0 deletions objects/hitbox_22/Create_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/// @description Insert description here
// You can write your code in this editor

color_changing = 765;
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;
line_alpha = 0;
w_alpha = 0;
scale = 10;
18 changes: 18 additions & 0 deletions objects/hitbox_22/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
/// @description Insert description here
// You can write your code in this editor
if (play_animation == 0)
{
draw_text_k_scale(x,y-96,"Go\nHere!",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)
{
draw_set_alpha(w_alpha);
draw_set_color(c_white);
draw_rectangle_rotated_width(x,y,-tmp,-tmp,tmp,tmp,line_angle,line_width)
}
4 changes: 4 additions & 0 deletions objects/hitbox_22/Step_0.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// @description Insert description here
// You can write your code in this editor
image_angle += 90;

46 changes: 46 additions & 0 deletions objects/hitbox_22/Step_2.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/// @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)
{
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 (play_animation == 0)
{
line_alpha += (0.6 - line_alpha)*0.3;
scale -= (10/des_timer);
line_angle -= (270/des_timer);
if (scale <= 0)
{
w_alpha = 100;
play_animation = 1;
line_alpha = 1;

if (!place_meeting(x,y,obj_player))
{
global.hp = 0;
}
}
}
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)
{
instance_destroy();
}
}
42 changes: 42 additions & 0 deletions objects/hitbox_22/hitbox_22.yy

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

6 changes: 3 additions & 3 deletions objects/obj_player/Step_2.gml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if (global.map_editor != 1 && global.hp > 0 && (global.t_w_alpha < 1 || global.w
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)
if (instance_exists(_placed_obj) && _placed_obj.image_alpha >= 0.95 && _placed_obj.object_index != hitbox_22)
{
if invincibility_cooltime <= 0
{
Expand Down Expand Up @@ -88,8 +88,8 @@ if hurt != -4

if (hurt_hspeed != 0 || hurt_vspeed != 0)
{
global.hmove_speed = -sign(hurt_hspeed)*32
global.vmove_speed = -sign(hurt_vspeed)*32
global.hmove_speed = -sign(hurt_hspeed)*16
global.vmove_speed = -sign(hurt_vspeed)*16
}

global.cannot_control = 1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/// @func draw_rectangle_rotated_width(x,y,x1,y1,x2,y2,rotation,width)
/// @param x
/// @param y
/// @param x1
/// @param y1
/// @param x2
/// @param y2
/// @param rotation
/// @param width
/// @returns n/a
function draw_rectangle_rotated_width(argument0,argument1,argument2,argument3,argument4,argument5,argument6,argument7)
{
var cx,cy,xx1,yy1,xx2,yy2,rot,sxx,sxy,syx,syy,x1,x2,x3,x4,y1,y2,y3,y4;

cx = argument0; // Origin position x
cy = argument1; // Origin position y
xx1 = argument2; // Offset x1
yy1 = argument3; // Offset y1
xx2 = argument4; // Offset x2
yy2 = argument5; // Offset y2
rot = argument6; // Angle

sxx = cos(degtorad(rot));
sxy = -sin(degtorad(rot));
syx = sin(degtorad(rot));
syy = cos(degtorad(rot));

x1 = cx+sxx*xx1+syx*yy1;
x2 = cx+sxx*xx2+syx*yy1;
x3 = cx+sxx*xx2+syx*yy2;
x4 = cx+sxx*xx1+syx*yy2;

y1 = cy+sxy*xx1+syy*yy1;
y2 = cy+sxy*xx2+syy*yy1;
y3 = cy+sxy*xx2+syy*yy2;
y4 = cy+sxy*xx1+syy*yy2;

draw_line_width(x1,y1,x4,y4,argument7);
draw_line_width(x2,y2,x1,y1,argument7);
draw_line_width(x3,y3,x2,y2,argument7);
draw_line_width(x4,y4,x3,y3,argument7);
}

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

22 changes: 22 additions & 0 deletions scripts/fix_num_inside/fix_num_inside.gml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Script assets have changed for v2.3.0 see
// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information


///@param val
///@param min
///@param max
function fix_num_inside(argument0,argument1,argument2)
{
if (argument0 < argument1)
{
return argument1;
}
else if (argument0 > argument2)
{
return argument2;
}
else
{
return argument0;
}
}
11 changes: 11 additions & 0 deletions scripts/fix_num_inside/fix_num_inside.yy

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6a7b3ae

Please sign in to comment.