Skip to content

Commit

Permalink
2022_12_15
Browse files Browse the repository at this point in the history
  • Loading branch information
ABER1047 committed Dec 15, 2022
1 parent 3c29721 commit c6e372b
Show file tree
Hide file tree
Showing 26 changed files with 1,393 additions and 1,340 deletions.
Binary file modified fonts/font0/font0.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 5 additions & 4 deletions fonts/font0/font0.old.yy

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

Binary file modified fonts/font01/font01.old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,519 changes: 1,266 additions & 1,253 deletions fonts/font01/font01.old.yy

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion objects/code/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ server_ip = "192.168.0.5"//"211.192.230.184";//"208.67.222.222";
server_port = 42524;
is_server = false;
sepa_power = 0

now_recieving = 0
sepa_alpha = 0
check_winner = 0
ability_choosing_time = 0
Expand Down
11 changes: 9 additions & 2 deletions objects/code/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ draw_text_kl_scale(xx+camera_get_view_width(view_camera[0])*0.5,yy+100*v_x,aaa_t
draw_text_kl_scale(camera_get_view_x(view_camera[0])+camera_get_view_width(view_camera[0])-v_x*16,camera_get_view_y(view_camera[0])+camera_get_view_height(view_camera[0])-40*v_x,"* "+string(global.dev_message),32,-1,global.dev_message_alpha,c_gray,0,1,font0,1/3*v_x,1/3*v_x,0)

var _playing_music_name = ""

var __now_playing_text = "Now playing"

if audio_get_name(global.now_music) = audio_get_name(maser_bgm)
{
Expand Down Expand Up @@ -244,11 +244,18 @@ if audio_get_name(global.now_music) = audio_get_name(bamguy_bgm)
_playing_music_name = "badassgatsby - 밤가이!!"
}

if (floor(global.matching) = 2) || (global.matching > 0 && global.hp <= 0 && global.gamemode_server = 4)
{
var _playing_music_name = "관전중"
var __now_playing_text = "'Enter'키를 눌러 채팅으로 응원하거나, 방향키로 카메라 전환 가능"
show_sound_list = 1
}

if show_sound_list_alpha > 0
{
if _playing_music_name != ""
{
draw_text_kl_scale(xx+camera_get_view_width(view_camera[0])*0.5,yy+(show_sound_list_y)*v_x*1.5,"Now playing",32,-1,show_sound_list_alpha,c_yellow,0,0,font0,1/3.5*v_x,1/3.5*v_x,0)
draw_text_kl_scale(xx+camera_get_view_width(view_camera[0])*0.5,yy+(show_sound_list_y)*v_x*1.5,string(__now_playing_text),32,-1,show_sound_list_alpha,c_yellow,0,0,font0,1/3.5*v_x,1/3.5*v_x,0)
draw_text_kl_scale(xx+camera_get_view_width(view_camera[0])*0.5,yy+(show_sound_list_y+35)*v_x*1.5,string(_playing_music_name),32,-1,show_sound_list_alpha,c_white,0,0,font0,1/2*v_x,1/2*v_x,0)
}
}
Expand Down
52 changes: 29 additions & 23 deletions objects/code/Other_68.gml
Original file line number Diff line number Diff line change
Expand Up @@ -225,19 +225,22 @@ else if (type == network_type_data)

case DATA._RED_CIRCLE_EFFECT:
var _check_who_send = buffer_read(buffer, buffer_string);
var _x = real(buffer_read(buffer, buffer_string));
var _y = real(buffer_read(buffer, buffer_string));
var _xscale = real(buffer_read(buffer, buffer_string));
var _yscale = real(buffer_read(buffer, buffer_string));
var _t_scale = real(buffer_read(buffer, buffer_string));
if global.nickname != string(_check_who_send)
if global.nickname != string(_check_who_send) && now_recieving = 0
{
var _x = real(buffer_read(buffer, buffer_string));
var _y = real(buffer_read(buffer, buffer_string));
var _xscale = real(buffer_read(buffer, buffer_string));
var _yscale = real(buffer_read(buffer, buffer_string));
var _t_scale = real(buffer_read(buffer, buffer_string));

var skill_red_ball_effect_rage = instance_create_depth((_x)/100,(_y)/100,player.depth-2,red_circle_effect_received);
skill_red_ball_effect_rage.image_xscale = (_xscale)/100;
skill_red_ball_effect_rage.image_yscale = (_yscale)/100;
skill_red_ball_effect_rage.t_scale = (_t_scale)/100;
skill_red_ball_effect_rage.alarm[11] = 7;
now_recieving = 1
}
now_recieving = 0
break;

case DATA.GAMEMODE_SELECTING:
Expand Down Expand Up @@ -1007,31 +1010,37 @@ else if (type == network_type_data)

case COMM.SPARK_EFFECT:
var _check_who_send = buffer_read(buffer, buffer_string);
if now_recieving = 0 && global.nickname != string(_check_who_send)
{
now_recieving = 1
var _x = buffer_read(buffer, buffer_string);
var _y = buffer_read(buffer, buffer_string);
var _vspeed = buffer_read(buffer, buffer_string);
var _hspeed = buffer_read(buffer, buffer_string);
var _obj_ind = buffer_read(buffer, buffer_string);
var _spr_ind = buffer_read(buffer, buffer_string);
var _angle = buffer_read(buffer, buffer_string);
if global.nickname != string(_check_who_send)
{
var _obj_get_ = asset_get_index(string(_obj_ind)+"_received");

if object_exists(_obj_get_)
if object_exists(_obj_get_) && now_recieving <= 1
{
var _attack_ef = instance_create_depth(real(_x)/100,real(_y)/100,player.depth+choose(-1,1),_obj_get_);
_attack_ef.vspeed = real(_vspeed)/100;
_attack_ef.hspeed = real(_hspeed)/100;
_attack_ef.sprite_index = _spr_ind;
_attack_ef.image_angle = real(_angle)/100;
now_recieving = 2
}
now_recieving = 0
}
break;


case COMM.BUBLE_EFFECT:
var _check_who_send = buffer_read(buffer, buffer_string);

if global.nickname != string(_check_who_send)
{
var _a1 = buffer_read(buffer, buffer_string);
var _a2 = buffer_read(buffer, buffer_string);
var _a3 = buffer_read(buffer, buffer_string);
Expand All @@ -1044,24 +1053,21 @@ else if (type == network_type_data)
var _a10 = buffer_read(buffer, buffer_string);
var _a11 = buffer_read(buffer, buffer_string);
var _a12 = buffer_read(buffer, buffer_string);

if global.nickname != string(_check_who_send)
{
cre_buble_ef(_a1/100,_a2/100,string(_a3),string(_a4),_a5/100,_a6/100,_a7/100,_a8/100,_a9/100,_a10/100,_a11/100,_a12/100,0)
}
break;

case COMM.ATTACKER_GET_RAGE:
var _check_who_send = buffer_read(buffer, buffer_string);

if global.nickname = _check_who_send
{
var _rage_gage = buffer_read(buffer, buffer_string);
var _damage = buffer_read(buffer, buffer_string);
var _ori_damage = buffer_read(buffer, buffer_string);
var img_bnd = c_white
var _xscale = 1
var _yscale = 1

if global.nickname = _check_who_send
{
var _my_p = get_my_player();

if _damage <= _ori_damage
Expand Down Expand Up @@ -1120,14 +1126,14 @@ else if (type == network_type_data)
{
global.hp -= 18
global.movement_speed = 0
if abs(movement_speed) > 2.6
{
movement_speed = image_xscale*2
}
else
{
movement_speed = -movement_speed*1.3
}
if abs(movement_speed) > 2.6
{
movement_speed = image_xscale*2
}
else
{
movement_speed = -movement_speed*1.3
}
y -= 1
gravity = -0.1
vspeed = -4
Expand Down
4 changes: 0 additions & 4 deletions objects/code/Step_2.gml
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ if global.matching = 3
dust.image_alpha = 1
}

sfx_for_multiplayer(mob_faint,0,0.1)
}

if global.matched_pl2 = global.return_player_id
Expand All @@ -296,7 +295,6 @@ if global.matching = 3
dust.image_alpha = 1
}

sfx_for_multiplayer(mob_faint,0,0.1)
}
}

Expand Down Expand Up @@ -441,7 +439,6 @@ if global.matching = 3
dust.image_alpha = 1
}

