Merge pull request #28 from marcins1/master

Edycja timer'a, dodanie punktów za ukończenie poziomu

Author: marcins1

js/app_p5.js

@@ -119,9 +119,14 @@ var espeed = 2;
 //Every second the opponent can shoot
 var ttshot = 2;
 
-var minutes = 0;
+var minutes = 3;
 var seconds = 0;
 var tcounter = 0;
+var maxtime = minutes * 60 + seconds;
+
+//Number of shot
+var noshot = 0;
+var score = [];
 
 //Images
 var enemyimg;
@@ -280,6 +285,8 @@ function stageCompleted() {
   textSize(50);
   fill('#000000');
   text("Congratulations!!!", 500, 100);
+  text("Your score:", 575, 175);
+  text(score, 640, 250);
   text("Level " + (stageid + 1) + " Completed", 500, 400);
   text("Press SPACE to Continue", 500, 700);
   fill('#FFFFFF');
@@ -482,7 +489,10 @@ function gravity(maxy, maxid) {
     else
       py = maxy - sy - 1;
   } else {
-    if (maxid === maxp[stageid]) completed = true;
+    if (maxid === maxp[stageid]) {
+      completed = true;
+      countPoints();
+    }
   }
 }
 
@@ -582,6 +592,7 @@ function newBullet(enumber) {
   for (i = 0; i < bmax; i++) {
     if (!bullets[i][5]) {
       if (enumber === -1) {
+        noshot++;
         bullets[i][1] = py;
         bullets[i][2] = bsize;
         if (direction[0] && direction[2]) {
@@ -663,7 +674,9 @@ function restartGame() {
   }
   for (j = 0; j < bmax; j++) bullets[j][5] = 0;
   seconds = 0;
-  minutes = 0;
+  minutes = 3;
+  score[stageid] = 0;
+  noshot = 0;
   lastp = getLastPlatform();
 }
 
@@ -723,16 +736,18 @@ function drawHUD() {
   fill('black');
   text(plifep, 82, 65);
   drawTimer();
+  fill('#FFFFFF');
 }
 
 function drawTimer() {
-  if (tcounter < 60) tcounter++;
-  else if (tcounter === 60) {
+  if (tcounter < 59) tcounter++;
+  else if (tcounter === 59) {
     tcounter = 0;
-    seconds++;
-    if (seconds === 60) {
-      minutes++;
-      seconds = 0;
+    seconds--;
+    if (minutes === 0 && seconds === 0) lose();
+    if (seconds === -1) {
+        seconds = 59;
+        minutes--;
     }
   }
   text(minutes, 647, 65);
@@ -743,7 +758,6 @@ function drawTimer() {
     text('0', 707, 65);
     text(seconds, 732, 65);
   }
-  fill('#FFFFFF');
 }
 
 function damage() {
@@ -768,6 +782,10 @@ function damage() {
           if (bullets[j][0] >= enemies[stageid][l][0] - bullets[j][2] / 2 && bullets[j][0] <= enemies[stageid][l][0] + esize + bullets[j][2] / 2) {
             bullets[j][5] = false;
             lifePoints(l, -1);
+            if (enemies[stageid][l][7] === 0) {
+              if (enemies[stageid][l][5] === 0) score[stageid] += 150;
+              else score[stageid] += 250;
+            }
           }
         }
       }
@@ -833,3 +851,12 @@ function spikesCollision() {
       if ((spikes[stageid][i][2] === 2 && pposx >= spikes[stageid][i][0] - sheight - sx / 3 && pposx <= spikes[stageid][i][0] + sx) || (spikes[stageid][i][2] === 3 && pposx >= spikes[stageid][i][0] && pposx <= spikes[stageid][i][0] + sheight)) lifePoints(-1, -1);
   }
 }
+
+function countPoints() {
+  for (k = 1; k <= plifep; k++) score[stageid] += 75;
+  var points = (60 * minutes + seconds) * 300 / maxtime;
+  if (noshot === 0) noshot++;
+  var points2 = 350 / noshot;
+  score[stageid] = score[stageid] + points + points2;
+  score[stageid] = Math.round(score[stageid]);
+}