From 228768e3565aaa9abf907c56c02248bbf64be7f5 Mon Sep 17 00:00:00 2001 From: rsninja722 Date: Sat, 18 Apr 2020 20:14:09 -0400 Subject: [PATCH] angle fix and background --- docs/assets/images/level_2.png | Bin 0 -> 9472 bytes docs/assets/js/index.js | 6 ++++-- docs/assets/js/player/player.js | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 docs/assets/images/level_2.png diff --git a/docs/assets/images/level_2.png b/docs/assets/images/level_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b2bd9ef603f44e8c928fa992ee9e47ec18c43391 GIT binary patch literal 9472 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 literal 0 HcmV?d00001 diff --git a/docs/assets/js/index.js b/docs/assets/js/index.js index 4e738f9..7c59cf5 100644 --- a/docs/assets/js/index.js +++ b/docs/assets/js/index.js @@ -4,7 +4,8 @@ page_preloader.show(true); images = [ "assets/images/", - "level.png" + "level.png", + "level_2.png" ]; audio = [ @@ -72,6 +73,7 @@ function draw() { case globalStates.playing: camera.zoom = 1; drawWorldBlocks(); + imgIgnoreCutoff(sprites.level_2,0,0,0,4,4); player.draw(); break; // paused @@ -84,7 +86,7 @@ function draw() { break; //building - to be used only in development case globalStates.building: - imgIgnoreCutoff(sprites.level,0,0); + buildDraw(); break; } diff --git a/docs/assets/js/player/player.js b/docs/assets/js/player/player.js index 236a189..1d1e94b 100644 --- a/docs/assets/js/player/player.js +++ b/docs/assets/js/player/player.js @@ -96,17 +96,19 @@ Player.prototype.moveLeg = function(){ // move selected leg towards mouse // console.log(curLeg.angle.toPrecision(5),pointTo(curLeg,target).toPrecision(5)); - curLeg.angle = turn(curLeg.angle, pointTo(curLeg, target), constants.player.leg_speed); + var angleDif = turn(curLeg.angle, pointTo(curLeg, target), constants.player.leg_speed) - curLeg.angle; + curLeg.angle += angleDif; // var angle = pointTo(curLeg,target); curLeg.x2 = curLeg.x + curLeg.len * Math.cos(curLeg.angle); curLeg.y2 = curLeg.y + curLeg.len * Math.sin(curLeg.angle); // Collision - if(collidingWithWorld({x:curLeg.x2,y:curLeg.y2,w:4,h:4})){ + if(collidingWithWorld({x:curLeg.x2,y:curLeg.y2,w:2,h:2})){ this.collided = true; curLeg.x2 = lastX; curLeg.y2 = lastY; + curLeg.angle -= angleDif; return 0; }