sfx_for_multiplayer(mob_faint,0,0.1)
}

if global.matched_pl4 = global.return_player_id
Expand All @@ -462,7 +459,6 @@ if global.matching = 3
dust.image_alpha = 1
}

sfx_for_multiplayer(mob_faint,0,0.1)
}
}

Expand Down
2 changes: 1 addition & 1 deletion objects/ef_blood_2/Alarm_2.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
if global.in_practice = 0
if global.in_practice = 0 && instance_number(ef_blood_2_received) < 10
{
buffer_seek(command_buffer, buffer_seek_start, 0);
buffer_write(command_buffer, buffer_u8, code.DATA.COMMAND);
Expand Down
22 changes: 11 additions & 11 deletions objects/ef_blood_2/ef_blood_2.yy

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

2 changes: 1 addition & 1 deletion objects/effect_spark/Alarm_1.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
if global.in_practice = 0
if global.in_practice = 0 && instance_number(effect_spark_received) < 15
{
buffer_seek(command_buffer, buffer_seek_start, 0);
buffer_write(command_buffer, buffer_u8, code.DATA.COMMAND);
Expand Down
2 changes: 1 addition & 1 deletion objects/hyumpanchi_banana/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ hit_stand_up = 0
knocked_down_ef = 0
hit_motion = 0
can_attack = 0
hp = 307
hp = 1000
max_hp = hp
hp_bar_alpha = 0
t_hp_bar_alpha = 0
Expand Down
2 changes: 1 addition & 1 deletion objects/hyumpanchi_banana/Step_2.gml
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ if place_meeting(x,y,effect_attack4)

view_shake(7,60,4)

hp_minus_for_mob(48)
hp_minus_for_mob(182)

movement_speed = 0
var __i = sign(x - player.x)
Expand Down
4 changes: 0 additions & 4 deletions objects/obj_andience1111/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ if instance_number(down_effect) > 0
gravity = 0.3
vspeed = -irandom_range(30,50)/10
time = 0
image_index = 0
max_time = 9099999
}
}
Expand All @@ -36,7 +35,6 @@ y --
gravity = 0.3
vspeed = -irandom_range(30,50)/10
time = 0
image_index = 0
max_time = 9099999
}

