Skip to content

Commit

Permalink
2022_01_09 (2)
Browse files Browse the repository at this point in the history
added new attack effects
remaked some effects
changed sector-B07 map design
fixed minor bugs
etc.
  • Loading branch information
ABER1047 committed Jan 8, 2023
1 parent 248c0a7 commit 9b068de
Show file tree
Hide file tree
Showing 63 changed files with 126 additions and 79 deletions.
2 changes: 1 addition & 1 deletion objects/code/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ global.n_sector_discord = -1;
//original code for game
global.chat_sender = noone
global.chat_data = noone
global.game_ver = "Alpha 1.21"
global.game_ver = "Alpha 1.3"

global.bubble_surf = surface_create(1920, 1080);
global.rage_surf = surface_create(1920, 1080);
Expand Down
1 change: 1 addition & 0 deletions objects/ef_blood/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ sfx = 0
image_speed = 0.8
activated = 0


19 changes: 5 additions & 14 deletions objects/ef_blood/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,16 @@ sfx_play = -4




image_alpha -= 0.05

if image_alpha <= 0
if image_index > 6
{
instance_destroy()
image_index = 6
}


if image_index > 5
{
image_index = 5
}

if image_alpha <= 0.5 && image_index = 3
if image_index >= 3
{
xscale += (0 - xscale)*0.34
yscale += (0 - yscale)*0.18
xscale += (-0.01 - xscale)*0.34
yscale += (-0.01 - yscale)*0.18
}
else
{
Expand All @@ -52,6 +44,5 @@ if ins_pl >= 0
ins_pl.activated = 1
image_angle = ins_pl.image_angle+90
}
image_angle += image_xscale
}

2 changes: 0 additions & 2 deletions objects/ef_blood_2/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ instance_destroy()

speed += (0 - speed)*0.01

