win conditions and some other stuff

2019-05-29 15:57:04 +10:00
parent cbe83b3a1e
commit 7f422ce8e8
9 changed files with 49 additions and 30 deletions
@@ -18,14 +18,5 @@
  </head>
  <body>
  </body>
-<!--   <script>
-    // Check that service workers are registered
-    if ('serviceWorker' in navigator) {
-      // Use the window load event to keep the page load performant
-      window.addEventListener('load', () => {
-        navigator.serviceWorker.register('./service.worker.js');
-      });
-    }
-  </script>
- -->  <script src="./index.js"></script>
+  <script src="./index.js"></script>
 </html>
@@ -83,7 +83,7 @@ function GamePanel(props) {
        return null;
    }

-    const zero = Date.parse(game.phase_end) - (1000 * 60);
+    const zero = Date.parse(game.phase_start);
    const now = Date.now();
    const end = Date.parse(game.phase_end);
    const timerPct = ((now - zero) / (end - zero) * 100);
@@ -117,7 +117,9 @@ function InfoComponent(args) {

    function Combos() {
        if (!player) return false;
-        if (!(combiner.every(u => u === null))) {
+
+        // show recipe for what's in combiner
+        if (combiner.some(u => u !== null)) {
            const filteredCombos = itemInfo.combos
                .filter(combo => combiner.every(u => u === null
                    || combo.components.includes(player.vbox.bound[u])));
@@ -136,6 +138,7 @@ function InfoComponent(args) {
            );
        }

+        if (!info) return false;
        const vboxCombos = itemInfo.combos.filter(c => c.components.includes(info));
        if (vboxCombos.length > 6) return false;
        return (
@@ -64,7 +64,7 @@ function Instance(args) {
        : null;

    // TIMER
-    const zero = Date.parse(instance.phase_end) - (1000 * 120);
+    const zero = Date.parse(instance.phase_start);
    const now = Date.now();
    const end = Date.parse(instance.phase_end);
    const timerPct = ((now - zero) / (end - zero) * 100);
@@ -64,8 +64,6 @@ function Equipment(props) {
    const isSkill = fullInfo && fullInfo.skill;
    const isSpec = fullInfo && fullInfo.spec;

-    console.log('isSkill', isSkill, fullInfo);
-
    function skillClick(e, i) {
        if (itemUnequip && activeConstruct) return false;
        // const value = vbox.bound[i];
@@ -1,6 +1,5 @@
 module.exports = {
    TIMES: {
-        RESOLUTION_TIME_MS: 1000,
        START_SKILL: 700,
        END_SKILL: 700,
        POST_SKILL: 1000,