Merge branch 'dev'

Knkajfw · Apr 25, 2020 · 5a6a057 · 5a6a057
2 parents 95aabe9 + 0461bf6
commit 5a6a057
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 30 deletions.
diff --git a/main.js b/main.js
@@ -36,6 +36,8 @@ const opponentSummonerSpellsObject = {
 };
 var opponentSummonerSpellsString = '';
 var currentGameMode = '';
+var opponentToGetLevelIndex = 0;
+var skillSlotToGetLevel = '';
 
 function createLoadingPageWindow() {
   Menu.setApplicationMenu(null);
@@ -95,6 +97,20 @@ function getActivePlayerName() {
   getActivePlayerNameReq.end();
 }
 
+function getActivePlayerNameForLv() {
+  const getActivePlayerNameForLvReq = new net.request('https://127.0.0.1:2999/liveclientdata/activeplayername');
+  getActivePlayerNameForLvReq.on('error', (error) => {
+    console.error('getActivePlayerNameForLvReqErr', error.message);
+  })
+  getActivePlayerNameForLvReq.on('response', (response) => {
+    response.on('data', (chunk) => {
+      activePlayerName = JSON.parse(chunk);
+      requestPlayerListForLv();
+    })
+  })
+  getActivePlayerNameForLvReq.end();
+}
+
 function requestPlayerList() {
   const playerListReq = new net.request('https://127.0.0.1:2999/liveclientdata/playerlist');
   playerListReq.on('error', (error) => {
@@ -103,7 +119,6 @@ function requestPlayerList() {
   playerListReq.on('response', (response) => {
     response.on('data', (chunk) => {
       playerList = JSON.parse(chunk);
-      console.log(playerList.length)
       if (playerList.length === 10) {
         activePlayerTeam = findPlayerTeam();
         if (activePlayerTeam === 'ORDER') {
@@ -122,6 +137,27 @@ function requestPlayerList() {
   playerListReq.end();
 }
 
+function requestPlayerListForLv() {
+  const playerListForLvReq = new net.request('https://127.0.0.1:2999/liveclientdata/playerlist');
+  playerListForLvReq.on('error', (error) => {
+    console.error('playerListForLvReqErr:', error.message);
+  })
+  playerListForLvReq.on('response', (response) => {
+    response.on('data', (chunk) => {
+      playerList = JSON.parse(chunk);
+      activePlayerTeam = findPlayerTeam();
+      if (activePlayerTeam === 'ORDER') {
+        opponentTeam = 'CHAOS';
+      }
+      else if (activePlayerTeam === 'CHAOS') {
+        opponentTeam = 'ORDER';
+      }
+      getOpponentObjectArrayForLv();  
+    })
+  })
+  playerListForLvReq.end();
+}
+
 function findPlayerTeam() {
   for (let i=0; i<playerList.length; i++) {
     if (playerList[i].summonerName === activePlayerName) {
@@ -137,6 +173,22 @@ function getOpponentObjectArray() {
   getSummonerSpells();
 }
 
+function getOpponentObjectArrayForLv() {
+  opponents = playerList.filter(player => {
+    return player.team === opponentTeam;
+  })
+  sendLevel();
+}
+
+function sendLevel() {
+  if (opponents[opponentToGetLevelIndex] === undefined) /* Do nothing */;
+  else {
+    let level = opponents[opponentToGetLevelIndex].level;
+    console.log(pcClientId, skillSlotToGetLevel, level);
+    socket.emit('fetchlvp2s', pcClientId, skillSlotToGetLevel, level);  
+  }
+}
+
 function getSummonerSpells() {
   opponentSummonerSpells = [];
   opponents.map(parseAndPushSummonerSpells);
@@ -290,21 +342,9 @@ ipcMain.on('socketServerInfo', (event, arg) => {
     }
   })
   socket.on('fetchlvs2p', (skillSlot) => {
-    let index = getLevelArrayIndexFromSkillSlot(skillSlot);
-    let lvreq = net.request('https://127.0.0.1:2999/liveclientdata/playerlist');
-    lvreq.on('error', (error) => {
-      console.error('lvreq err:', error.message);
-    })
-    lvreq.on('response', (response) => {
-      response.on('data', (chunk) => {
-        let lvPlayerList = JSON.parse(chunk);
-        let lvOpponents = lvPlayerList.filter(lvPlayer => lvPlayer.team === opponentTeam);
-        let level = lvOpponents[index].level;
-        console.log(pcClientId, skillSlot, level);
-        socket.emit('fetchlvp2s',pcClientId, skillSlot, level);    
-      })
-    })
-    lvreq.end();
+    opponentToGetLevelIndex = getLevelArrayIndexFromSkillSlot(skillSlot);
+    skillSlotToGetLevel = skillSlot;
+    getActivePlayerNameForLv();
   })
 })
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pastelikedoinb",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "An app that generates and auto-type LOL flash tracking messages",
   "main": "main.js",
   "scripts": {
@@ -15,11 +15,10 @@
   },
   "dependencies": {
     "https-proxy-agent": "^5.0.0",
-    "iconv-lite": "^0.5.1",
+    "minimist": ">=0.2.1",
     "nanoid": "^2.1.9",
     "qrcode": "^1.4.4",
     "robotjs": "^0.6.0",
-    "socket.io-client": "^2.3.0",
-    "minimist": ">=0.2.1"
+    "socket.io-client": "^2.3.0"
   }
 }