Merge pull request #58 from NotBlue-Dev/develop

fix+individual+checkEnd
NotBlue-Dev · Oct 25, 2022 · 011ee0d · 011ee0d
2 parents e3e3987 + 551cfa2
commit 011ee0d
Show file tree

Hide file tree

Showing 11 changed files with 219 additions and 24 deletions.
diff --git a/config/default.json b/config/default.json
@@ -432,6 +432,7 @@
                 "scene": "DO NOT SWITCH SCENE",
                 "duration": "5"
             },
+            "endGame":true,
             "delay": "5"
         }
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "east",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Echo Arena Streaming Tool",
   "main": "main.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "node-fetch": "^2.6.7",
     "obs-websocket-js": "^4.0.3",
     "socket.io": "^4.4.1",
+    "squirrel": "^1.0.0",
     "update-electron-app": "^2.0.1"
   },
   "devDependencies": {

diff --git a/public/roundBoard/index.html b/public/roundBoard/index.html
@@ -0,0 +1,26 @@
+<html>
+   <head>
+      <title>betweenRound</title>
+      <meta http-equiv="content-type" content="text/html;charset=utf-8">
+      <script src="https://cdn.socket.io/4.4.1/socket.io.js"></script>
+      <script src="/betweenRound/renderer.js"></script>
+      <link rel="stylesheet" href="/betweenRound/style.css">
+      <link rel="stylesheet" href="/style.css">
+   </head>
+   <body>
+      <div class="scores">
+         <div class="sc"><a>SCORES</a></div>
+         <div class="top">
+            <div id="R1B" class="RoundB"><a id="R1B_SCORE">R1</a></div>
+            <div id="R2B" class="RoundB"><a id="R2B_SCORE">R2</a></div>
+            <div id="R3B" class="RoundB"><a id="R3B_SCORE">R3</a></div>
+         </div>
+         <div class="bottom">
+            <div id="R1O" class="RoundO "><a id="R1O_SCORE">R1</a></div>
+            <div id="R2O" class="RoundO "><a id="R2O_SCORE">R2</a></div>
+            <div id="R3O" class="RoundO"><a id="R3O_SCORE">R3</a></div>
+         </div>
+         <div class="sc"><a>BEST OF 3</a></div>
+      </div>
+   </body>
+</html>
diff --git a/public/scoreBoard/index.html b/public/scoreBoard/index.html
@@ -0,0 +1,57 @@
+<html>
+   <head>
+      <title>betweenRound</title>
+      <meta http-equiv="content-type" content="text/html;charset=utf-8">
+      <script src="https://cdn.socket.io/4.4.1/socket.io.js"></script>
+      <script src="/betweenRound/renderer.js"></script>
+      <link rel="stylesheet" href="/betweenRound/style.css">
+      <link rel="stylesheet" href="/style.css">
+   </head>
+   <body>
+      <div class="cont">
+         <div class="orange">
+            <img id="LogoA" class="LogoO hide">
+            <div class="stats">
+               <div class="title">
+                  <div class="contain">
+                     <div class="teamO">
+                        <a id="nameA"></a>
+                     </div>
+                     <a>PTS</a>
+                     <a>ASS</a>
+                     <a>SAV</a>
+                     <a>STN</a>
+                     <a>POS</a>
+                     <a>ATT</a>
+                  </div>
+               </div>
+               <div id="playersOrange">
+
+               </div>
+            </div>
+         </div>
+
+         <div class="blue">
+            <div class="stats">
+               <div class="title">
+                  <div class="contain b">
+                     <a>PTS</a>
+                     <a>ASS</a>
+                     <a>SAV</a>
+                     <a>STN</a>
+                     <a>POS</a>
+                     <a>ATT</a>
+                     <div class="teamB">
+                        <a id="nameB"></a>
+                     </div>
+                  </div>
+               </div>
+               <div id="playersBlue">
+
+               </div>
+            </div>
+            <img id="LogoB" class="LogoB hide">
+         </div>
+      </div>
+   </body>
+</html>
diff --git a/src/EventHandler.js b/src/EventHandler.js
@@ -23,13 +23,17 @@ class EventHandler {
         clearTimeout(this.delay);
         clearTimeout(this.dur);
         this.delay = setTimeout(() => {
-            this.obsClient.send('SetCurrentScene',
-            {
-                "scene-name":this.config.end.ending.scene
-            });
-            this.dur = setTimeout(() => {
-                this.obsClient.send('StopStreaming');
-            }, this.config.end.ending.duration * 1000);
+            if(this.config.end.ending.scene !== "DO NOT SWITCH SCENE") {
+                this.obsClient.send('SetCurrentScene',
+                {
+                    "scene-name":this.config.end.ending.scene
+                });
+            }
+            if(this.config.end.endGame) {
+                this.dur = setTimeout(() => {
+                    this.obsClient.send('StopStreaming');
+                }, this.config.end.ending.duration * 1000);
+            }
         }, this.config.end.delay * 1000);
     }
 

diff --git a/src/echo-arena-events/ScoreBoard.js b/src/echo-arena-events/ScoreBoard.js
@@ -32,7 +32,7 @@ class ScoreBoard {
 
         this.blue = gameData.blueTeam.playerStats;
         this.orange = gameData.orangeTeam.playerStats;
-
+        console.log(this.blue);
         const send = (orange, blue) => {
             if(this.lastHalf === null || Math.floor(((Math.abs(this.lastHalf - Date.now())) / 1000) / 60) >= 1) {
                 eventEmitter.send('local.halfTimeStats', {

diff --git a/src/echo-arena-events/ScoreChanged.js b/src/echo-arena-events/ScoreChanged.js
@@ -12,7 +12,7 @@ class ScoreChanged {
             this.orangePoints = gameData.orangeTeam.points;
             return;
         }
-        if (this.orangePoints != gameData.orangeTeam.points || this.bluePoints != gameData.blueTeam.points) {
+        if ((this.orangePoints != gameData.orangeTeam.points || this.bluePoints != gameData.blueTeam.points)) {
             this.bluePoints = gameData.blueTeam.points;
             this.orangePoints = gameData.orangeTeam.points;
             let team;
@@ -44,13 +44,17 @@ class ScoreChanged {
                 blue: this.bluePoints, 
                 orange: this.orangePoints
             };
-            eventEmitter.send('game.scoreChanged', {
-                blue: this.bluePoints, 
-                orange: this.orangePoints, 
-                data:this.data, 
-                name:this.name, 
-                clip:false
-            });
+            //fix 0-0 bug
+            if(gameData.orangeTeam.points != 0 && gameData.blueTeam.points != 0) {
+                eventEmitter.send('game.scoreChanged', {
+                    blue: this.bluePoints, 
+                    orange: this.orangePoints, 
+                    data:this.data, 
+                    name:this.name, 
+                    clip:false
+                });
+            }
+
         }
     }
 }

diff --git a/src/gameData.js b/src/gameData.js
@@ -1,3 +1,4 @@
+/* eslint-disable camelcase */
 class GameData {
     constructor(json, vrmlInfo, customData, pingTracking = false) {
         this.vrmlInfo = vrmlInfo;
@@ -38,13 +39,13 @@ class GameData {
         this.discPosition = [json.disc.position[0], json.disc.position[2]];
 
         this.lastscore = json.last_score;
-        this.pointAmount = this.lastscore.pointAmount;
-        this.personScored = this.lastscore.personScored;
-        this.assistScored = this.lastscore.assistScored;
+        this.point_amount = this.lastscore.point_amount;
+        this.person_scored = this.lastscore.person_scored;
+        this.assist_scored = this.lastscore.assist_scored;
         this.team = this.lastscore.team;
 
 
-        this.distanceThrown = this.lastscore.distanceThrown;
+        this.distance_thrown = this.lastscore.distance_thrown;
         this.round = json.blue_round_score + json.orange_round_score + 1;
         this.totalRound = json.total_round_count;
 
@@ -54,7 +55,9 @@ class GameData {
 
         if(this.blueTeam.blueTeamPlayers.length !== 0 && this.blueTeam.blueTeamPlayers !== undefined) {
             for (let player of this.blueTeam.blueTeamPlayers) {
-                player.stats.possessionTime = Math.round(player.stats.possessionTime);
+
+                // eslint-disable-next-line camelcase
+                player.stats.possession_time = Math.round(player.stats.possession_time);
                 this.blueTeam.playerStats.push({
                     name:player.name, 
                     stats:player.stats, 
@@ -77,7 +80,9 @@ class GameData {
 
         if(this.orangeTeam.orangeTeamPlayers !== 0 && this.orangeTeam.orangeTeamPlayers !== undefined) {
             for (let player of this.orangeTeam.orangeTeamPlayers) {
-                player.stats.possessionTime = Math.round(player.stats.possessionTime);
+
+                // eslint-disable-next-line camelcase
+                player.stats.possession_time = Math.round(player.stats.possession_time);
                 this.orangeTeam.playerStats.push({
                     name:player.name, 
                     stats:player.stats,