diff --git a/objects/obj_bullet_base.object.gmx b/objects/obj_bullet.object.gmx similarity index 58% rename from objects/obj_bullet_base.object.gmx rename to objects/obj_bullet.object.gmx index eeed8ac..4950851 100644 --- a/objects/obj_bullet_base.object.gmx +++ b/objects/obj_bullet.object.gmx @@ -1,13 +1,37 @@ - <undefined> + spr_bullets 0 -1 0 0 <undefined> <undefined> - + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + image_speed = 0; + + + + + + 0 0 0 diff --git a/objects/obj_laser_bullet.object.gmx b/objects/obj_laser_bullet.object.gmx deleted file mode 100644 index e831ec6..0000000 --- a/objects/obj_laser_bullet.object.gmx +++ /dev/null @@ -1,23 +0,0 @@ - - - spr_lazer_bullet - 0 - -1 - 0 - 0 - obj_bullet_base - <undefined> - - 0 - 0 - 0 - 0.5 - 0.100000001490116 - 0 - 0.100000001490116 - 0.100000001490116 - 0.200000002980232 - -1 - 0 - - diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index c0bb900..974014a 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -151,9 +151,9 @@ speed += 5 1 - var new_bullet = instance_create(x,y,obj_laser_bullet); + var new_bullet = instance_create(x,y,obj_bullet); new_bullet.image_angle = image_angle; -new_bullet.speed = speed; +new_bullet.speed = speed + 1; diff --git a/sprites/images/spr_bullets_0.png b/sprites/images/spr_bullets_0.png new file mode 100644 index 0000000..806d9f1 Binary files /dev/null and b/sprites/images/spr_bullets_0.png differ diff --git a/sprites/images/spr_bullets_1.png b/sprites/images/spr_bullets_1.png new file mode 100644 index 0000000..5996eb1 Binary files /dev/null and b/sprites/images/spr_bullets_1.png differ diff --git a/sprites/images/spr_bullets_2.png b/sprites/images/spr_bullets_2.png new file mode 100644 index 0000000..ecc487d Binary files /dev/null and b/sprites/images/spr_bullets_2.png differ diff --git a/sprites/spr_lazer_bullet.sprite.gmx b/sprites/spr_bullets.sprite.gmx similarity index 77% rename from sprites/spr_lazer_bullet.sprite.gmx rename to sprites/spr_bullets.sprite.gmx index 53c7fcf..314cf82 100644 --- a/sprites/spr_lazer_bullet.sprite.gmx +++ b/sprites/spr_bullets.sprite.gmx @@ -20,8 +20,8 @@ 32 32 - images\spr_lazer_bullet_0.png - images\spr_lazer_bullet_1.png - images\spr_lazer_bullet_2.png + images\spr_bullets_0.png + images\spr_bullets_1.png + images\spr_bullets_2.png