Merge branch 'main' into call

.github/CONTRIBUTING_GUIDELINE.md

@@ -24,6 +24,43 @@ in case you are stuck:
 
 <br>
 
+### Alternatively contribute using GitHub Desktop
+
+1. **Open GitHub Desktop:**
+   Launch GitHub Desktop and log in to your GitHub account if you haven't already.
+
+2. **Clone the Repository:**
+   - If you haven't cloned the GameZone repository yet, you can do so by clicking on the "File" menu and selecting "Clone Repository."
+   - Choose the GameZone repository from the list of repositories on GitHub and clone it to your local machine.
+
+3. **Switch to the Correct Branch:**
+   - Ensure you are on the branch that you want to submit a pull request for.
+   - If you need to switch branches, you can do so by clicking on the "Current Branch" dropdown menu and selecting the desired branch.
+
+4. **Make Changes:**
+   Make your changes to the code or files in the repository using your preferred code editor.
+
+5. **Commit Changes:**
+   - In GitHub Desktop, you'll see a list of the files you've changed. Check the box next to each file you want to include in the commit.
+   - Enter a summary and description for your changes in the "Summary" and "Description" fields, respectively. Click the "Commit to <branch-name>" button to commit your changes to the local branch.
+
+6. **Push Changes to GitHub:**
+   After committing your changes, click the "Push origin" button in the top right corner of GitHub Desktop to push your changes to your forked repository on GitHub.
+
+7. **Create a Pull Request:**
+  - Go to the GitHub website and navigate to your fork of the GameZone repository.
+  - You should see a button to "Compare & pull request" between your fork and the original repository. Click on it.
+
+8. **Review and Submit:**
+   - On the pull request page, review your changes and add any additional information, such as a title and description, that you want to include with your pull request.
+   - Once you're satisfied, click the "Create pull request" button to submit your pull request.
+
+9. **Wait for Review:**
+    Your pull request will now be available for review by the project maintainers. They may provide feedback or ask for changes before merging your pull request into the main branch of the GameZone repository.
+
+⭐️ Support the Project
+If you find this project helpful, please consider giving it a star on GitHub! Your support helps to grow the project and reach more contributors.
+
 ## **Issue Report Process 📌**
 
 1. Go to the project's issues.
@@ -36,29 +73,62 @@ in case you are stuck:
 <br>
 
 ## **File naming conventions 📁**
-- Give unique name for your game that is not already existed 
+- Give unique name for your game that don't exist already. 
 * Folder naming convention
-    - ```Game_Name```  ex.  ```Tilting_Maze``` (first letter should be capital and if you need space use _ )  
+    - ```Game_Name```  ex.  ```Tilting_Maze```,```Rock_Paper_Scissors``` (first letter should be capital and if you need space use underscore **_** )      
 * files in the folder 
-    - ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate )
+    - Main html file should be named as **index.html** , not something else like ```Tilting_Maze.html```(Preferred)
+    - Game files - ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate file for each kind)
+    - It is preferred if the main html file is directly added to the main folder of you game like ```Tilting_Maze/index.html``` along with other files like **style.css**, **script.js**
     - you can have other folders if you are having assets for your game 
-    - ```README.md``` for your folder using template [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md) 
-    - It is not compulsory to follow this README template only you can have your own 
+    - Create```README.md``` for your Game using this [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md).Although, it is not compulsory to follow this README template ,you can use your own *README* template whichever you prefer, to explain functionality and code of your Game
 * naming convention for the screenshot you will add in ```assets/images```
-    - name of image should be same as your game name
-    - ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image formate
+    - Remember preview image should be in ```assets/images``` and not in main folder of Game itself.
+    - Name of image should be same as your Game name
+    - ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image format, but don't add image format in the name itself , it is self-assigned to a image, you don't need to add it manually, otherwise it becomes ```Tilting_Maze.jpeg.jpeg```
+    - There should be only one ScreenShot of the game in ```assets/images``` and that too with same name as the Game (Exactly Same).
+* Note:-All Other data except the ScreenShot of your Game, should be in it's main folder , don't add it to other folders of the project.
+
+<br>
+
+## Add Game to assets/js/gamesData.json
+
+* This is to Show your game on the main Website
+   - Go to the end of gamesData.json and add :
+   - **,**
+         " **No.** ":{
+            "gameTitle" : " **Title** ",
+            "gameUrl": " **Main Folder** ",
+            "thumbnailUrl":" **Preview Image** " 
+         }
+   - **No.**: Number for your Game , it should be the next number with respect to the file. eg: if the last no. in file at present is *625* you should put *626* at the place of **No.**
+   - **Title:** this is the title for your game that will be shown on the website, if your game name is ```Super_Mario_Game``` ,put Title as ```Super Mario Game```
+   - **Main Folder :** This is the reference to *index.html* 
+      - if your index.html is directly in main game folder ,put the main folder name eg: ```Super_Mario_Game```
+      - if your index.html is in subfolder , give path to it 
+      eg: ```Super_Mario_Game/public``` (assuming index.html is in public folder of Super_Mario_Game folder)
+      - if your main html file's name is not index.html , you need to specify the main html file also. eg:```Super_Mario_Game/mario.html``` or if in sub folder ```Super_Mario_Game/public/mario.html```
+   - **Preview Image:** This is the image that will be shown as preview for your game , here you provide the name of the image that you added to **assets/images** folder, along with format type. Eg. ```Super_Mario_Game.png``` or ```Super_Mario_Game.jpg``` or with any other format.
+
+**Note:-** 
+
+   -  Do not modify anything else in the rest of the file, you only need to add your game in the end of the file. 
+   - Don't forget to add the comma for new entry (already give in above sample but this is a reminder as one might miss it to see in the sample)
+
 
 <br>
 
 ## **Pull Request Process 🚀**
 
 1. Ensure that you have self reviewed your code 😀
 2. Make sure you have added the proper description for the functionality of the code
