Skip to content

Commit

Permalink
2022_12_14
Browse files Browse the repository at this point in the history
fixed some minor bugs
changed some sprites
etc.
  • Loading branch information
ABER1047 committed Dec 13, 2022
1 parent 7fcbbfe commit 3c29721
Show file tree
Hide file tree
Showing 123 changed files with 473 additions and 486 deletions.
13 changes: 7 additions & 6 deletions Arena_of_Woowakgood.yyp

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

8 changes: 4 additions & 4 deletions objects/audience_parents/audience_parents.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/code/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ gamemode_val_ = "1 vs 1"
if gamemode_val_ = 2
{
gamemode_val_ = "외나무 다리 (1 vs 1)"
setting_buff = "차지 밀치기 거리 400% 및 레이지 게이지 충전 속도 200%"
setting_buff = "레이지 게이지 충전 속도 200%"
}

if gamemode_val_ = 3
Expand Down
22 changes: 19 additions & 3 deletions objects/code/Other_68.gml
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ else if (type == network_type_data)
chat_up(string(converted_text__)+"의 PVP 권한이 변경되었습니다",0,0)
}
}
else if string_pos("/dm",str) != 0
{
chat_up(str,_sender,1);
}
else
{
if global.matching > 0
Expand All @@ -173,13 +177,23 @@ else if (type == network_type_data)
}
else
{
if global.matching > 0
if string_pos("/dm",str) != 0
{
chat_up(str,_sender,-1);
if string_pos(global.nickname,str) != 0
{
chat_up(str,_sender,1);
}
}
else
{
chat_up(str,_sender,1);
if global.matching > 0
{
chat_up(str,_sender,-1);
}
else
{
chat_up(str,_sender,1);
}
}
}
break;
Expand Down Expand Up @@ -736,6 +750,7 @@ else if (type == network_type_data)
var _angle = buffer_read(buffer, buffer_string);
var _w_alpha = buffer_read(buffer, buffer_string);
var _img_alpha = buffer_read(buffer, buffer_string);
var _movement_speed___ = buffer_read(buffer, buffer_string);
if global.nickname != _check_who_send
{
with(player)
Expand All @@ -749,6 +764,7 @@ else if (type == network_type_data)
image_angle = real(_angle)/100;
w_alpha = real(_w_alpha)/100;
image_alpha = real(_img_alpha)/100
self_movement_speed = real(_movement_speed___)/100
}
}
}
Expand Down
27 changes: 2 additions & 25 deletions objects/code/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ if global.show_challenger > 0 && global.b_alpha >= 1
{
created_platfrom = 0
global.now_map = choose(0,2,3)
global.wind_dir = choose(-1,1)*irandom_range(0,12)
global.rainy = irandom_range(0,2)
}


Expand Down Expand Up @@ -326,31 +328,6 @@ global.w_alpha = 1.5
b_map = global.now_map
}

if is_server = true && global.b_alpha >= 1
{
randomize()
change_weather ++

if (global.now_music = wakrio_bgm || global.now_music = shake_it_bgm) && global.rainy != 1
{
change_weather_max = 0
}

if change_weather_max < change_weather
{
global.wind_dir = choose(-1,1)*irandom_range(0,12)
if global.now_music = wakrio_bgm || global.now_music = shake_it_bgm
{
global.rainy = 1
}
else
{
global.rainy = irandom_range(0,2)
}
change_weather_max = irandom_range(6000,8000)
change_weather = 0
}
}

if global.can_send_shake > 0
{
Expand Down
10 changes: 8 additions & 2 deletions objects/code/Step_2.gml
Original file line number Diff line number Diff line change
Expand Up @@ -1694,11 +1694,17 @@ show_debug_message(string(selected_p1)+" / "+string(selected_p2)+" / "+string(se

for(var i = -6; i <= 6; i++)
{
var random_cre = percentage_k(60-(instance_number(obj_andience1)+instance_number(obj_andience11)+instance_number(obj_andience111))*5)
if random_cre = 1
var random_cre = choose(0,1,1)
if random_cre = 0
{
instance_create_depth(choose(2448,1648)+64*i,903-48,obj_floor.depth-2,choose(obj_andience1,obj_andience11,obj_andience111))
}

if random_cre = 1 && instance_number(obj_andience1111) < 6
{
var _isedol_ = instance_create_depth(choose(2448,1648)+64*i,903-48,obj_floor.depth-2,obj_andience1111)
_isedol_.image_index = instance_number(obj_andience1111)
}
}

buffer_seek(matching_buffer, buffer_seek_start, 0);
Expand Down
6 changes: 4 additions & 2 deletions objects/gyu_seong_blue_ef/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/// @description Insert description here
// You can write your code in this editor
draw_self()
shader_set(shFlash)
draw_sprite_ext(sprite_index,image_index,x,y,image_xscale,image_yscale,image_angle,image_blend,image_alpha)
for(var i = 1; i <= 3; i ++)
{
draw_sprite_ext(sprite_index,image_index,x-i,y,image_xscale,image_yscale,image_angle,$FFCA9383,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x+i,y,image_xscale,image_yscale,image_angle,$FFCA9383,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y-i,image_xscale,image_yscale,image_angle,$FFCA9383,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y+i,image_xscale,image_yscale,image_angle,$FFCA9383,image_alpha*a/8);
}
}
shader_reset()
14 changes: 7 additions & 7 deletions objects/gyu_seong_blue_ef/gyu_seong_blue_ef.yy

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

6 changes: 4 additions & 2 deletions objects/gyu_seong_red_ef/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/// @description Insert description here
// You can write your code in this editor
draw_self()
shader_set(shFlash)
draw_sprite_ext(sprite_index,image_index,x,y,image_xscale,image_yscale,image_angle,image_blend,image_alpha)
for(var i = 1; i <= 3; i ++)
{
draw_sprite_ext(sprite_index,image_index,x-i,y,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x+i,y,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y-i,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y+i,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
}
}
shader_reset()
20 changes: 10 additions & 10 deletions objects/gyu_seong_red_ef/gyu_seong_red_ef.yy

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

6 changes: 4 additions & 2 deletions objects/gyu_seong_red_ef_attacked/Draw_0.gml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/// @description Insert description here
// You can write your code in this editor
draw_self()
shader_set(shFlash)
draw_sprite_ext(sprite_index,image_index,x,y,image_xscale,image_yscale,image_angle,image_blend,image_alpha)
for(var i = 1; i <= 3; i ++)
{
draw_sprite_ext(sprite_index,image_index,x-i,y,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x+i,y,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y-i,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
draw_sprite_ext(sprite_index,image_index,x,y+i,image_xscale,image_yscale,image_angle,$FFFF00FF,image_alpha*a/8);
}
}
shader_reset()
20 changes: 10 additions & 10 deletions objects/gyu_seong_red_ef_attacked/gyu_seong_red_ef_attacked.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/imoji_button/Mouse_4.gml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ keyboard_string = "!BT"

if image_index = 1
{
keyboard_string = "!GZ"
keyboard_string = "!GG"
}

if image_index = 2
Expand Down
Loading

0 comments on commit 3c29721

Please sign in to comment.