From db800eea27599e598ae82dbb1bed8a68f0addddf Mon Sep 17 00:00:00 2001 From: rsninja722 Date: Mon, 20 Apr 2020 17:15:50 -0400 Subject: [PATCH] more tutorial cus my mom was confuesd --- docs/assets/images/turn.png | Bin 0 -> 243 bytes docs/assets/js/UI/ui.js | 6 +++--- docs/assets/js/constants.js | 2 +- docs/assets/js/index.js | 3 ++- docs/assets/js/player/player.js | 8 ++++++-- docs/assets/js/playing/playing.js | 15 ++++++++++++++- 6 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 docs/assets/images/turn.png diff --git a/docs/assets/images/turn.png b/docs/assets/images/turn.png new file mode 100644 index 0000000000000000000000000000000000000000..000a6f4f5b03cb8e286920e2bf7eb4f19f4a9ad9 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU7jwEArbCxr(NW2FyL@`>*jZH zp>?Zt=8ppkP7Bs%`gYl?xxJgmzHnLYr>RkYyl?ui)O)@->U|)?p;;Yit7;p>kFh*B zwzWa*1aE`e7Kf^5nKQ+uwuCf<6?1twZc%Y*&_5%1q^W{2Vc}J4e{CB9Ee7)!td}Mk zFjn<0ow;Dv)$YY=RWD=h;$Jg5Xq7zX^Jiduz_)pW8bj{kDJ)D0RZJz4zB3!+-!R(n rx2YfaZ{5!Pfmw?|snJ70Xa|G%q7KEW5AQt!`hvmJ)z4*}Q$iB}8ckct literal 0 HcmV?d00001 diff --git a/docs/assets/js/UI/ui.js b/docs/assets/js/UI/ui.js index c87fa14..87fe9b2 100644 --- a/docs/assets/js/UI/ui.js +++ b/docs/assets/js/UI/ui.js @@ -156,11 +156,11 @@ function heartBeatUI(x, y, width, height) { //Backdrop var BackdropColor; if (pressure > 42 && pressure < 60) { - BackdropColor = "#0c2605"; + BackdropColor = "#398026"; } else if (pressure > 28 && pressure < 75) { - BackdropColor = "#2b2b06"; + BackdropColor = "#9e9e2e"; } else { - BackdropColor = "#260505"; + BackdropColor = "#d42828"; } rect(x + width / 2, y + height / 2, width, height, BackdropColor); img(sprites.heartBack, cw - 107, ch - 46 + playingUIOffsets.heart); diff --git a/docs/assets/js/constants.js b/docs/assets/js/constants.js index 025fddf..4299004 100644 --- a/docs/assets/js/constants.js +++ b/docs/assets/js/constants.js @@ -59,7 +59,7 @@ var constants = { offset_x: 16, offset_y: 35 }, - defaultX: 575, + defaultX: 535, defaultY: -155 } diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js index ea8b467..1fb6937 100644 --- a/docs/assets/js/index.js +++ b/docs/assets/js/index.js @@ -38,7 +38,8 @@ images = [ "buttonBig.png", "buttonSmallHover.png", "buttonSmall.png", - "backGround.png" + "backGround.png", + "turn.png" ]; audio = [ diff --git a/docs/assets/js/player/player.js b/docs/assets/js/player/player.js index f933e15..1a9e73a 100644 --- a/docs/assets/js/player/player.js +++ b/docs/assets/js/player/player.js @@ -6,8 +6,8 @@ class Player { this.h = constants.player.height; this.hipLeft = { x: this.x + constants.player.hip.offset_x, y: this.y + constants.player.hip.offset_y }; this.hipRight = { x: this.x - constants.player.hip.offset_x, y: this.y + constants.player.hip.offset_y }; - this.leftLeg = new Leg(this.hipLeft.x, this.hipLeft.y, constants.player.leg_length, Math.PI*2.5); - this.rightLeg = new Leg(this.hipRight.x, this.hipRight.y, constants.player.leg_length, Math.PI*2.5); + this.leftLeg = new Leg(this.hipLeft.x, this.hipLeft.y, constants.player.leg_length, 1.5); + this.rightLeg = new Leg(this.hipRight.x, this.hipRight.y, constants.player.leg_length, 1.5); this.leftArm = new Arm(this.hipLeft.x + 8, this.y - constants.player.hip.offset_y, 64, Math.PI/2); this.rightArm = new Arm(this.hipRight.x - 8, this.y - constants.player.hip.offset_y, 64, Math.PI/2); this.head = {x:this.x,y:this.y-this.h/2,angle:Math.PI*1.5}; @@ -180,6 +180,10 @@ Player.prototype.moveLeg = function(){ // console.log(curLeg.angle.toPrecision(5),pointTo(curLeg,target).toPrecision(5)); var angleDif = turn(curLeg.angle, pointTo(curLeg, target), constants.player.leg_speed) - curLeg.angle; + if(Math.abs(angleDif) > 1) { + curLeg.angle = pointTo(curLeg, target); + angleDif = 0; + } curLeg.angle += angleDif; curLeg.x2 = curLeg.x + curLeg.len * Math.cos(curLeg.angle); curLeg.y2 = curLeg.y + curLeg.len * Math.sin(curLeg.angle); diff --git a/docs/assets/js/playing/playing.js b/docs/assets/js/playing/playing.js index 47ba5ab..ebada01 100644 --- a/docs/assets/js/playing/playing.js +++ b/docs/assets/js/playing/playing.js @@ -101,6 +101,18 @@ function drawPlaying() { // drawWorldBlocks(); player.draw(); + + if(player.shouldMoveLeg) { + curCtx.globalAlpha = 0.3; + curCtx.lineCap = "round"; + curCtx.shadowColor = "yellow"; + curCtx.shadowBlur = 10; + line(player.x,player.y,mousePosition().x,mousePosition().y,2*clamp(dist(player.getActiveLeg(), mousePosition()) / constants.player.movement_divider, 0.1, constants.player.max_movement_speed),"#baba30"); + curCtx.shadowBlur = 0; + curCtx.shadowColor = "black"; + curCtx.lineCap = "butt"; + curCtx.globalAlpha = 1; + } // beat key if(keyPrompts.beat > 0 && playingUIOffsets.heart === 0) { @@ -127,7 +139,8 @@ function drawPlaying() { img(sprites["tutSelect"+~~(frameCount/10)%2],(player.leftLeg.x+player.leftLeg.x2)/2,(player.leftLeg.y+player.leftLeg.y2)/2,0,2,2); break; case tutorialStates.placeOnGround: - img(sprites["tutSelect"+~~(frameCount/10)%2],500,-40,2,2); + img(sprites["tutSelect"+~~(frameCount/10)%2],430,-10,0,2,2); + img(sprites.turn,560,-140,(~~(frameCount/10)%2) / 4,2,2); break; case tutorialStates.goDownStairs: img(sprites.tutArrow,360+~~(frameCount/10)%2,-30-~~(frameCount/10)%2,0,2,2);