image_xscale += image_xscale*0.03
image_yscale += image_yscale*0.03
9 changes: 7 additions & 2 deletions objects/obj_angel/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ if scene__ > 0 && hp > 0
total_died_from_here ++
_light_ = instance_create_depth(x,y-30,depth,obj_light)
_light_.p_id = id
_light_.alpha = 0.7
_light_.alpha = 0
_light_.sprite_index = sprite64
_light_.image_blend = $FF75F2FF
_light_.light_type = 0
Expand All @@ -198,7 +198,11 @@ if scene__ > 0 && hp > 0
{
_light_.x = x
_light_.y = y-100-40*image_yscale
_light_.alpha = image_alpha*0.5+w_alpha

if scene__ >= 1
{
_light_.alpha += (image_alpha*0.5+w_alpha - _light_.alpha)*0.1
}

if instance_exists(spear__)
{
Expand Down Expand Up @@ -354,6 +358,7 @@ if activated = 1
if scene__ > 0.8
{
y += (ystart+8 - y)*0.08
_light_.alpha += (0.7 - _light_.alpha)*0.1
spear__.x += (x+150 - spear__.x)*0.08
spear__.y += (y-50+angelring_y - spear__.y)*0.08
spear__.image_angle = point_direction(x,y,spear__.x,spear__.y)+90
Expand Down
8 changes: 8 additions & 0 deletions objects/obj_statue/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,16 @@ draw_sprite_ext(sprite_index,image_index,x,y-26,image_xscale,image_yscale,image_
//draw_set_alpha(1)
//draw_text(x,y,message_phase)

if global.dreamy_alpha > 0
{
shader_set(shFlash)
draw_sprite_ext(sprite_index,image_index,x,y-26,image_xscale,image_yscale,image_angle,$FF473021,global.dreamy_alpha)
shader_reset()
}

if can_interect = 1
{
draw_text_kl_scale(x,y-v_x*64,"상호작용 ("+string(global.skip_key_for_draw)+")",v_x*64,-1,1,c_white,0,0,font0,v_x*0.3,v_x*0.3,0);
draw_sprite_ext(sprite_index,2,x,y-26,image_xscale,image_yscale,image_angle,c_white,image_alpha)
}

11 changes: 10 additions & 1 deletion objects/obj_statue_4/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,13 @@
// You can write your code in this editor
depth = 995
image_speed = 0
image_index = 2
image_index = 2

_light_ = instance_create_depth(x,y-100,depth,obj_light)
_light_.p_id = id
_light_.alpha = 0
_light_.sprite_index = sprite64
_light_.image_blend = $FF75F2FF
_light_.light_type = 0
_light_.image_xscale = 3*(1 - abs(player.x - x)/256)
_light_.image_yscale = 3*(1 - abs(player.x - x)/256)
7 changes: 7 additions & 0 deletions objects/obj_statue_4/Draw_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@
// You can write your code in this editor
draw_sprite_ext(sprite_index,image_index,x,y+64*image_yscale,image_xscale,-image_yscale*0.5,0,c_black,0.3*image_alpha)
draw_self()

if global.dreamy_alpha > 0
{
shader_set(shFlash)
draw_sprite_ext(sprite_index,image_index,x,y,image_xscale,image_yscale,image_angle,$FF473021,global.dreamy_alpha)
shader_reset()
}
32 changes: 32 additions & 0 deletions objects/obj_statue_4/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,35 @@ if abs(global.platform_speed) > 0
{
x -= global.platform_speed
}


if global.dreamy_alpha > 0
{
if instance_exists(_light_)
{
_light_.x = x
_light_.y = y-90
_light_.alpha = global.dreamy_alpha*0.2*(1 - abs(player.x - x)/512)
_light_.image_xscale = 3*(1 - abs(player.x - x)/512)
_light_.image_yscale = 3*(1 - abs(player.x - x)/512)
}


var xx_ = x+choose(-16,16)
var yy_ = y-130
repeat(2)
{
var random_val___ = percentage_k(5+global.graphics_for_code*7)
if random_val___ = 1
{
create_buble_effect(1,270+irandom_range(-20,20),0,choose(-1)*irandom_range(1,20)/7,0.1,0.1,$FF3E2D24,$FF473021,2,$FF513524,xx_,yy_,depth+10,0,false,false)
}
}

var random_val___ = percentage_k(global.graphics_for_code*3)
if random_val___ = 1
{
var random_val___2 = percentage_k(1)
create_buble_effect(0.3,270+irandom_range(-20,20),0,choose(-1)*irandom_range(1,20)/7,0.07,0.07,$FF62D1F7,$FF6C60CD,2,$FF191919,xx_,yy_,depth-random_val___2,1,false,false)
}
}
1 change: 1 addition & 0 deletions objects/player/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -3511,6 +3511,7 @@ if global.never_move = 0 && global.never_move_in_setting = 0 && keyboard_check_r
bl_ef.image_yscale = abs(img_scale)*0.5
bl_ef.t_x = __i
bl_ef.image_angle = irandom_range(-90,90)




Expand Down
1 change: 1 addition & 0 deletions objects/red_circle_effect_devil/Destroy_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ bl_ef.image_yscale = abs(img_scale)
bl_ef.t_x = __i
bl_ef.image_angle = irandom_range(-90,90)
bl_ef.sfx_play = false

}
1 change: 1 addition & 0 deletions objects/yellow_circle_effect/Destroy_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,5 @@ bl_ef.image_yscale = abs(img_scale)
bl_ef.t_x = __i
bl_ef.image_angle = irandom_range(-90,90)
bl_ef.sfx_play = false

}
18 changes: 4 additions & 14 deletions scripts/bloody/bloody.gml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,9 @@ var _my_p = get_my_player()

if _my_p != -4
{
if object_index = obj_angel
{
var _effect = instance_create_depth(x+irandom_range(-5,5),y+128+irandom_range(-5,5),depth-1,ef_blood_2);
_effect.image_angle = point_direction(_my_p.x,_my_p.y,argument0,argument1);
_effect.sprite_index = blood_effect;
_effect.spark_cre = argument2;
}
else
{
var _effect = instance_create_depth(x+irandom_range(-5,5),y+irandom_range(-5,5),depth-1,ef_blood_2);
_effect.image_angle = point_direction(_my_p.x,_my_p.y,argument0,argument1);
_effect.sprite_index = blood_effect;
_effect.spark_cre = argument2;
}
var _effect = instance_create_depth(player.x+global.movement_speed+player.movement_speed,player.y+vspeed*2,player.depth-1,ef_blood_2);
_effect.image_angle = point_direction(_my_p.x,_my_p.y,argument0,argument1);
_effect.sprite_index = blood_effect;
_effect.spark_cre = argument2;
}
}
16 changes: 10 additions & 6 deletions scripts/hp_minus_for_mob/hp_minus_for_mob.gml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ function hp_minus_for_mob(argument0,argument1)
else
{
random_val = 1.25
var _ins = instance_create_depth(player.x-player.image_xscale*32,player.y,player.depth-1,effect_saber)
_ins.image_xscale = player.image_xscale
}

var armor__ = armored_level
Expand Down Expand Up @@ -61,7 +59,7 @@ function hp_minus_for_mob(argument0,argument1)



if argument1 <= argument1
if random_val = 1
{
d_ef.image_blend = $FF2019FF
d_ef.image_xscale = 1.2
Expand All @@ -80,14 +78,20 @@ function hp_minus_for_mob(argument0,argument1)


var __i = choose(-1,1)
var bl_ef = instance_create_depth(x,y,depth-1,ef_blood)
var bl_ef = instance_create_depth(player.x,player.y,player.depth-10,ef_blood)
var img_scale = -__i*irandom_range(8,15)/5
bl_ef.image_xscale = img_scale
bl_ef.image_yscale = abs(img_scale)
bl_ef.t_x = __i
bl_ef.image_angle = irandom_range(-90,90)
bl_ef.image_angle = irandom_range(-35,35)
bl_ef.sfx_play = false
global.w_alpha = 0.15


var random_shine__ = percentage_k(30)
if random_shine__ = 1
{
global.w_alpha = 0.1
}
}
}

