From 4369babdea901ab2d6e7a76d89e13f10d48d9c0c Mon Sep 17 00:00:00 2001 From: SilicaAndPina Date: Sat, 25 Jul 2020 20:40:52 +1200 Subject: [PATCH] CommitLog | --- objects/obj_player.object.gmx | 33 +++++++++++++++++++++++++++++--- sprites/images/spr_player_0.png | Bin 519 -> 405 bytes sprites/images/spr_player_1.png | Bin 405 -> 519 bytes sprites/images/spr_player_2.png | Bin 1196 -> 1143 bytes sprites/images/spr_player_3.png | Bin 1143 -> 1196 bytes 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/objects/obj_player.object.gmx b/objects/obj_player.object.gmx index 780ad42..2fae9f4 100644 --- a/objects/obj_player.object.gmx +++ b/objects/obj_player.object.gmx @@ -26,8 +26,9 @@ 1 /// Player creation code. +ship_type = 0; image_speed = 0; -image_index = 1; +image_index = ship_type; is_moving = false; dead = false; invuln_counter_max = 1*room_speed; @@ -373,6 +374,32 @@ image_speed = 0; instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_gameover_overlay); instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2),obj_respawn); + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + if(global.debug) +{ + ship_type +=2; +} @@ -402,7 +429,7 @@ instance_create(view_xview[0]+(view_wview[0]/2),view_yview[0]+(view_hview[0]/2), is_moving = true; audio_play_sound(snd_engine,1,true); -image_index = 0; +image_index = ship_type+1; @@ -432,7 +459,7 @@ image_index = 0; is_moving = false; audio_stop_sound(snd_engine) -image_index = 1; +image_index = ship_type; diff --git a/sprites/images/spr_player_0.png b/sprites/images/spr_player_0.png index 0616bc5205f1d8f3c76d54467c7b585908c0cd6a..8903737413881cf4accb2bb76d168bb3776ed021 100644 GIT binary patch delta 378 zcmV-=0fqjD1eF7jB!65e+Kmbh-fB*t$dH@6v zK+^-DXTYV;>%GqWXnt}GTeY2uQc{22O*N}hj)q1!BQwih=^BBN!9M_qqDdbZt9kYk2j<+NQcoy*}rdnE8 z;1R@B39lPO3BaHAE~y*Hy8#R9-I5xlB;dcd?pa7zfVJ1Z7SO$);R-NEtYMf$1keB= zx3Hm2L<~*?FmtZw11>uulYr`PptBPa-9)bZSFVes0I&Kmp}VxMz=L>wqUGHUSXi%G zw^!O$(tvTzV#23xJMbC;uOaYGwtl(D`i7yItDRRm*I#cVA|fIpA|fIpA|fIpA|ls) Y0j|-Pnc#1!UH||907*qoM6N<$g0}OeA^-pY literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdoh8U_9sP;uumf=k2V-yk-NDX3JZB z$1Yl2`Bt11pc-_IDRqX;@tO7~Lnj8z|0%Lyt;DlRxjC;FiU;uTZK!&|dc|3Pfm{{i z*9+V$+T$E-zc9TbL+UHLPECEC?WR8IXZ@A^juSZ=GyUQp83i(3UQ>4@Rf%<3WvyqA z*o?Gq$`ch0&bF#Pn=L$5EG$8d+fsSyo#|SJQ4i+r(d~3E`qzKpX=;p-@8$I}6Terg zPu9y{y6wQm8#|OfuJMstBU<5>l;$00EVP=tW^Ot6*^Us=9qL=M8|!UL*LS_~dT{Y8 zzu>QT#=8V}?3*IgpW@-QMz_ExUq>LK(XO>MPbu+{1k>d`c1J|nRWv93W8G!3;MMg5 zh3h^Cuj9<(mg(-b{^ygyca6(NbG>h->Q&Z#=d739oVv|@%K?+($q$_Ov$q{E36H<$ z#jS1dW5RpYsD$uOVT)MoDLz^Y(R?w6ZouD0GlPB>iE~ XGfS~>?uge1Mlge?tDnm{r-UW|hOE~e diff --git a/sprites/images/spr_player_1.png b/sprites/images/spr_player_1.png index 8903737413881cf4accb2bb76d168bb3776ed021..0616bc5205f1d8f3c76d54467c7b585908c0cd6a 100644 GIT binary patch literal 519 zcmeAS@N?(olHy`uVBq!ia0vp^0U*r51|<6gKdoh8U_9sP;uumf=k2V-yk-NDX3JZB z$1Yl2`Bt11pc-_IDRqX;@tO7~Lnj8z|0%Lyt;DlRxjC;FiU;uTZK!&|dc|3Pfm{{i z*9+V$+T$E-zc9TbL+UHLPECEC?WR8IXZ@A^juSZ=GyUQp83i(3UQ>4@Rf%<3WvyqA z*o?Gq$`ch0&bF#Pn=L$5EG$8d+fsSyo#|SJQ4i+r(d~3E`qzKpX=;p-@8$I}6Terg zPu9y{y6wQm8#|OfuJMstBU<5>l;$00EVP=tW^Ot6*^Us=9qL=M8|!UL*LS_~dT{Y8 zzu>QT#=8V}?3*IgpW@-QMz_ExUq>LK(XO>MPbu+{1k>d`c1J|nRWv93W8G!3;MMg5 zh3h^Cuj9<(mg(-b{^ygyca6(NbG>h->Q&Z#=d739oVv|@%K?+($q$_Ov$q{E36H<$ z#jS1dW5RpYsD$uOVT)MoDLz^Y(R?w6ZouD0GlPB>iE~ XGfS~>?uge1Mlge?tDnm{r-UW|hOE~e delta 378 zcmV-=0fqjD1eF7jB!65e+Kmbh-fB*t$dH@6v zK+^-DXTYV;>%GqWXnt}GTeY2uQc{22O*N}hj)q1!BQwih=^BBN!9M_qqDdbZt9kYk2j<+NQcoy*}rdnE8 z;1R@B39lPO3BaHAE~y*Hy8#R9-I5xlB;dcd?pa7zfVJ1Z7SO$);R-NEtYMf$1keB= zx3Hm2L<~*?FmtZw11>uulYr`PptBPa-9)bZSFVes0I&Kmp}VxMz=L>wqUGHUSXi%G zw^!O$(tvTzV#23xJMbC;uOaYGwtl(D`i7yItDRRm*I#cVA|fIpA|fIpA|fIpA|ls) Y0j|-Pnc#1!UH||907*qoM6N<$g0}OeA^-pY diff --git a/sprites/images/spr_player_2.png b/sprites/images/spr_player_2.png index 79f1750efb6d22f0f7ee628470d52d40465b04da..80b221e582e45ae0a42c063e4341586012808644 100644 GIT binary patch delta 1122 zcmV-o1fBb=3HJz)B!50hL_t(|obB8@jub%*0MOnHfj9*cAvZxHgn%1x1OhIA5CJg< z;0};*4*~*04uG_SJfc=!<8PI#x~8TrSzz zJcw3{V!){oGk>qfa1|&4QbZ5npDz#B1jJC>R*qni|kT z(*Ug(DSeGQPI?UdT)QIH0CI1xdn?0(<2iOu$a{zski(;EBE2Uj^1@pHrOem?R8M6N z&>9+1G=Hg8wd1)r@uj4Q(iuhKH}Yjc~q42(Pzxx?cCF`~Df=o8dndVw^!=iBSlUx<`pKr7(^ z;fIIxU`k)(j`J)9qu~C->jmh+%4pN_oV(#=0Af6@0=aB~!_PGmF9b*<3K*#(Z|(^v z;(vJoad3N~Xa#zatQ@u16Y**QF(UV(A}v}ASMbV(f+1I3q-eP_p|t{Q;W)gD1cZPW zQ!1(eS_m!eO3{X#?`n|&h%3s%!QbbB#On|Tw*;WKx;SL*`{A+i{ec|Zu6PhxEu0Bh zD$cq?bs0bk;u#v;=V+^X05AR?Y41kbYJXL_##wjiF9k@aaAeC;HmPNeE9;yGaCbb2 z9#hy`eRzkDfvmq&S`N_KNL$qhQGl$!m759=qQ?}DRv*Mw18P&)g9qXHd*SKuAbL*W z1JDuH6pjFD&ttXtZjn8OJ?FMH&$Aq$bVa%c9>fy=Zw$Rl6_QTj15gR>=1V$-ds_n5 z9@{mdfb>muZwt5JK`aAE?^d8wxCh?UQ45HNNaU1lxfn5p4?ra>z@_mZdIBzw2ay3- o^^X23(F%C=aR4^P0oWFQ0ZnDan0^2KasU7T07*qoM6N<$g5SFMaR2}S delta 1176 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