v2.0.3 bugfixes and added mac support

deR0R0 · web-flow · commit d8ba8de72f04 · 2024-10-05T13:17:35.000-04:00
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Robert Zhao
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -6,9 +6,7 @@ Low memory (compared to porofessor) usage. ~100mb of RAM needed. And 260 mb disk
 
 # Status
 
-Probably broken right now... will fix in about 3 business years!
-
-🟢 - Done!
+🟢 - Done! - Bugfixes will still happen!
 
 # Installation
 
@@ -30,6 +28,8 @@ Use the trash tool to clear everything
 
 Use the exit tool to exit the application
 
+There is an auto-match finder you can disable in settings.
+
 
 # Run into any issues?
 
@@ -51,3 +51,4 @@ Go to the issues tab on github and create an issue with the bug name as the titl
 - A ton more!
 
 ```8/12/24 - v2.0.1 - BUGFIX (If you spawned top side, the app will fill in you and your teammates' spells rather than the enemies lol)```
+```10-5-24 - v2.0.3 - BUGFIX + FEATURE (Fixed top/bot side glitch and fixed the unleashed teleport bug. Added mac support)```
diff --git a/main.js b/main.js
@@ -6,9 +6,9 @@ var matchDetect;
 
 
 const isMac = process.platform === "darwin";
-
+// Default 270x360
 const mainWidth = 270;
-const mainHeight = 370;
+const mainHeight = 360;
 
 var data = {
     "zoomLevel": 1,
@@ -49,6 +49,7 @@ function createMainWindow(width, height, dev) {
         mainWindow.webContents.send("message", data);
         //console.log("Sending packet of data to main window...")
     }, 100)
+    mainWindow.webContents.openDevTools()
     mainWindow.on("closed", () => {
         app.quit();
     })
