fixed map

prakharjain3 · Feb 9, 2022 · 810ec96 · 810ec96
1 parent a3fc2fa
commit 810ec96
Show file tree

Hide file tree

Showing 23 changed files with 24,580 additions and 10 deletions.
diff --git a/images/brownGuy1.png b/images/brownGuy1.png
diff --git a/images/official_assets/ourMap16.png b/images/official_assets/ourMap16.png
diff --git a/images/official_assets/ourMap16.svg b/images/official_assets/ourMap16.svg
diff --git a/images/official_assets/ourMap16_10.png b/images/official_assets/ourMap16_10.png
diff --git a/images/official_assets/ourMap16_5.png b/images/official_assets/ourMap16_5.png
diff --git a/images/official_assets/ourMap16_6.png b/images/official_assets/ourMap16_6.png
diff --git a/images/official_assets/ourMap32.png b/images/official_assets/ourMap32.png
diff --git a/images/official_assets/ourMap32.svg b/images/official_assets/ourMap32.svg
diff --git a/images/official_assets/our_map_official.svg b/images/official_assets/our_map_official.svg
diff --git a/images/official_assets/whichMap.txt b/images/official_assets/whichMap.txt
@@ -0,0 +1 @@
+using ourMap32.svg and changing the whole game accordingly
diff --git a/images/ourMap16Old.png b/images/ourMap16Old.png
diff --git a/images/ourMap16_1.png b/images/ourMap16_1.png
diff --git a/images/ourMap16_2.png b/images/ourMap16_2.png
diff --git a/images/ourMap16_3_11.png b/images/ourMap16_3_11.png
diff --git a/images/ourMap16_4.png b/images/ourMap16_4.png
diff --git a/images/ourMap16_4_5.png b/images/ourMap16_4_5.png
diff --git a/images/ourMap16_5.png b/images/ourMap16_5.png
diff --git a/images/ourMap16_6_6.png b/images/ourMap16_6_6.png
diff --git a/images/ourMap16_7_7.png b/images/ourMap16_7_7.png
diff --git a/index.html b/index.html
@@ -14,7 +14,10 @@
 <body>
     <div class="game-container">
         <!-- going with 16/9 aspect ratio -->
-        <canvas class="game-canvas" width="352" height="198"></canvas>
+        <!-- <canvas class="game-canvas" width="352" height="198"></canvas> -->
+        <!-- <canvas class="game-canvas" width="704" height="296"></canvas> -->
+        <!-- <canvas class="game-canvas" width="1120" height="296"></canvas> -->
+        <canvas class="game-canvas"></canvas>
     </div>
 
     <script src="./js/utils.js"></script>

diff --git a/js/Overworld.js b/js/Overworld.js
@@ -2,6 +2,8 @@ class Overworld {
     constructor(config) {
         this.element = config.element;
         this.canvas = this.element.querySelector(".game-canvas");
+        this.canvas.height = window.innerHeight;
+        this.canvas.width = window.innerWidth;
         this.context = this.canvas.getContext("2d");
         this.map = null;
     }

diff --git a/js/OverworldMap.js b/js/OverworldMap.js
@@ -19,6 +19,7 @@ class OverworldMap {
     }
 
     drawLowerImage(context, cameraPerson) {
+        // context.drawImage(this.lowerImage, utils.withGrid(10.5) - cameraPerson.x, utils.withGrid(6) - cameraPerson.y);
         context.drawImage(this.lowerImage, utils.withGrid(10.5) - cameraPerson.x, utils.withGrid(6) - cameraPerson.y);
     }
 
@@ -108,16 +109,16 @@ class OverworldMap {
 
 window.OverworldMaps = {
     DemoRoom: {
-        // lowerSrc: "./images/HarshGeniusMap1.png",
-        lowerSrc: "./images/ourMap16.png",
+        lowerSrc: "./images/official_assets/our_map_official.svg", // current best map is= 
+        // lowerSrc: "./images/ourMap16.png",
         // lowerSrc: "./images/DemoLower.png",
         upperSrc: "./images/DemoUpper.png",
         gameObjects: {
             hero: new Person({
                 isPlayerControlled: true,
-                // src: "./images/hero16.png",
-                x: utils.withGrid(5),
-                y: utils.withGrid(6)
+                src: "./images/brownGuy1.png",
+                x: utils.withGrid(20),
+                y: utils.withGrid(20)
             }),
 
             // myDrone: new Person({

diff --git a/styles/global.css b/styles/global.css
@@ -20,13 +20,13 @@ body {
 
 .game-container{    
     position: relative;
-    width: 352px;
-    height: 198px;
+    /* width: 352px; */
+    /* height: 198px; */
     margin: 0 auto;
     outline: 1px solid white;
 
-    transform: scale(3) translateY(50%);
-    /* transform: scale(1.5) translateY(50%); */
+    /* transform: scale(3) translateY(50%); */
+    transform: scale(1.5) translateY(0%);
     /* transform: scale(1) translate(50%); */
     /* transform:translateY(20%); */
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		using ourMap32.svg and changing the whole game accordingly