cleanup

assets/css/style.css

@@ -155,6 +155,10 @@ canvas {
 	font-size: 20px;
 }
 
+.audio-controls:hover {
+	cursor: pointer;
+}
+
 #album-thumb img {
 	border: solid 3px #dbe0e7;
 	margin-top: 10px;

assets/js/app.js

@@ -1,8 +1,10 @@
-var _listener
 var TO_RADIANS = Math.PI/180; 
 
+var _listener
+
 var dialogMode = true
 var terminalMode = false
+
 var spriteSize = 16 * 5
 var spriteMap = new Image()
 spriteMap.src = './assets/img/sprites/sprite-map-1.png'
@@ -10,12 +12,10 @@ spriteMap.src = './assets/img/sprites/sprite-map-1.png'
 var canvasOffset = 9
 var canvas = document.getElementById("canvas")
 var ctx = canvas.getContext("2d")
-
 canvas.width = spriteSize * canvasOffset
 canvas.height = canvas.width
 
 var audio = null
-
 var terminal = new Terminal()
 var games = new Games()
 var music = new Music()
@@ -23,7 +23,7 @@ var dialog = new Dialog()
 var resume = new Resume()
 var portfolio = new Portfolio()
 var indicator = new Indicator()
-var player = new Player(1, 1, 'down')
+var player = new Player(5, 4, 'down')
 
 window.addEventListener("resize", function() {
 	terminal.resize();
@@ -127,7 +127,6 @@ function renderRoom() {
 	new Renderer(3, 2, 0, 7)
 	new Renderer(3, 3, 0, 8)
 	new Renderer(4, 2, 1, 8)
-
 }
 
 dialog.startIntroDialogSequence()
@@ -137,9 +136,7 @@ function gameLoop() {
 	document.removeEventListener("keydown", _listener);
 	if (terminalMode) {
 		terminal.getKeystroke();
-	} else if (dialogMode) {
+	} else if (!dialogMode) {
-		// pass
-	} else {
 		this.getKeystroke();
 	}
 }

assets/js/games.js

@@ -6,5 +6,4 @@ class Games extends Window {
 	handleDialog() {
 		indicator.hide('tv')
 	}
-
 }

assets/js/indicator.js

@@ -29,5 +29,4 @@ class Indicator {
 	hide(indicatorName) {
 		this.indicatorMap[indicatorName].style.display = 'none'
 	}
-
 }

assets/js/keystroke.js

@@ -8,25 +8,13 @@ function getKeystroke() {
 			event.preventDefault();
 		}
 
-		if (event.key === "h" || event.key === "a" || event.key === "ArrowLeft") {
+		if (['h', 'a' 'ArrowLeft'].includes(event.key)) {
 			player.move('left')
-		} else if (
+		} else if (['j', 's' 'ArrowDown'].includes(event.key)) {
-			event.key === "j" ||
-			event.key === "s" ||
-			event.key === "ArrowDown"
-		) {
 			player.move('down')
-		} else if (
+		} else if (['k', 'w' 'ArrowUp'].includes(event.key)) {
-			event.key === "k" ||
-			event.key === "w" ||
-			event.key === "ArrowUp"
-		) {
 			player.move('up')
-		} else if (
+		} else if (['l', 'd' 'ArrowRight'].includes(event.key)) {
-			event.key === "l" ||
-			event.key === "d" ||
-			event.key === "ArrowRight"
-		) {
 			player.move('right')
 		} else if (
 			event.key === "Enter" &&

assets/js/music.js

@@ -13,7 +13,7 @@ class Music extends Window {
 			'Buranko',
 			'New Jersey Again',
 			'Asteroids'
-	]
+		]
 
 		this.songMap = {
 			'Down Polypore Wood': {

assets/js/player.js

@@ -29,18 +29,21 @@ class Player {
 				this.canvasX -= 1;
 			}
 		}
+
 		if (direction === 'right' && this.canvasX + 1 < canvas.width/spriteSize) {
 			nextPosition = [this.canvasX + 1, this.canvasY]
 			if (!this.isBoundary(nextPosition)) {
 				this.canvasX += 1;
 			}
 		}
+
 		if (direction === 'up' && this.canvasY - 1 >= 0) {
 			nextPosition = [this.canvasX, this.canvasY - 1]
 			if (!this.isBoundary(nextPosition)) {
 				this.canvasY -= 1;
 			}
 		} 
+
 		if (direction === 'down' && this.canvasY + 2 < canvas.height/spriteSize){
 			nextPosition = [this.canvasX, this.canvasY + 1]
 			if (!this.isBoundary(nextPosition)) {

assets/js/portfolio.js

@@ -4,8 +4,9 @@ class Portfolio extends Window {
 	}
 
 	handleDialog() {
+		indicator.hide('portfolio')
+		indicator.portfolioIndicatorShown = true;
 		if (!indicator.computerIndicatorShown) {
-			indicator.hide('portfolio')
 			dialog.display('other')
 
 			indicator.computerIndicatorShown = true;

assets/js/terminal.js

@@ -29,7 +29,7 @@ class Terminal {
 		this.terminalElem.style.display = "none"
 		this.terminalContainerElem.style.display = "none"
 		terminalMode = false;
-		this.handleDialog()
+		this.handleDialog)
 	}
 
 	handleDialog() {
@@ -132,7 +132,6 @@ class Terminal {
 
 		} else {
 			returnText = 'Unkown command, please type "help" for options'
-
 		}
 
 		if (returnText) {