Expand All @@ -52,7 +50,6 @@ image_xscale = 1

if y >= 903-48
{
image_index = 1
gravity = 0
y = 903-48
if time = 0
Expand All @@ -64,7 +61,6 @@ y = 903-48

if y < 903-48
{
image_index = 0
gravity = 0.3
}

Expand Down
4 changes: 2 additions & 2 deletions objects/player/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ if image_alpha > 0 && global.hp > 0
draw_sprite_ext(sprite20,0,xx+60*v_x,yy+32*v_x,5.2*v_x,2*v_x,0,c_white,hp_bar_alpha)
if global.hp/max_hp > 0 && global.hp <= max_hp
{
draw_sprite_ext(sprite20,5,xx+64*v_x,yy+32*v_x,(global.m_hp/max_hp)*5.5*v_x,2*v_x*1.5,0,c_white,hp_bar_alpha)
draw_sprite_ext(sprite20,6,xx+64*v_x,yy+32*v_x,(global.m_hp/max_hp)*5.5*v_x,2*v_x*1.5,0,c_white,hp_bar_alpha)
draw_sprite_ext(sprite20,1,xx+64*v_x,yy+32*v_x,(draw_hp/max_hp)*5.5*v_x,2*v_x*1.5,0,c_white,hp_bar_alpha)
}

Expand Down Expand Up @@ -162,7 +162,7 @@ if image_alpha > 0 && global.hp > 0
draw_sprite_ext(sprite20,0,x-20,y+32,1,1,0,c_white,hp_bar_alpha)
if hp/max_hp > 0
{
draw_sprite_ext(sprite20,5,x-18,y+32,m_hp/max_hp,1,0,c_white,hp_bar_alpha)
draw_sprite_ext(sprite20,6,x-18,y+32,m_hp/max_hp,1,0,c_white,hp_bar_alpha)
draw_sprite_ext(sprite20,1,x-18,y+32,draw_hp/max_hp,1,0,c_white,hp_bar_alpha)
}
}
Expand Down
Loading

0 comments on commit c6e372b

Please sign in to comment.