From a7de63582b29721f0d13e83c792ee1532ae6b8db Mon Sep 17 00:00:00 2001 From: rsninja722 Date: Mon, 20 Apr 2020 02:28:48 -0400 Subject: [PATCH] lung and chandelier --- docs/assets/images/chandelier.png | Bin 0 -> 902 bytes docs/assets/images/lungBack.png | Bin 0 -> 304 bytes docs/assets/images/lungCover.png | Bin 0 -> 368 bytes docs/assets/images/lungs.png | Bin 0 -> 539 bytes docs/assets/images/playerFoot.png | Bin 0 -> 124 bytes docs/assets/images/playerFootActive.png | Bin 0 -> 159 bytes docs/assets/js/UI/ui.js | 13 ++++++-- docs/assets/js/index.js | 8 ++++- docs/assets/js/player/player.js | 40 +++++++++++++++--------- docs/assets/js/playing/playing.js | 1 + docs/assets/js/transition/transition.js | 1 + 11 files changed, 46 insertions(+), 17 deletions(-) create mode 100644 docs/assets/images/chandelier.png create mode 100644 docs/assets/images/lungBack.png create mode 100644 docs/assets/images/lungCover.png create mode 100644 docs/assets/images/lungs.png create mode 100644 docs/assets/images/playerFoot.png create mode 100644 docs/assets/images/playerFootActive.png diff --git a/docs/assets/images/chandelier.png b/docs/assets/images/chandelier.png new file mode 100644 index 0000000000000000000000000000000000000000..2e0ced08e0338c8784565feb012ec947763d3b35 GIT binary patch literal 902 zcmV;119|+3P)!5XIpZ8^4W=8-!Xwt#K(8&#EW~PalZr6%m5fKz-wG575cjUH-a98~4v>^UaN_3qU>NZVgZl z^z`(z+u3>2n!47wl?3Xmv7tay)ozj+l^VnJ6g36|os6BX@ffAk0Oeqa8g(eaoS(mR zCnrA%`=+i@{=K{VfVQ>{7UH=GtlbB25}aVEra_)uC$ z1GSEIXe>UU43g`U>(siz;5^H*L#-@1P;pt!Dz*tr8E!LTLSjnVb!DCfQq+ub;V4CY zKsgWrE9^2j{Ai%~AA`numf}*!ecMeG(1!6C*DwxN*OqQ8zBXgks=p6Bwd#V6q#=T1>46K zAZcpVoVc(Mfb-$fipXInY@?mc=uzqueFBnzL%yj+ViBVWJ7VA}d2vY&cAOW7!(*e|cH zo{_vN(LmSNk4TjC)s;NwI%Z|t*3);}uD6+Jpa@p#MXRW)X)xHa_HjHQ%P*Fl}=DS>ng2L019;YwqUBKa(BtWfAIcRy_CCI+x zR|aTXTIWd5mZg{z{4h|jidRWuv5g%+-g79u{|wpGz= c)D~L!AI6C(Xtu8$?EnA(07*qoM6N<$f{V|o*#H0l literal 0 HcmV?d00001 diff --git a/docs/assets/images/lungBack.png b/docs/assets/images/lungBack.png new file mode 100644 index 0000000000000000000000000000000000000000..83031473f01cf2772a54a878b2db23d4a0dae184 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0YL1}!3HF2COSO^Qk(@Ik;M!Qd`Cc-ajG_-G*Ix7 zr;B4q#hka-9kUJvFt`R@7EM{S+hBL$)X2Wm1(#%RG;;9q+=$Eh{cuia%_r8KM-JY8 z%fRq}o$vG>xoMTP*Z=-4jQf84f9d~^e?Gnvuk<_MfdVsbRehMd^@HE_*Kdn&{aL!d z{(sRwo4e=l9oV17J()v-69wKpwC%%#oJ1i;WmFh_LriXtu8&fJ3JOf&zI~{9bE_vy s4=T(_jIJoyX3*JS@>QRQ!C-~{Y`%u`H{za#1AWWj>FVdQ&MBb@0DJp%!~g&Q literal 0 HcmV?d00001 diff --git a/docs/assets/images/lungCover.png b/docs/assets/images/lungCover.png new file mode 100644 index 0000000000000000000000000000000000000000..14c3fc8bfd0f51a8dafdf67043eec24d2c4f3ac1 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0YL1}!3HF2COSO^Qk(@Ik;M!Qd`Cc-ajG_-Gy?;p zlBbJfNX4ADcMZLm14SGz+COUBQq22EC})#|^EAbc7sFzj=T6gemli$KpFVdQ&MBb@0DL}(%>V!Z literal 0 HcmV?d00001 diff --git a/docs/assets/images/lungs.png b/docs/assets/images/lungs.png new file mode 100644 index 0000000000000000000000000000000000000000..671c4d9158f752a07c0085ce299719dc44461e12 GIT binary patch literal 539 zcmV+$0_6RPP)jB(9z0USC+Yo{OjDhR(lkMs1xK~T* zju;@QxAjN&@bX?Jm~K#KtHXnC{q^00pkrqMK(Wrf5ooWuCIDvrx!LrA=@cV%R|Yuu zy+_Msm$8uoU^W=x2w*T$3T1$E?!k!9SsTRwv*Bh2S7ZHGtkuv44}owg5ny2u^rV$ zS@7CW8-hwDU?022Y(ve=3zy(Aq7BJN%0Mgoh+22V;?>##TNMkx7>ED>y-GqU{FrrH z?gNX;pvy1-Kw4F62hh6xT!yGC;9tR~45-H12^j$0=iL;s7c!uiiPPs9Xb`=O^iZOV z(Xrf=fZF-NQ$0RZ2HNsMBB)e?)&WvoDs&#PpeJQn11$ip>UW)^ZkP-}JHgL@>XqY< z61@vXOQ0-}`mFdO7NT~Z1i+nEnP(s}UxT}V6h>&HzOMdN{+a-$W;_;%`z@c%mE&F4 d_W>$j+1|*LJgkjR%f7=C~|2%&H2%2;{)=g+_Y-~K}H0SyM>$j+1|*LJgUF+)Dj0pH=PR?0+J61=yy= y?&kS-{ph`e6B0nc#Y{+Y$IjS halfPI) { @@ -326,8 +326,20 @@ Player.prototype.draw = function() { img(sprites.playerLeg,(this.leftLeg.x+this.leftLeg.x2)/2,(this.leftLeg.y+this.leftLeg.y2)/2,this.leftLeg.angle+pi/2,4,4); img(sprites.playerLeg,(this.rightLeg.x+this.rightLeg.x2)/2,(this.rightLeg.y+this.rightLeg.y2)/2,this.rightLeg.angle+pi/2,4,4); - - + if(this.shouldMoveLeg) { + if(this.legSelected === "R") { + var active = collidingWithWorld({x: this.rightLeg.x2, y: this.rightLeg.y2, w:8, h:8}); + img(sprites.playerFoot,this.leftLeg.x2,this.leftLeg.y2,0,-4,4); + img(sprites["playerFoot" + (active ? "Active" : "")],this.rightLeg.x2,this.rightLeg.y2,0,4,4); + } else { + var active = collidingWithWorld({x: this.leftLeg.x2, y: this.leftLeg.y2, w:8, h:8}); + img(sprites["playerFoot" + (active ? "Active" : "")],this.leftLeg.x2,this.leftLeg.y2,0,-4,4); + img(sprites.playerFoot,this.rightLeg.x2,this.rightLeg.y2,0,4,4); + } + } else { + img(sprites.playerFoot,this.leftLeg.x2,this.leftLeg.y2,0,-4,4); + img(sprites.playerFoot,this.rightLeg.x2,this.rightLeg.y2,0,4,4); + } } // https://github.com/scottglz/distance-to-line-segment/blob/master/index.js diff --git a/docs/assets/js/playing/playing.js b/docs/assets/js/playing/playing.js index 4b08a29..50eac5c 100644 --- a/docs/assets/js/playing/playing.js +++ b/docs/assets/js/playing/playing.js @@ -82,6 +82,7 @@ function drawPlaying() { imgIgnoreCutoff(sprites.epic,0,0); imgIgnoreCutoff(sprites.post,-740,156,0,4,4); + imgIgnoreCutoff(sprites.chandelier,770,-235,0,4,4); if(boxOnTable) { imgIgnoreCutoff(sprites.boxNoOutline,-140,116,0,4,4); diff --git a/docs/assets/js/transition/transition.js b/docs/assets/js/transition/transition.js index b542f22..4d8cf2a 100644 --- a/docs/assets/js/transition/transition.js +++ b/docs/assets/js/transition/transition.js @@ -39,6 +39,7 @@ function drawLevelTransitionUI() { // draws background sprites drawWorldBlocks(); imgIgnoreCutoff(sprites.epic,0,0); + imgIgnoreCutoff(sprites.chandelier,770,-235,0,4,4); player.draw(); // sets alpha to calculated alpha for black