diff --git a/Spaceinator.project.gmx b/Spaceinator.project.gmx index cc42410..a622161 100644 --- a/Spaceinator.project.gmx +++ b/Spaceinator.project.gmx @@ -72,12 +72,13 @@ rooms\rm_title rooms\rm_game - + 32 16 0 1 2 + 3 help.rtf diff --git a/objects/obj_bullet.object.gmx b/objects/obj_bullet.object.gmx index 3da98d7..6c8bcc4 100644 --- a/objects/obj_bullet.object.gmx +++ b/objects/obj_bullet.object.gmx @@ -57,31 +57,6 @@ if(step_counter == 60*room_speed || instance_position(x,y,obj_chunk) == noone) { instance_destroy(self); } - - - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - instance_destroy(other); -instance_create(other.x,other.y,obj_boom_fx) -instance_destroy(id); @@ -128,6 +103,31 @@ instance_destroy(id); 0 + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + instance_destroy(other); +instance_create(other.x,other.y,obj_boom_fx) +instance_destroy(id); + + + + + 1 diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index 0307686..06a4111 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -258,40 +258,6 @@ if((mouse_check_button_pressed(mb_left) && os_type != os_psvita) || game } - - - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - damage_player(5); - -instance_create(other.x,other.y,obj_boom_fx); -other.direction = direction; -other.image_angle = image_angle; -other.speed = 20; - -speed = -20; - - - - @@ -370,6 +336,40 @@ if(didAdd) 1 damage_player(hp_max); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + damage_player(5); + +instance_create(other.x,other.y,obj_boom_fx); +other.direction = direction; +other.image_angle = image_angle; +other.speed = 20; + +speed = -20; + + + + diff --git a/sprites/images/spr_blocks_3.png b/sprites/images/spr_blocks_3.png new file mode 100644 index 0000000..5937c3b Binary files /dev/null and b/sprites/images/spr_blocks_3.png differ diff --git a/sprites/spr_blocks.sprite.gmx b/sprites/spr_blocks.sprite.gmx index 1246b24..a69a006 100644 --- a/sprites/spr_blocks.sprite.gmx +++ b/sprites/spr_blocks.sprite.gmx @@ -23,5 +23,6 @@ images\spr_blocks_0.png images\spr_blocks_1.png images\spr_blocks_2.png + images\spr_blocks_3.png