@@ -167,7 +168,7 @@ app.whenReady().then(() => {
     // Create settings window
     ipcMain.handle("settingsWindow", () => {
         if(BrowserWindow.getAllWindows().length < 2) {
-            createSettingsWindow(500, 500, true);
+            createSettingsWindow(500, 500, false);
             console.log("Created a settings window!")
         } else {
             console.warn("User attempted to create another settings window but a settings window is already open.");
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,6 @@
   "author": "deR0R0",
   "license": "MIT",
   "dependencies": {
-    "electron": "^31.3.1"
+    "electron": "^31.6.0"
   }
 }
diff --git a/renderer/main/index.html b/renderer/main/index.html
@@ -15,36 +15,36 @@
             <input type="text" class="champion-div-names" maxlength="15">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerHaste.png" class="champion-div-imgs" width="40" draggable="false">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerFlash.png" class="champion-div-imgs" width="40" draggable="false">
-            <span style="top: 18px; right: 67px" class="champion-div-ps">000</span>
-            <span style="top: 18px; right: 16px" class="champion-div-ps">000</span>
+            <span style="top: 5vh; right: 24.5vw" class="champion-div-ps">000</span>
+            <span style="top: 5vh; right: 4.5vw" class="champion-div-ps">000</span>
         </div>
         <div class="champion-div no-highlight">
             <input type="text" class="champion-div-names" maxlength="15">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerHaste.png" class="champion-div-imgs" width="40" draggable="false">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerFlash.png" class="champion-div-imgs" width="40" draggable="false">
-            <span style="top: 73px; right: 67px" class="champion-div-ps">000</span>
-            <span style="top: 73px; right: 16px" class="champion-div-ps">000</span>
+            <span style="top: 20.5vh; right: 24.5vw" class="champion-div-ps">000</span>
+            <span style="top: 20.5vh; right: 4.5vw" class="champion-div-ps">000</span>
         </div>
         <div class="champion-div no-highlight">
             <input type="text" class="champion-div-names" maxlength="15">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerHaste.png" class="champion-div-imgs" width="40" draggable="false">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerFlash.png" class="champion-div-imgs" width="40" draggable="false">
-            <span style="top: 127px; right: 67px" class="champion-div-ps">000</span>
-            <span style="top: 127px; right: 16px" class="champion-div-ps">000</span>
+            <span style="top: 35.5vh; right: 24.5vw" class="champion-div-ps">000</span>
+            <span style="top: 35.5vh; right: 4.5vw" class="champion-div-ps">000</span>
         </div>
         <div class="champion-div no-highlight">
             <input type="text" class="champion-div-names" maxlength="15">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerHaste.png" class="champion-div-imgs" width="40" draggable="false">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerFlash.png" class="champion-div-imgs" width="40" draggable="false">
-            <span style="top: 181px; right: 67px" class="champion-div-ps">000</span>
-            <span style="top: 181px; right: 16px" class="champion-div-ps">000</span>
+            <span style="top: 51vh; right: 24.5vw" class="champion-div-ps">000</span>
+            <span style="top: 51vh; right: 4.5vw" class="champion-div-ps">000</span>
         </div>
         <div class="champion-div no-highlight">
             <input type="text" class="champion-div-names" maxlength="15">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerHaste.png" class="champion-div-imgs" width="40" draggable="false">
             <img src="https://ddragon.leagueoflegends.com/cdn/14.15.1/img/spell/SummonerFlash.png" class="champion-div-imgs" width="40" draggable="false">
-            <span style="top: 233px; right: 67px" class="champion-div-ps">000</span>
-            <span style="top: 233px; right: 16px" class="champion-div-ps">000</span>
+            <span style="top: 66.5vh; right: 24.5vw" class="champion-div-ps">000</span>
+            <span style="top: 66.5vh; right: 4.5vw" class="champion-div-ps">000</span>
         </div>
         <!--Toolbar-->
         <div class="toolbox no-highlight">
diff --git a/renderer/main/script.js b/renderer/main/script.js
@@ -2,7 +2,7 @@
 const ipc = window.elecApi;
 
 // VERSION
-const _VERSION_ = "2.0.2";
+const _VERSION_ = "2.0.3";
 
 
 // Elements
@@ -46,6 +46,7 @@ var spellIGNToCodeName = {
     "Ghost": "SummonerHaste",
     "Heal": "SummonerHeal",
     "Teleport": "SummonerTeleport",
+    "Unleashed Teleport": "SummonerTeleport",
     "Smite": "SummonerSmite"
 }
 var spellDir = {
@@ -422,15 +423,20 @@ function checkMatch(popup) {
         .then((response) => response.json())
         .then(playerdata => {
             try {
-                currentPlayerTopSide = false;
+                currentPlayerBotSide = false;
                 currentPlayer = playerdata.activePlayer.riotId
+                // i couldn't tell you whats going on if i knew
                 for(let i=0; i<5; i++) {
-                    if(playerdata.allPlayers[i].riotId != currentPlayer) {
-                        currentPlayerTopSide = true;
+                    console.log(playerdata.allPlayers[i].riotId)
+                    console.log(currentPlayer)
+                    if(playerdata.allPlayers[i].riotId == currentPlayer) {
+                        currentPlayerBotSide = true;
+                        break;
                     }
                 }
+                console.log("-------")
                 for(let i=0; i<5; i++) {
-                    if(currentPlayerTopSide) {
+                    if(!currentPlayerBotSide) {
                         playerName = playerdata.allPlayers[i].championName;
                     } else {
                         playerName = playerdata.allPlayers[i+5].championName;
@@ -440,7 +446,7 @@ function checkMatch(popup) {
                 }
                 for(let i=0; i<10; i+=2) {
                     x = i / 2
-                    if(currentPlayerTopSide) {
+                    if(!currentPlayerBotSide) {
                         playerSummonerSpells = playerdata.allPlayers[x].summonerSpells;
                     } else {
                         playerSummonerSpells = playerdata.allPlayers[x+5].summonerSpells;

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@`
`11`	`11`	`"author": "deR0R0",`
`12`	`12`	`"license": "MIT",`
`13`	`13`	`"dependencies": {`
`14`		`- "electron": "^31.3.1"`
	`14`	`+ "electron": "^31.6.0"`
`15`	`15`	`}`
`16`	`16`	`}`