From b9c965c6aeb7340eb0fe9bf7c7d63bf1d72283b0 Mon Sep 17 00:00:00 2001 From: JoshuanBurger12 Date: Thu, 10 Sep 2020 11:52:49 +1200 Subject: [PATCH] CommitLog | --- Spaceinator.project.gmx | 3 +- objects/obj_bullet.object.gmx | 50 +++++++++++------------ objects/obj_player.object.gmx | 68 ++++++++++++++++---------------- sprites/images/spr_blocks_3.png | Bin 0 -> 1056 bytes sprites/spr_blocks.sprite.gmx | 1 + 5 files changed, 62 insertions(+), 60 deletions(-) create mode 100644 sprites/images/spr_blocks_3.png 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 0000000000000000000000000000000000000000..5937c3b8e3b6af6a5d1426cb37585b2529e90d4c GIT binary patch literal 1056 zcmV+*1mF9KP)Dh;f(%tvOaNv3IO*ncmG@=|#Vh~D-)8n)p93KA&CQ-Gmsee_w&fa)9a-)6SJ&&MBZK@7@IHV}=g?hT zymF_fPh2)T>(0&+E|*KXe11WIkRU8^uXilKE0qu4=YHtEi2&T*9(mO-OY(Ag#Z{{x z<@fpdyek&p2*Ag+U)z!LGZ55NCSX}Zzyl~CtZXkJ~ z@LKlgatW8oJe7T1e-waT?}t~-hDZH#(Ev#l)Vn^Y;l1zWI_yw+CiBdDc5Y~2xK>WW z0dS*M+m_xFu-W|V>h({OfHpK5ss2Nq&Vjc_nPE?*vLP*C)$7|s32AMswJZBf+_cGn z42>c5Av#zfX)ZS}^p0x4=r0r&MR@4N08oTqSC^Noq7mX)Tr_4{8Sw!fMQAr_sjl5V z7@`g^+#@hdHJd46js(^MVlf$92Q2O7H*skl-`O)0)+c&Q(r)*g=s?#|f5f;CFsd<- zR0ty`LY^lvduR*K@I0-cb&Ndh1povY*_Q;c0@Y?r+J;4`npQzSQ)H&qYV8R_`TXM0 zWKaxk0We_30)UBD>x%?{G7@F8bD|MOl8U$w0{}skw8mNmaIOOa5!!VX`fFa;Bgu(m+GWh?--<`n@zQu;{Mb`A7#zR!K8#2l0Mk=z#XA^@lh(klY+ zoj$AJ=K5|KXSHVOJP!bUw=9W%czyyAE<6}gQUnDEs^={@so$HeqZNC_8+);1$Y%P@ z(jFd0Qg1$@z7fw*3;;z=(zt-O7odn2%9ZA5okUIn0wNH?W2AJR!vj(^tufCq?V$Rp z0pMoLJw3KWut8EI^RBtC4J5;dZEO^=#V88%yB8EaebS9-OxF0Q#eI&^{p0O&Q9 zat1(fEQDlqPG-M@Lk*`To`+G28}*Zb2uXs0pmcieKM75eSj}jsf2>2e<_j#2W_}hU zop9P^W@LvKCW)!x8X^V^dh(0-j{_h9{}Ip)-${;;2LRUo9soUr>_5CglRoMb{ZF*z aZ^17t<@7HAksqW00000images\spr_blocks_0.png images\spr_blocks_1.png images\spr_blocks_2.png + images\spr_blocks_3.png