minor refactoring and added server.js (I'm learning to use nodeJS)

david-fong · david-fong · commit b5774204a477 · 2019-06-08T19:57:26.000-07:00
diff --git a/assets/style.css b/assets/style.css
@@ -1,13 +1,14 @@
 /* GENERAL */
 body {
-  --pauseFilter:    grayscale(100%) brightness(130%) contrast(60%);
-  
   font:             90% Trebuchet MS;
   text-align:       center;
   color:            black;
   transition:       filter 0.5s ease-in-out;
   user-select:      none;
 }
+[data-paused] {
+  filter:           grayscale(100%) brightness(130%) contrast(60%);
+}
 .background {
   height:           100%;
   width:            100%;
diff --git a/favicon.ico b/favicon.ico
diff --git a/index.html b/index.html
@@ -6,7 +6,7 @@
     <meta name='description'  content='An original game based on the snake game.' />
     <meta name='viewport'     content='width=device-width, initial-scale=1.0' />
     <meta charset='UTF-8' />
-    <link rel='icon' href='assets/favicon.png' type='image/png'/>
+    <link rel='icon' href='favicon.ico' type='image/png'/>
     
     <script src='source/sounds.js'>       </script>
     <script src='source/options_menu.js'> </script>
@@ -19,7 +19,7 @@
     <!-- Main Formatting: -->
     <link rel='stylesheet'
           type='text/css'
-          href='style.css'>
+          href='assets/style.css'>
           </style>
           
     <!-- List of language filenames: -->
@@ -73,6 +73,14 @@
     
     <!-- Run Game Code: -->
     <script>
+      // Disable scroll-down via spacebar:
+      window.addEventListener('keydown', (event) => {
+        if (event.keyCode == 32 && event.target == document.body) {
+          event.preventDefault();
+          return false;
+        }
+      });
+      
       const GAME = new Game();
     </script>
   </body>
diff --git a/server.js b/server.js
@@ -0,0 +1,59 @@
+'use strict';
+
+const PORT_NUM = 8080;
+
+const HTTP  = require('http');
+const URL   = require('url');
+const FS    = require('fs');
+
+
+
+HTTP.createServer((req, res) => {
+  
+  // Decode the url:
+  const url = URL.parse(req.url, true)
+  let  path = url.pathname.slice(1);
+  if (path.length == 0) { path = 'index.html'; }
+  FS.access(path, (err) => {
+    if (err || path.includes('..')) {
+      path = 'index.html';
+    }
+  });
+  const ctype = contentTypes[path.split('.').pop().toLowerCase()];
+  const query = url.query;
+  console.log(url, path, ctype);
+  
+  // Respond to a request:
+  if (req.method == 'GET') {
+    
+    // Clean the path argument:
+    FS.readFile(path, (err, data) => {
+      if (err) {
+        console.error(err);
+        res.statusCode = 400;
+      } else {
+        res.writeHead(200, {'Content-Type': ctype});
+        res.write(data);
+      }
+      res.end();
+    });
+    
+  } else {
+    res.statusCode = 404;
+    res.end();
+  }
+  
+}).listen(PORT_NUM);
+
+
+
+const contentTypes = {
+  'html': 'text/html',
+  'js':   'text/javascript',
+  'css':  'text/css',
+  
+  'png':  'image/png',
+  'ico':  'image/png',
+  'wav':  'audio/wav',
+  'mp3':  'audio/mpeg',
+}
diff --git a/source/game.js b/source/game.js
@@ -75,15 +75,10 @@ function weightedChoice(weights) {
  *
  *
  * TODO:
- * change populations implementation to be separate class:
- *   array of arrays of keys. outer array holds pool of keys
- *   that have been spawned <outer-index> times. Initially all in
- *   outer entry #zero, which is shuffled once on start. When spawned,
- *   shuffled into next outer-entry at random spot. When spawning,
- *   go through each key in order until one is found that can spawn there.
+ * somehow move away from balancing populations on shuffle
+ *   with such space&computationally costly methods.
  * 
  * fix the broken progress/difficulty bar (broken because of cs selectors)
- * fix bugs with the new backtracking.
  * 
  * make game runner_catch and gameover sounds.
  */
@@ -98,14 +93,6 @@ class Game {
     const dGrid = document.getElementById('grid');
     dGrid.style.setProperty('--width-in-tiles', width);
     
-    // Disable scroll-down via spacebar:
-    window.addEventListener('keydown', (event) => {
-      if (event.keyCode == 32 && event.target == document.body) {
-        event.preventDefault();
-        return false;
-      }
-    });
-    
     // Initialize Table display:
     for (let y = 0; y < width; y++) {
       const row = dGrid.insertRow();
@@ -274,14 +261,14 @@ class Game {
     // The player pressed the pause button:
     if (!this.paused) {
       this.backgroundMusic.pause();
-      document.body.style.filter = 'var(--pauseFilter)';
+      document.body.dataset.paused = 'this attribute exists.';
       
     // The user pressed the un-pause button:
     } else {
       if (!this.muted) {
         this.backgroundMusic.play();
       }
-      document.body.style.filter = '';
+      delete document.body.dataset.paused;
       this.chaserCancel = setTimeout(that.moveChaser.bind(that), 1000);
       this.nommerCancel = setTimeout(that.moveNommer.bind(that), 1000);
       this.runnerCancel = setTimeout(that.moveRunner.bind(that), 1000);
diff --git a/source/player.js b/source/player.js
@@ -109,7 +109,9 @@ class Player {
     for (let i = 0; i < game.targets.length; i++) {
       if (dest.equals(game.targets[i])) {
         this.score += 1;
-        if (!this.game.muted) SoundEffects.playEffectFrom(Player.eatSounds);
+        if (!this.game.muted) {
+          SoundEffects.playEffectFrom(Player.eatSounds);
+        }
         game.heat = game.numTargets * Math.sqrt(
           game.heat / game.numTargets + 1);
         
