Added literally everyone

prakharjain3 · Feb 12, 2022 · ba547b1 · ba547b1
1 parent b0f66c1
commit ba547b1
Show file tree

Hide file tree

Showing 113 changed files with 382 additions and 2,725 deletions.
diff --git a/createdTiles/Frame 1.png b/createdTiles/Frame 1.png
diff --git a/createdTiles/Frame 10.png b/createdTiles/Frame 10.png
diff --git a/createdTiles/Frame 11.png b/createdTiles/Frame 11.png
diff --git a/createdTiles/Frame 2.png b/createdTiles/Frame 2.png
diff --git a/createdTiles/Frame 3.png b/createdTiles/Frame 3.png
diff --git a/createdTiles/Frame 4.png b/createdTiles/Frame 4.png
diff --git a/createdTiles/Frame 5.png b/createdTiles/Frame 5.png
diff --git a/createdTiles/Frame 6.png b/createdTiles/Frame 6.png
diff --git a/createdTiles/Frame 9.png b/createdTiles/Frame 9.png
diff --git a/createdTiles/Frame.png b/createdTiles/Frame.png
diff --git a/images/DemoLower.png b/images/DemoLower.png
diff --git a/images/DemoUpper.png b/images/DemoUpper.png
diff --git a/images/FINAL_FOR_REALZ_OLD(OG Map).png b/images/FINAL_FOR_REALZ_OLD(OG Map).png
diff --git a/images/FINAL_OFFICIAL.png b/images/FINAL_OFFICIAL.png
diff --git a/images/FINAL_OFFICIAL_2_STRIPPED.png b/images/FINAL_OFFICIAL_2_STRIPPED.png
diff --git a/images/HarshGeniusMap3.png b/images/HarshGeniusMap3.png
diff --git a/images/Heroin.png b/images/Heroin.png
diff --git a/images/KitchenLower.png b/images/KitchenLower.png
diff --git a/images/KitchenUpper.png b/images/KitchenUpper.png
diff --git a/images/R&D Room Assets/1 Drones/1/Death.png b/images/R&D Room Assets/1 Drones/1/Death.png
diff --git a/images/R&D Room Assets/1 Drones/1/Scan.png b/images/R&D Room Assets/1 Drones/1/Scan.png
diff --git a/images/R&D Room Assets/1 Drones/1/Walk.png b/images/R&D Room Assets/1 Drones/1/Walk.png
diff --git a/images/R&D Room Assets/1 Drones/1/Walk_scan.png b/images/R&D Room Assets/1 Drones/1/Walk_scan.png
diff --git a/images/R&D Room Assets/1 Drones/2/Bomb.png b/images/R&D Room Assets/1 Drones/2/Bomb.png
diff --git a/images/R&D Room Assets/1 Drones/2/Drop.png b/images/R&D Room Assets/1 Drones/2/Drop.png
diff --git a/images/R&D Room Assets/1 Drones/3/Back.png b/images/R&D Room Assets/1 Drones/3/Back.png
diff --git a/images/R&D Room Assets/1 Drones/3/Death.png b/images/R&D Room Assets/1 Drones/3/Death.png
diff --git a/images/R&D Room Assets/1 Drones/3/Fire1.png b/images/R&D Room Assets/1 Drones/3/Fire1.png
diff --git a/images/R&D Room Assets/1 Drones/3/Fire2.png b/images/R&D Room Assets/1 Drones/3/Fire2.png
diff --git a/images/R&D Room Assets/1 Drones/3/Fire3.png b/images/R&D Room Assets/1 Drones/3/Fire3.png
diff --git a/images/R&D Room Assets/1 Drones/3/Forward.png b/images/R&D Room Assets/1 Drones/3/Forward.png
diff --git a/images/R&D Room Assets/1 Drones/3/Idle.png b/images/R&D Room Assets/1 Drones/3/Idle.png
diff --git a/images/R&D Room Assets/1 Drones/4/Death.png b/images/R&D Room Assets/1 Drones/4/Death.png
diff --git a/images/R&D Room Assets/1 Drones/4/Idle.png b/images/R&D Room Assets/1 Drones/4/Idle.png
diff --git a/images/R&D Room Assets/1 Drones/4/Landing.png b/images/R&D Room Assets/1 Drones/4/Landing.png
diff --git a/images/R&D Room Assets/1 Drones/4/Walk.png b/images/R&D Room Assets/1 Drones/4/Walk.png
diff --git a/images/R&D Room Assets/1 Drones/5/Death.png b/images/R&D Room Assets/1 Drones/5/Death.png
diff --git a/images/R&D Room Assets/1 Drones/5/Idle.png b/images/R&D Room Assets/1 Drones/5/Idle.png
diff --git a/images/R&D Room Assets/1 Drones/5/Walk.png b/images/R&D Room Assets/1 Drones/5/Walk.png
diff --git a/images/R&D Room Assets/1 Drones/5_2/Death.png b/images/R&D Room Assets/1 Drones/5_2/Death.png
diff --git a/images/R&D Room Assets/1 Drones/5_2/Idle.png b/images/R&D Room Assets/1 Drones/5_2/Idle.png
diff --git a/images/R&D Room Assets/1 Drones/5_2/Walk.png b/images/R&D Room Assets/1 Drones/5_2/Walk.png
diff --git a/images/R&D Room Assets/1 Drones/6/Capsule.png b/images/R&D Room Assets/1 Drones/6/Capsule.png
diff --git a/images/R&D Room Assets/1 Drones/6/Drop.png b/images/R&D Room Assets/1 Drones/6/Drop.png
diff --git a/images/R&D Room Assets/1 Drones/6/Walk.png b/images/R&D Room Assets/1 Drones/6/Walk.png
diff --git a/images/R&D Room Assets/1 Drones/6/Walk2.png b/images/R&D Room Assets/1 Drones/6/Walk2.png
diff --git a/images/R&D Room Assets/2 Character animations/1.png b/images/R&D Room Assets/2 Character animations/1.png
diff --git a/images/R&D Room Assets/2 Character animations/2.png b/images/R&D Room Assets/2 Character animations/2.png
diff --git a/images/R&D Room Assets/2 Character animations/3.png b/images/R&D Room Assets/2 Character animations/3.png
diff --git a/images/R&D Room Assets/Font.txt b/images/R&D Room Assets/Font.txt
diff --git a/images/R&D Room Assets/PSD/1.psd b/images/R&D Room Assets/PSD/1.psd
diff --git a/images/R&D Room Assets/PSD/2.psd b/images/R&D Room Assets/PSD/2.psd
diff --git a/images/R&D Room Assets/PSD/3.psd b/images/R&D Room Assets/PSD/3.psd
diff --git a/images/R&D Room Assets/PSD/4.psd b/images/R&D Room Assets/PSD/4.psd
diff --git a/images/R&D Room Assets/PSD/5_1.psd b/images/R&D Room Assets/PSD/5_1.psd
diff --git a/images/R&D Room Assets/PSD/5_2.psd b/images/R&D Room Assets/PSD/5_2.psd
diff --git a/images/R&D Room Assets/PSD/6.psd b/images/R&D Room Assets/PSD/6.psd
diff --git a/images/R&D Room Assets/PSD/7.psd b/images/R&D Room Assets/PSD/7.psd
diff --git a/images/R&D Room Assets/license.txt b/images/R&D Room Assets/license.txt
diff --git a/images/acmrpg.png b/images/acmrpg.png
diff --git a/images/aishwariya.png b/images/aishwariya.png
diff --git a/images/anish.png b/images/anish.png
diff --git a/images/anmol.png b/images/anmol.png
diff --git a/images/theRock.png → images/ansh.png b/images/theRock.png → images/ansh.png
diff --git a/images/avinaash.png b/images/avinaash.png
diff --git a/images/chirayu.png b/images/chirayu.png
diff --git a/images/drone.png b/images/drone.png
diff --git a/images/drone2.png b/images/drone2.png
diff --git a/images/droneOld.png b/images/droneOld.png
diff --git a/images/gagan.png b/images/gagan.png
diff --git a/images/brownGuy1.png → images/hemanth.png b/images/brownGuy1.png → images/hemanth.png
diff --git a/images/malvi.png b/images/malvi.png
diff --git a/images/manvi.png b/images/manvi.png
diff --git a/images/map_outlineOld.png b/images/map_outlineOld.png
diff --git a/images/myTile01.aseprite b/images/myTile01.aseprite
diff --git a/images/myTileMap01.aseprite b/images/myTileMap01.aseprite
diff --git a/images/myTileMap02.aseprite b/images/myTileMap02.aseprite
diff --git a/images/npc1.png b/images/npc1.png
diff --git a/images/npc2.png b/images/npc2.png
diff --git a/images/ourLatestMap.png b/images/ourLatestMap.png
diff --git a/images/ourMap.png b/images/ourMap.png
diff --git a/images/ourMap16.png b/images/ourMap16.png
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/images/ourMap2.png b/images/ourMap2.png
diff --git a/images/ourMap3.png b/images/ourMap3.png
diff --git a/images/ourMap32.png b/images/ourMap32.png
diff --git a/images/ourMap4.svg b/images/ourMap4.svg
diff --git a/images/ourMap5.png b/images/ourMap5.png
diff --git a/images/ourMap96.png b/images/ourMap96.png
diff --git a/images/problem.txt b/images/problem.txt
diff --git a/images/rishu.png b/images/rishu.png
diff --git a/images/rohan.png b/images/rohan.png
diff --git a/images/samridh.png b/images/samridh.png
diff --git a/images/srinivas.png b/images/srinivas.png
diff --git a/images/swarup.png b/images/swarup.png
diff --git a/images/tejas.png b/images/tejas.png
diff --git a/images/vaishnavi.png b/images/vaishnavi.png
diff --git a/images/wall_frameOld.png b/images/wall_frameOld.png
diff --git a/js/DirectionInput.js b/js/DirectionInput.js
@@ -13,7 +13,6 @@ class DirectionInput {
         }
     }
 