-3. You have added README file in your repository .
-4. You have added the thumbnail of the project into ```assets/images``` for website preview
-5. Add your game screenshot in the assets folder by following the proper conversion specified over here
-6. You have added your game name and link in main README.md
-7. Submit your PR by giving the necesarry information in PR template and hang tight we will review it really soon 🚀
+3. You have added README file in your Game folder.
+4. You have added the thumbnail of the project/Game into ```assets/images``` for website preview
+5. Added your game screenshot in the assets folder by following the proper conversion specified over here
+6. You have added your game name and link in GameZone's README.md
+7. You have Added your game to ```assets\js\gamesData.json```.
+8. you have reviewed that your Game loads on the website with preview image and works when opened.
+9. Submit your PR by giving the necesarry information in PR template and hang tight we will review it really soon 🚀
 
 <br>
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,10 +15,11 @@ Fixes # <your_issue_number>
 - [ ] My changes generates no new warnings.
 - [ ] I have followed proper naming convention showed in [CONTRIBUTING GUIDELINE](https://github.com/kunjgit/GameZone/blob/main/.github/CONTRIBUTING_GUIDELINE.md)
 - [ ] I have added screenshot for website preview in assets/images 
-- [ ] I have added entries for my game in main README.md
-- [ ] I have added README.md in my folder 
+- [ ] I have added entries for my game in GameZone's README.md
+- [ ] I have added README.md in my Game folder 
 - [ ] I have added working video of the game in README.md (optional)
 - [ ] I have specified the respective issue number for which I have requested the new game.
+- [ ] I have added my Game to gamesData.json file and it is loading properly on main website as intended.
 
 
 <hr>

CONTRIBUTING.md

@@ -73,29 +73,60 @@ If you find this project helpful, please consider giving it a star on GitHub! Yo
 <br>
 
 ## **File naming conventions 📁**
-- Give unique name for your game that is not already existed 
+- Give unique name for your game that don't exist already. 
 * Folder naming convention
-    - ```Game_Name```  ex.  ```Tilting_Maze``` (first letter should be capital and if you need space use _ )  
+    - ```Game_Name```  ex.  ```Tilting_Maze```,```Rock_Paper_Scissors``` (first letter should be capital and if you need space use underscore **_** )      
 * files in the folder 
-    - ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate )
+    - Main html file should be named as **index.html** , not something else like ```Tilting_Maze.html```(Preferred)
+    - Game files - ```index.html``` , ```script.js``` , ```style.css```(not stictly to follow this but you should have separate file for each kind)
+    - It is preferred if the main html file is directly added to the main folder of you game like ```Tilting_Maze/index.html``` along with other files like **style.css**, **script.js**
     - you can have other folders if you are having assets for your game 
-    - ```README.md``` for your folder using template [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md) 
-    - It is not compulsory to follow this README template only you can have your own 
+    - Create```README.md``` for your Game using this [TEMPLATE](../Games/FOLDER_README_TEMPLATE.md).Although, it is not compulsory to follow this README template ,you can use your own *README* template whichever you prefer, to explain functionality and code of your Game
 * naming convention for the screenshot you will add in ```assets/images```
-    - name of image should be same as your game name
-    - ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image formate
+    - Remember preview image should be in ```assets/images``` and not in main folder of Game itself.
+    - Name of image should be same as your Game name
+    - ex. ```Tilting_Maze.jpeg``` or .jpg or .png any of the image format, but don't add image format in the name itself , it is self-assigned to a image, you don't need to add it manually, otherwise it becomes ```Tilting_Maze.jpeg.jpeg```
+    - There should be only one ScreenShot of the game in ```assets/images``` and that too with same name as the Game (Exactly Same).
+* Note:-All Other data except the ScreenShot of your Game, should be in it's main folder , don't add it to other folders of the project.
 
 <br>
 
