Clearing stuff up. Added current equipped item to ingame screen

AmaanC · Jan 9, 2015 · 72d3e3a · 72d3e3a
1 parent db86485
commit 72d3e3a
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 37 deletions.
diff --git a/build/build.js b/build/build.js
diff --git a/src/collisions.js b/src/collisions.js
@@ -7,11 +7,6 @@ var playerHitBox = {
     width: 50,
     height: 60
 };
-var angledCollision = function(player, fo) {
-    var colliding = false;
-    colliding = aabb(playerHitBox, fo);
-    return colliding;
-};
 
 var aabb = function(a, b) {
     if (
@@ -93,7 +88,7 @@ var check = function(player, foModule) {
     var fo;
     for (var i = 0; i < foToTest.length; i++) {
         fo = foToTest[i];
-        if (angledCollision(player, fo)) {
+        if (aabb(playerHitBox, fo)) {
             // console.log('HIT');
             fo.alive = false;
             if (fo.image === 'power-icon.png') {

diff --git a/src/main.js b/src/main.js
@@ -10,6 +10,7 @@ var menus = require('./menus');
 var buttons = require('./buttons');
 var audio = require('./audio');
 var store = require('./store');
+var achievements = require('./achievements');
 
 var canvas = document.querySelector('#game');
 var ctx = canvas.getContext('2d');
@@ -53,7 +54,7 @@ loader.done(function() {
             particles.draw(elapsed, ctx, player);
             flyingObjects.loop(elapsed, ctx, player.offsetX, player.offsetY);
             player.draw(ctx);
-            menus.ingame(ctx, player.fuel, player.health, player.money);
+            menus.ingame(ctx, player.fuel, player.health, player.money, player.equipped);
 
             player.money += 0.01;
             if (player.triggered === 'poison') {

diff --git a/src/menus.js b/src/menus.js
@@ -68,7 +68,7 @@ module.exports = {
             ctx.font = '26pt Tempesta Five';
         });
     },
-    ingame: function(ctx, fuel, health, money) {
+    ingame: function(ctx, fuel, health, money, equipped) {
         ctx.drawImage(loader.images['power-bar-icon.png'], 30, 500);
         ctx.fillStyle = 'orange';
         ctx.fillRect(30, 490 - fuel, 20, fuel);
@@ -81,6 +81,10 @@ module.exports = {
             ctx.font = '12pt Tempesta Five';
             ctx.fillStyle = 'white';
         });
+        text.write('Equipped: ' + equipped, 30, 590, function() {
+            ctx.font = '10pt Tempesta Five';
+            ctx.fillStyle = 'white';
+        });
     },
     drawStore: function(ctx, totalMoney) {
         ctx.fillStyle = '#0f0d20';

diff --git a/src/stats.js b/src/stats.js
diff --git a/src/store.js b/src/store.js
@@ -1,17 +1,18 @@
+// Handles the market / store part of the game
 var player = require('./player');
 var buttons = require('./buttons');
 
 var items = [
     {
         name: 'Health',
-        desc: 'Increases health by 10',
+        desc: 'Increases starting health by 10',
         fn: function() {
             player.defaults.health += 10;
         }
     },
     {
         name: 'Fuel',
-        desc: 'Increases fuel by 10',
+        desc: 'Increases starting fuel by 10',
         fn: function() {
             player.defaults.fuel += 10;
         }
@@ -21,6 +22,7 @@ var items = [
         desc: '',
         fn: function() {
             player.colors = ['blue', 'red'];
+            // player.colors = ['white', 'anything'];
         }
     },
     {