-
     init() {
         document.addEventListener("keydown", e => {
             const dir = this.map[e.code];

diff --git a/js/Overworld.js b/js/Overworld.js
@@ -5,33 +5,18 @@ class Overworld {
         this.canvas.height = window.innerHeight;        
         this.canvas.width = window.innerWidth;
 
-        // this.gameContainer = this.element.querySelector(".game-container");
-        // this.gameContainer.style.width = window.innerWidth;
-        // this.gameContainer.style.height = window.innerHeight;
-
-        // console.log(this.canvas.width, this.canvas.height);
-
         this.context = this.canvas.getContext("2d");
         this.map = null;
     }
 
     init() {
-        this.startMap(window.OverworldMaps.DemoRoom);
+        this.startMap(window.OverworldMaps.ACM_MAP);
         this.bindActionInput();
         this.bindHeroPositionCheck();
 
         this.directionInput = new DirectionInput();
         this.directionInput.init();
-
         this.startGameLoop();
-        // game loop fires at 60 fps
-
-
-        // this.map.startCutscene([
-        //     {type: "changeMap", map: "DemoRoom"},
-        //     {type: "textMessage", text: "Why hello there! Welcome to ACM-RPG..."},
-        // ]);
-
     }
 
     bindActionInput() {
@@ -64,12 +49,11 @@ class Overworld {
         const match = Object.values(this.map.gameObjects).find(object => {
             return `${object.x},${object.y}` === `${nextCoords.x},${nextCoords.y}`
         });
-        // console.log({match});
-
+
         let interact_p = document.querySelector(".game-interact");
 
         if(match) {
-            // console.log("MATCHED");
+
             interact_p.style.visibility = "visible"
         } else {
             // make it hidden again

diff --git a/js/OverworldEvent.js b/js/OverworldEvent.js
@@ -68,7 +68,7 @@ class OverworldEvent {
         const sceneTransition = new SceneTransition();
 
         sceneTransition.init(document.querySelector('.game-container'), () => {
-            this.map.overworld.startMap(window.OverworldMaps[this.event.map]); // the value this.event.map is referencing {type: "changeMap", map: "Kitchen"}  in OverworldMap
+            this.map.overworld.startMap(window.OverworldMaps[this.event.map]);
             resolve();
 
             sceneTransition.fadeOut();
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,6 @@ class DirectionInput { @@
             }
         }
         init() {
             document.addEventListener("keydown", e => {
                 const dir = this.map[e.code];
@@ Expand Down @@