Merge branch 'main' of https://github.com/Gabriel-Gravin/Teamwork

Gabriel-Gravin · Oct 13, 2023 · 53e1b22 · 53e1b22
2 parents 89ac5f6 + 4265fb7
commit 53e1b22
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 64 deletions.
diff --git a/_posts/2023-10-03-Platform_Jump_Game_Plans.md b/_posts/2023-10-03-Platform_Jump_Game_Plans.md
@@ -76,5 +76,4 @@ Could make the score change depending on how every x amount of pixels you go up
 - Rythm game concept where you could press a button at the right time to make Link do a flip on a trampoline
 - Have two seperate options(maybe on the home screen) of "campaign/storymode" and "infinite" 
 - storymode can show the player how to play while also creating a story out of it ; example: Ganon kidnaps Zelda and goes to the top of the tower, and Link has to jump his way up the tower to rescue her. 
-- infinite could be a infinite game, where it'll go forever while you get a score for how far your able to go up and you can have some sort of local or cloud based leaderboard 
-- difficulty could also increase the more you go up ; examples: bottom of the game goes "up" faster making it harder to catch up, monster spawnrate or maybe damage (if we add a hp/damage system) could change, spawnrate of breaking platforms could also change.
+- infinite could be a infinite game, where it'll go forever while you get a score for how far your able to go up and you can have some sort of local or cloud based leaderboard 
diff --git a/_posts/2023-10-04-wizard_sprite.md b/_posts/2023-10-04-wizard_sprite.md
@@ -12,7 +12,7 @@ comments: True
 <body>
     <div>
         <canvas id="spriteContainer"> <!-- Within the base div is a canvas. An HTML canvas is used only for graphics. It allows the user to access some basic functions related to the image created on the canvas (including animation) -->
-            <img id="wizardSprite" src="/student/images/wizard_spritesheet.png">  <!-- change sprite here -->
+            <img id="wizardSprite" src="{{site.baseurl}}/images/wizard_spritesheet.png">  <!-- change sprite here -->
         </canvas>
         <div id="controls"> <!--basic radio buttons which can be used to check whether each individual animaiton works -->
             <input type="radio" name="animation" id="idle1">

diff --git a/_posts/2023-10-09-goblin_sprite.md b/_posts/2023-10-09-goblin_sprite.md
@@ -12,7 +12,7 @@ comments: True
 <body>
     <div>
         <canvas id="spriteContainer"> <!-- Within the base div is a canvas. An HTML canvas is used only for graphics. It allows the user to access some basic functions related to the image created on the canvas (including animation) -->
-            <img id="goblinSprite" src="/student/images/goblinsprites.png">  <!-- change sprite here -->
+            <img id="goblinSprite" src="{{site.baseurl}}/images/goblinsprites.png">  <!-- change sprite here -->
         </canvas>
         <div id="controls"> <!--basic radio buttons which can be used to check whether each individual animaiton works -->
             <input type="radio" name="animation" id="stomp">

diff --git a/_posts/2023-10-09-werewolf_sprite.md b/_posts/2023-10-09-werewolf_sprite.md
@@ -12,7 +12,7 @@ comments: True
 <body>
     <div>
         <canvas id="spriteContainer"> <!-- Within the base div is a canvas. An HTML canvas is used only for graphics. It allows the user to access some basic functions related to the image created on the canvas (including animation) -->
-            <img id="werewolfSprite" src="/student/images/werewolfsprites.png">  <!-- change sprite here -->
+            <img id="werewolfSprite" src="{{site.baseurl}}/images/werewolfsprites.png">  <!-- change sprite here -->
         </canvas>
         <div id="controls"> <!--basic radio buttons which can be used to check whether each individual animaiton works -->
             <input type="radio" name="animation" id="idle">

diff --git a/_posts/2023-10-10-game_framework.md b/_posts/2023-10-10-game_framework.md
@@ -44,7 +44,7 @@ comments: False
         <label for="handstand">Handstand</label>
     </div>
     <canvas id="backgroundID">
-        <img id="backgroundImage" src="/student/images/medieval_background.jpeg" />
+        <img id="backgroundImage" src="{{site.baseurl}}/images/medieval_background.jpeg" />
     </canvas>
 </div>
 

diff --git a/_posts/2023-10-10-linkanimation.md b/_posts/2023-10-10-linkanimation.md
@@ -14,7 +14,7 @@ categories: [C1.4]
 <body>
     <div>
         <canvas id="spriteContainer">
-            <img id="linkSprite" src="/student/images/linksprites.png">
+            <img id="linkSprite" src="{{site.baseurl}}/images/linksprites.png">
         </canvas>
         <div id="controls">
             <input type="radio" name="animation" id="idle" checked>

diff --git a/_posts/2023-10-10-test.md b/_posts/2023-10-10-test.md
diff --git a/_posts/2023-10-11-minigame.md b/_posts/2023-10-11-minigame.md
@@ -9,7 +9,7 @@ comments: True
 ---
 
 **Directions**  
-Freeplay with Link! Use the right arrow to make him move right, use the left arrow to make him move left, and use the space bar to jump.  
+Freeplay with Link! Use "D" to make him move right, use the "A" to make him move left, and use the space bar to jump.  
 
 <!DOCTYPE html>
 <html>
@@ -24,10 +24,10 @@ Freeplay with Link! Use the right arrow to make him move right, use the left arr
         const ctx = canvas.getContext('2d');
         // Load the background image
         const backgroundImage = new Image();
-        backgroundImage.src = '/student/images/park.jpg';
+        backgroundImage.src = '{{site.baseurl}}/images/park.jpg';
         // Load the sprite image
         const spriteImage = new Image();
-        spriteImage.src = '/student/images/linksprites.png';
+        spriteImage.src = '{{site.baseurl}}/images/linksprites.png';
         // Define sprite properties
         const spriteWidth = 96; // Width of a single sprite frame
         const spriteHeight = 104; // Height of a single sprite frame

diff --git a/_posts/2023-10-12-gameframework_2.md b/_posts/2023-10-12-gameframework_2.md
@@ -210,8 +210,13 @@ backgroundImg.onload = function () {
     const defaultFilter = getComputedStyle(document.documentElement).getPropertyValue('--default-canvas-filter');
     toggleCanvasEffect.addEventListener("click", function () {
         if (isFilterEnabled) {
+<<<<<<< HEAD:_posts/2023-10-12-gameframework_2.md
             canvas.style.filter = "none";  // remove filter
             linkCanvas.style.filter = "none";
+=======
+            canvas.style.filter = "invert(100%)";  // remove filter
+            goblinCanvas.style.filter = "invert(100%)";
+>>>>>>> 4265fb72c50b00f8f7b706b386e348435f1880a9:_posts/2023-10-12-teamwork copy.md
         } else {
             canvas.style.filter = defaultFilter; // Apply the default filter value
             linkCanvas.style.filter = defaultFilter;