Expand Down
13 changes: 4 additions & 9 deletions scripts/hp_minus_for_player/hp_minus_for_player.gml
Original file line number Diff line number Diff line change
Expand Up @@ -51,20 +51,15 @@ var calcul_damage = damage_real*(1 - (armor_level-1))*global.difficulty


var __i = choose(-1,1)
var bl_ef = instance_create_depth(x,y,depth-1,ef_blood)
var bl_ef = instance_create_depth(player.x,player.y,player.depth-1,ef_blood)
var img_scale = -__i*irandom_range(8,15)/5
bl_ef.image_xscale = img_scale
bl_ef.image_yscale = abs(img_scale)
bl_ef.t_x = __i
bl_ef.image_angle = irandom_range(-90,90)
bl_ef.image_angle = irandom_range(-35,35)
bl_ef.sfx_play = false

var random_val_t = percentage_k(10)

if random_val_t = 1
{
global.w_alpha = 0.1
}

global.w_alpha = 0.1
}


Expand Down
Binary file not shown.
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
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.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified sprites/blood_effect/ac1e2927-2e2e-4850-803a-a6a05079a01b.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
42 changes: 22 additions & 20 deletions sprites/blood_effect/blood_effect.yy

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

Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
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
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.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
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.
Diff not rendered.
Diff not rendered.
Binary file modified sprites/sprite15_1/0dac851d-3bce-4861-a08f-b4bb33b3736a.png
Binary file modified sprites/sprite15_1/4ec48b49-1a2d-4be5-b63a-250bd6cbc204.png
Diff not rendered.
Binary file modified sprites/sprite15_1/67a6c3cf-6f27-4230-98e6-c73d4c05107a.png
Binary file modified sprites/sprite15_1/ef3c15ee-be3d-4c52-a838-684660f1088e.png
Binary file modified sprites/sprite15_1/f65f705d-9d7e-47bb-bf79-99f52f9e2c9b.png
Binary file modified sprites/sprite15_1/fe201811-0bd8-404f-988b-f354ba9d2aac.png
Diff not rendered.
Loading

0 comments on commit 9b068de

Please sign in to comment.