Changeset 286

Timestamp:

04/18/16 03:00:39 (9 years ago)

Author:

atzm

Message:

add the `round'

File:

• pycodeshooter/trunk/shooter/system.js (modified) (6 diffs)

pycodeshooter/trunk/shooter/system.js

@@ -28 +28 @@
     "score":            {},
     "stage":            -1,
+    "round":            1,
     "backgroundObject": new Array(),
     "deathPieces":      new Array(),
@@ -282 +283 @@
 }
 
+function getRoundNumber() {
+    return System.round;
+}
+
 function switchStage(base) {
     var scores   = Object.keys(System.score);
@@ -302 +307 @@
     stage        = Math.floor((score % (stages.length * base)) / base) + 1;
     switched     = System.stage != stage;
+    System.round = System.stage > stage ? System.round + 1 : System.round;
     System.stage = stage;
 
@@ -357 +363 @@
     var brrgs   = new Array();
 
-    var bulletWay         = Math.ceil(enemyData.concentration / 10);
+    var bulletWay         = Math.ceil(enemyData.concentration / 10) * getRoundNumber();
     var bulletInterval    = Math.round(50 * 1 / Math.log(enemyData.skillpoint + 0.1));
     var bulletSize        = Math.round(Math.log(enemyData.luck + 1));
     var bulletFrameWidth  = (bulletSize + 5) * 2;
     var bulletFrameHeight = (bulletSize + 5) * 4;
-    var bulletSpeed       = enemyData.strength / 15;
+    var bulletSpeed       = (enemyData.strength / 15) * getRoundNumber();
 
     bulletSpeed = Math.log(bulletSpeed < 1.5 ? 1.5 : bulletSpeed);
@@ -433 +439 @@
             );
 
-            var itemAttr;
-            var itemRand = Math.floor(Math.random() * 100);
-            if (itemRand < 40) {
-                // nothing
+            var itemAttr = null;
+
+          PLAYERSLOOP:
+            for (var i = 0; i < System.players.length; i++) {
+                for (var k = 0; k < System.players[i].barrages.length; k++) {
+                    if (System.players[i].barrages[k].way <= 1) {
+                        itemAttr = {"color": "#FAA", "symbol": "P", "type": "shot", "quantity": 1};
+                        break PLAYERSLOOP;
+                    }
+                }
             }
-            else if (itemRand < 70) {
-                itemAttr = {"color": "#AAF", "symbol": "S", "type": "score", "quantity": enemy.maxLife * 200};
-            }
-            else if (itemRand < 85) {
-                itemAttr = {"color": "#FAA", "symbol": "P", "type": "shot", "quantity": 1};
-            }
-            else if (itemRand < 95) {
-                itemAttr = {"color": "#A5F", "symbol": "W", "type": "wide", "quantity": 1};
-            }
-            else if (itemRand < 98) {
-                itemAttr = {"color": "#FFA", "symbol": "B", "type": "bomb", "quantity": 1};
-            }
-            else {
-                itemAttr = {"color": "#AFA", "symbol": "L", "type": "life", "quantity": 1};
+
+            if (!itemAttr) {
+                var itemRand = Math.floor(Math.random() * 100);
+                if (itemRand < 40) {
+                    // nothing
+                }
+                else if (itemRand < 70) {
+                    itemAttr = {"color": "#AAF", "symbol": "S", "type": "score", "quantity": enemy.maxLife * 200};
+                }
+                else if (itemRand < 85) {
+                    itemAttr = {"color": "#FAA", "symbol": "P", "type": "shot", "quantity": 1};
+                }
+                else if (itemRand < 95) {
+                    itemAttr = {"color": "#A5F", "symbol": "W", "type": "wide", "quantity": 1};
+                }
+                else if (itemRand < 98) {
+                    itemAttr = {"color": "#FFA", "symbol": "B", "type": "bomb", "quantity": 1};
+                }
+                else {
+                    itemAttr = {"color": "#AFA", "symbol": "L", "type": "life", "quantity": 1};
+                }
             }
 
@@ -495 +514 @@
         System.screen.ctx,
         "source-over",
-        "STAGE " + getStageNumber(),
+        "ROUND " + getRoundNumber() + " / STAGE " + getStageNumber(),
         System.screen.width - 10,
         15,