From 32e7e38dfa1be052ce30b2b6b1da7f26abe0a825 Mon Sep 17 00:00:00 2001 From: Dominic DiTaranto Date: Sun, 28 Dec 2025 20:48:16 -0500 Subject: [PATCH] cleanup --- assets/css/style.css | 4 ++++ assets/js/app.js | 13 +++++-------- assets/js/games.js | 1 - assets/js/indicator.js | 1 - assets/js/keystroke.js | 20 ++++---------------- assets/js/music.js | 2 +- assets/js/player.js | 3 +++ assets/js/portfolio.js | 3 ++- assets/js/terminal.js | 3 +-- 9 files changed, 20 insertions(+), 30 deletions(-) diff --git a/assets/css/style.css b/assets/css/style.css index aa796c3..d9bcdef 100644 --- a/assets/css/style.css +++ b/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; diff --git a/assets/js/app.js b/assets/js/app.js index 2ddad25..4cbea68 100644 --- a/assets/js/app.js +++ b/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) { - // pass - } else { + } else if (!dialogMode) { this.getKeystroke(); } } diff --git a/assets/js/games.js b/assets/js/games.js index bb8d4af..e592c20 100644 --- a/assets/js/games.js +++ b/assets/js/games.js @@ -6,5 +6,4 @@ class Games extends Window { handleDialog() { indicator.hide('tv') } - } diff --git a/assets/js/indicator.js b/assets/js/indicator.js index f450400..03f6a55 100644 --- a/assets/js/indicator.js +++ b/assets/js/indicator.js @@ -29,5 +29,4 @@ class Indicator { hide(indicatorName) { this.indicatorMap[indicatorName].style.display = 'none' } - } diff --git a/assets/js/keystroke.js b/assets/js/keystroke.js index f5f2779..d3810de 100644 --- a/assets/js/keystroke.js +++ b/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 ( - event.key === "j" || - event.key === "s" || - event.key === "ArrowDown" - ) { + } else if (['j', 's' 'ArrowDown'].includes(event.key)) { player.move('down') - } else if ( - event.key === "k" || - event.key === "w" || - event.key === "ArrowUp" - ) { + } else if (['k', 'w' 'ArrowUp'].includes(event.key)) { player.move('up') - } else if ( - event.key === "l" || - event.key === "d" || - event.key === "ArrowRight" - ) { + } else if (['l', 'd' 'ArrowRight'].includes(event.key)) { player.move('right') } else if ( event.key === "Enter" && diff --git a/assets/js/music.js b/assets/js/music.js index 50997f2..e093418 100644 --- a/assets/js/music.js +++ b/assets/js/music.js @@ -13,7 +13,7 @@ class Music extends Window { 'Buranko', 'New Jersey Again', 'Asteroids' - ] + ] this.songMap = { 'Down Polypore Wood': { diff --git a/assets/js/player.js b/assets/js/player.js index a344867..8f45559 100644 --- a/assets/js/player.js +++ b/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)) { diff --git a/assets/js/portfolio.js b/assets/js/portfolio.js index f3edb43..f928825 100644 --- a/assets/js/portfolio.js +++ b/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; diff --git a/assets/js/terminal.js b/assets/js/terminal.js index 88d6d5d..ddcbe02 100644 --- a/assets/js/terminal.js +++ b/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) {