Merge pull request #127 from VCGithubCode/fernando_branch

Fernando branch
VCGithubCode · Aug 19, 2024 · b425852 · b425852
2 parents d57de33 + 804e9ab
commit b425852
Show file tree

Hide file tree

Showing 10 changed files with 555 additions and 1,247 deletions.
diff --git a/assets/css/game.css b/assets/css/game.css
@@ -8,5 +8,6 @@
 
 body, html {
     overflow: auto !important;
+    background-color: #049cd8;
 }
 
diff --git a/assets/css/memory.css b/assets/css/memory.css
@@ -11,8 +11,8 @@ body {
 
 body, html {
   overflow: auto !important;
+  background-color: #049cd8;
 }
-
 button {
   font-family: "Reddit Mono";
 }

diff --git a/assets/js/loaders.js b/assets/js/loaders.js
@@ -17,7 +17,7 @@ export function loadJSON(url) {
 }
 
 export function loadSpriteSheet(name) {
-    return loadJSON(`/sprites/${name}.json`)
+    return loadJSON(`./sprites/${name}.json`)
     .then(sheetSpec => Promise.all([
         sheetSpec,
         loadImage(sheetSpec.imageURL),

diff --git a/assets/js/loaders/audio.js b/assets/js/loaders/audio.js
@@ -3,7 +3,7 @@ import {loadJSON} from '../loaders.js';
 
 export function loadAudioBoard(name, audioContext) {
     const loadAudio = createAudioLoader(audioContext);
-    return loadJSON(`/sounds/${name}.json`)
+    return loadJSON(`./sounds/${name}.json`)
         .then(audioSheet => {
             const audioBoard = new AudioBoard();
             const fx = audioSheet.fx;

diff --git a/assets/js/loaders/level.js b/assets/js/loaders/level.js
@@ -34,7 +34,7 @@ function setupEntities(levelSpec, level, entityFactory) {
 
 export function createLevelLoader(entityFactory) {
     return function loadLevel(name) {
-        return loadJSON(`/levels/${name}.json`)
+        return loadJSON(`./levels/${name}.json`)
         .then(levelSpec => Promise.all([
             levelSpec,
             loadSpriteSheet(levelSpec.spriteSheet),

diff --git a/assets/js/main.js b/assets/js/main.js
@@ -84,6 +84,5 @@ document.body.appendChild(startButton);
 
 startButton.addEventListener('click', () => {
   startButton.remove();
-  // Call your main function here
   main(canvas);
 });
diff --git a/game.html b/game.html
@@ -6,6 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="stylesheet" href="assets/css/style.css">
   <link rel="stylesheet" href="assets/css/game.css">
+  <link href="assets/favicon/favicon.ico" rel="icon" type="image/x-icon">
   <title>Game - Super Mario</title>
 </head>
 
@@ -35,11 +36,6 @@ <h1 class="header-home">&#8203;</h1>
     </div>
   </header>
   <main class="game-div">
-    <div class="cloud cloud1"></div>
-    <div class="cloud cloud2"></div>
-    <div class="cloud cloud3"></div>
-    <div class="cloud cloud4"></div>
-
     <canvas id="screen" width="256" height="240"></canvas>
   </main>
   <footer>

diff --git a/memory.html b/memory.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="assets/css/reset.css">
     <link rel="stylesheet" href="assets/css/memory.css">
     <link href="assets/favicon/favicon.ico" rel="icon" type="image/x-icon">
-    <title>Home - Super Mario</title>
+    <title>Memory - Super Mario</title>
 </head>
 
 <body>