+
+## Add Game to assets/js/gamesData.json
+
+* This is to Show your game on the main Website
+   - Go to the end of gamesData.json and add :
+   - **,**
+         " **No.** ":{
+            "gameTitle" : " **Title** ",
+            "gameUrl": " **Main Folder** ",
+            "thumbnailUrl":" **Preview Image** " 
+         }
+   - **No.**: Number for your Game , it should be the next number with respect to the file. eg: if the last no. in file at present is *625* you should put *626* at the place of **No.**
+   - **Title:** this is the title for your game that will be shown on the website, if your game name is ```Super_Mario_Game``` ,put Title as ```Super Mario Game```
+   - **Main Folder :** This is the reference to *index.html* 
+      - if your index.html is directly in main game folder ,put the main folder name eg: ```Super_Mario_Game```
+      - if your index.html is in subfolder , give path to it 
+      eg: ```Super_Mario_Game/public``` (assuming index.html is in public folder of Super_Mario_Game folder)
+      - if your main html file's name is not index.html , you need to specify the main html file also. eg:```Super_Mario_Game/mario.html``` or if in sub folder ```Super_Mario_Game/public/mario.html```
+   - **Preview Image:** This is the image that will be shown as preview for your game , here you provide the name of the image that you added to **assets/images** folder, along with format type. Eg. ```Super_Mario_Game.png``` or ```Super_Mario_Game.jpg``` or with any other format.
+
+**Note:-** 
+
+   -  Do not modify anything else in the rest of the file, you only need to add your game in the end of the file. 
+   - Don't forget to add the comma for new entry (already give in above sample but this is a reminder as one might miss it to see in the sample)
+<br>
 ## **Pull Request Process 🚀**
 
 1. Ensure that you have self reviewed your code 😀
 2. Make sure you have added the proper description for the functionality of the code
-3. You have added README file in your repository .
-4. You have added the thumbnail of the project into ```assets/images``` for website preview
-5. Add your game screenshot in the assets folder by following the proper conversion specified over here
-6. You have added your game name and link in main README.md
-7. Submit your PR by giving the necesarry information in PR template and hang tight we will review it really soon 🚀
+3. You have added README file in your Game folder.
+4. You have added the thumbnail of the project/Game into ```assets/images``` for website preview
+5. Added your game screenshot in the assets folder by following the proper conversion specified over here
+6. You have added your game name and link in GameZone's README.md
+7. You have Added your game to ```assets\js\gamesData.json```.
+8. you have reviewed that your Game loads on the website with preview image and works when opened.
+9. Submit your PR by giving the necesarry information in PR template and hang tight we will review it really soon 🚀
 
 <br>
 

Games/2048_win/script.js

@@ -51,14 +51,17 @@ function cellCreator(c, timeOut) {
     }
 
     var randomValue = Math.floor(Math.random() * 4 + 1); //create value 1, 2, 3 or 4
+    if (randomValue == 2){
+      randomValue =2;
+    }
     if (randomValue == 3) {
-      randomValue = 2;
+      randomValue = 4;
     } //3 --> 4
     if (randomValue == 1) {
       randomValue = 2;
     } //1 --> 2
     if (randomValue == 4) {
-      randomValue = 2;
+      randomValue = 4;
     } //4-->2
     var position = document.getElementById("" + randomX + randomY);
     var tile = document.createElement("DIV"); //create div at x, y

Games/Alien_Invasion/index.html

@@ -1,44 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
     <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE-edge">
-    <meta name="viewport" content="width-device-width, initial-scale=1.0">
-    <title>AttackAlienInvader Game</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Bangers&display=swap" rel="stylesheet">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Bubble Shooter Game</title>
     <link rel="stylesheet" href="style.css">
-
 </head>
-
-
 <body>
-    <canvas id="canvas1"></canvas>
-
-    <!-- characters -->
-    <img id="player" src="assets/player.png">
-    <img id="angler1" src="assets/angler1.png">
-    <img id="angler2" src="assets/angler2.png">
-    <img id="lucky" src="assets/lucky.png">
-    <img id ="hivewhale" src = "assets/hivewhale.png">
-    <img id = "drone" src = "assets//drone.png"> 
+    <div id="game-container">
+        <div id="score">Score: <span id="score-value">0</span></div>
+        <div id="game-area"></div>
+        <button id="restart-btn">Restart Game</button>
+    </div>
+    <script src="script.js"></script>
 
-
-    <!-- props -->
-    <img id="projectile" src="assets/projectile.png">
-    <img id ="gears" src = "assets/gears.png">
-    <img id ="smokeExplosion" src = "assets/smokeExplosion.png">
-    <img id ="fireExplosion" src = "assets/fireExplosion.png">
-
-    <!-- environment -->
-    <img id="layer1" src="assets/layer1.png" />
-    <img id="layer2" src="assets/layer2.png" />
-    <img id="layer3" src="assets/layer3.png" />
-    <img id="layer4" src="assets/layer4.png" />
-
-    <script src="script.js"> </script>
 </body>
-
-</html>
+</html>